diff --git a/.gitignore b/.gitignore
index fa066279c..bd66e684a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -63,7 +63,6 @@ src/zma
 src/zmc
 src/zmf
 src/zms
-src/zmstreamer
 src/zmu
 web/includes/config.php
 zm.conf
diff --git a/.travis.yml b/.travis.yml
index d44973e2e..183d22e57 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,6 @@
 language: cpp
+sudo: required
+dist: trusty
 notifications:
   irc: "chat.freenode.net#zoneminder-dev"
 branches:
@@ -17,14 +19,14 @@ env:
     - CXXFLAGS="$CFLAGS"
   matrix:
     - ZM_BUILDMETHOD=cmake
-    - ZM_BUILDMETHOD=autotools
 compiler:
   - gcc
+  - clang
 before_install:
   - sudo apt-get update -qq
-  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev libvlccore5 libvlc5 2>&1 > /dev/null 
+  - sudo apt-get install -y -qq libpolkit-gobject-1-dev zlib1g-dev apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf cmake libjpeg-turbo8-dev apache2-mpm-prefork libapache2-mod-php5 php5-cli libtheora-dev libvorbis-dev libvpx-dev libx264-dev libvlccore-dev libvlc-dev 2>&1 > /dev/null 
 install:
-  - git clone -b n2.8.1 --depth=1 git://source.ffmpeg.org/ffmpeg.git
+  - git clone -b n3.0 --depth=1 git://source.ffmpeg.org/ffmpeg.git
   - cd ffmpeg
   - ./configure --enable-shared --enable-swscale --enable-gpl  --enable-libx264 --enable-libvpx --enable-libvorbis --enable-libtheora 
   - make -j `grep processor /proc/cpuinfo|wc -l` 
@@ -32,16 +34,10 @@ install:
   - sudo make install-libs
 before_script:
   - cd $TRAVIS_BUILD_DIR
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then libtoolize -v --force; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then aclocal -I m4; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoheader; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then automake --force-missing --add-missing; fi
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then autoconf; fi
   - mysql -uroot -e "CREATE DATABASE IF NOT EXISTS zm"
   - mysql -uroot -e "GRANT ALL ON zm.* TO 'zmuser'@'localhost' IDENTIFIED BY 'zmpass'";
   - mysql -uroot -e "FLUSH PRIVILEGES"
 script:
-  - if [ "$ZM_BUILDMETHOD" = "autotools" ]; then ./configure --prefix=/usr --with-libarch=lib/$DEB_HOST_GNU_TYPE --host=$DEB_HOST_GNU_TYPE --build=$DEB_BUILD_GNU_TYPE --with-mysql=/usr --with-ffmpeg=/usr --with-webdir=/usr/share/zoneminder/www --with-cgidir=/usr/libexec/zoneminder/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=yes --disable-debug --enable-mmap=yes ZM_SSL_LIB=openssl; fi
   - if [ "$ZM_BUILDMETHOD" = "cmake" ]; then cmake -DCMAKE_INSTALL_PREFIX="/usr"; fi
   - make
   - sudo make install
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 85bd541e4..6d0537fc2 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@
 #
 cmake_minimum_required (VERSION 2.6)
 project (zoneminder)
-set(zoneminder_VERSION "1.29.0")
+set(zoneminder_VERSION "1.29.2")
 # make API version a minor of ZM version
 set(zoneminder_API_VERSION "${zoneminder_VERSION}.1")
 
@@ -182,6 +182,17 @@ elseif(ZM_TARGET_DISTRO STREQUAL "OS13")
 	set(ZM_WEB_GROUP "www")
 	set(ZM_WEBDIR "/srv/www/htdocs/zoneminder")
 	set(ZM_CGIDIR "/srv/www/cgi-bin")
+elseif(ZM_TARGET_DISTRO STREQUAL "FreeBSD")
+	set(ZM_RUNDIR "/var/run/zm")
+        set(ZM_SOCKDIR "/var/run/zm")
+	set(ZM_TMPDIR "/var/tmp/zm")
+        set(ZM_CONTENTDIR "/usr/local/var/lib/zoneminder")
+        set(ZM_WEB_USER "www")
+        set(ZM_WEB_GROUP "www")
+        set(ZM_CONFIG_DIR "/usr/local/etc/zm")
+        set(ZM_WEBDIR "/usr/local/share/zoneminder/www")
+        set(ZM_CGIDIR "/usr/local/libexec/zoneminder/cgi-bin")
+        set(ZM_PERL_MM_PARMS "INSTALLDIRS=site")
 endif((ZM_TARGET_DISTRO STREQUAL "f22") OR (ZM_TARGET_DISTRO STREQUAL "f23"))
 
 # Required for certain checks to work
@@ -205,7 +216,7 @@ if (HAVE_EXECINFO_H)
   if (NOT HAVE_DECL_BACKTRACE)
     find_library (EXECINFO_LIBRARY NAMES execinfo)
     if (EXECINFO_LIBRARY)
-        list(APPEND ZM_BIN_LIBS "-l${EXECINFO_LIBRARY}")
+        list(APPEND ZM_BIN_LIBS "-lexecinfo")
     endif (EXECINFO_LIBRARY)
   endif (NOT HAVE_DECL_BACKTRACE)
   check_function_exists("backtrace_symbols" HAVE_DECL_BACKTRACE_SYMBOLS)
diff --git a/Makefile.am b/Makefile.am
deleted file mode 100644
index 62f767e75..000000000
--- a/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-ACLOCAL_AMFLAGS = -I m4
-
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-zmconfigdir = @ZM_CONFIG_DIR@
-
-zmconfig_DATA = \
-	zm.conf
-
-if COND_ONVIF
-   MAYBE_ONVIF = onvif
-endif
-
-SUBDIRS = \
-	src \
-	web \
-	scripts \
-	db \
-	misc \
- 	$(MAYBE_ONVIF)
-
-EXTRA_DIST = \
-	zm.conf.in \
-	zmconfgen.pl.in
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(zmconfigdir); chown $(webuser):$(webgroup) $(zmconfig_DATA); chmod 600 $(zmconfig_DATA) )
-	( if ! test -e $(DESTDIR)$(ZM_RUNDIR); then mkdir -p $(DESTDIR)$(ZM_RUNDIR); fi; if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_RUNDIR); chmod u+w $(DESTDIR)$(ZM_RUNDIR); fi )
-	( if ! test -e $(DESTDIR)$(ZM_SOCKDIR); then mkdir -p $(DESTDIR)$(ZM_SOCKDIR); fi; if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_SOCKDIR); chmod u+w $(DESTDIR)$(ZM_SOCKDIR); fi )
-	( if ! test -e $(DESTDIR)$(ZM_TMPDIR); then mkdir -m 700 -p $(DESTDIR)$(ZM_TMPDIR); fi; if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then chown $(webuser):$(webgroup) $(DESTDIR)$(ZM_TMPDIR); chmod u+w $(DESTDIR)$(ZM_TMPDIR); fi )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -rf events graphics images sounds temp )
-	@-( if test "$(DESTDIR)$(ZM_RUNDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_RUNDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_SOCKDIR)" != "/var/run"; then rm -rf $(DESTDIR)$(ZM_SOCKDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_TMPDIR)" != "/tmp" && test "$(DESTDIR)$(ZM_TMPDIR)" != "/var/tmp"; then rm -rf $(DESTDIR)$(ZM_TMPDIR); fi )
-	@-( if test "$(DESTDIR)$(ZM_LOGDIR)" != "/var/log"; then rm -rf $(DESTDIR)$(ZM_LOGDIR); fi )
diff --git a/README.md b/README.md
index 457f51844..ccaccbd06 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@ ZoneMinder H264 Patch
 [![Build Status](https://travis-ci.org/ZoneMinder/ZoneMinder.png?branch=feature-h264-videostorage)](https://travis-ci.org/ZoneMinder/ZoneMinder)  [![Bountysource](https://api.bountysource.com/badge/team?team_id=204&style=bounties_received)](https://www.bountysource.com/teams/zoneminder/issues?utm_source=ZoneMinder&utm_medium=shield&utm_campaign=bounties_received)
 
 ##Feature-h264-videostorage Branch Details
-This branch supports direct recording of h264 cameras into MP4 format uisng the h264 Passthrough option. As well it provides h264 encoding for local or mpeg cameras. If you encounter any issues, please open an issue on GitHub and attach it to the h264 milestone. But do remember this is bleeding edge so it will have problems.
+This branch supports direct recording of h264 cameras into MP4 format uisng the h264 Passthrough option, but only with FFMPEG Monitors currently. It also provides h264 encoding for any other monitor type. If you encounter any issues, please open an issue on GitHub and attach it to the h264 milestone. But do remember this is bleeding edge so it will have problems.
 Thanks to @chriswiggins and @mastertheknife for their work, @SteveGilvarry is now maintaining this branch and welcomes any assistance.
 
 **The following SQL changes are required, these will be merged to zmupdate once we are ready to merge this branch to master.**
@@ -15,7 +15,7 @@ ADD `EncoderParameters` TEXT NOT NULL AFTER `VideoWriter` ;
 ALTER TABLE `Events` ADD `DefaultVideo` VARCHAR( 64 ) NOT NULL AFTER `AlarmFrames` ;
 ```
 
-All documentation for ZoneMinder is now online at http://www.zoneminder.com/wiki/index.php/Documentation
+All documentation for ZoneMinder is now online at https://zoneminder.readthedocs.org
 
 ## Overview
 
@@ -54,7 +54,7 @@ When building a package, it is best to do this work in a separate environment, d
 
 Lastly, if you desire to build a development snapshot from the master branch, it is recommended you first build your package using an official release of ZoneMinder. This will help identify whether any problems you may encounter are caused by the build process or is a new issue in the master branch.
 
-What follows are instructions for various distros to build ZoneMinder into a package.
+Please visit our [ReadtheDocs site](https://zoneminder.readthedocs.org/en/stable/installationguide/index.html) for distro specific instructions.
 
 ### Package Maintainers
 Many of the ZoneMinder configration variable default values are not configurable at build time through autotools or cmake.  A new tool called *zmeditconfigdata.sh* has been added to allow package maintainers to manipulate any variable stored in ConfigData.pm without patching the source. 
@@ -66,201 +66,6 @@ For example, let's say I have created a new ZoneMinder package that contains the
 
 Note that zmeditconfigdata.sh is intended to be called, from the root build folder, prior to running cmake or configure.
 
-#### Ubuntu
-
-A fresh build based on master branch running Ubuntu 1204 LTS.  Will likely work for other versions as well.
-
-```bash
-root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
-
-root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
-root@host:~# cd zoneminder;
-root@host:~# ln -s distros/ubuntu1204 debian;
-root@host:~# dpkg-checkbuilddeps;
-root@host:~# dpkg-buildpackage;
-```
-
-One level above you'll now find a deb package matching the architecture of the build host:
-
-```bash
-root@host:~# ls -1 ~/zoneminder*;
-/root/zoneminder_1.26.4-1_amd64.changes
-/root/zoneminder_1.26.4-1_amd64.deb
-/root/zoneminder_1.26.4-1.dsc
-/root/zoneminder_1.26.4-1.tar.gz
-```
-
-The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
-
-To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
-
-```bash
-root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
-root@host:~# dpkg-reconfigure zoneminder;
-```
-Alternatively you may also use gdebi to automatically resolve dependencies during installation:
-
-```bash
-root@host:~# aptitude install -y gdebi;
-root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
-```
-```bash
-sudo apt-get install apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev \
-libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 \
-libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg-turbo8-dev libjpeg-turbo8 \
-apache2-mpm-prefork libapache2-mod-php5 php5-cli
-```
-
-#### Debian
-
-A fresh build based on master branch running Debian 7 (wheezy):
-
-```bash
-root@host:~# aptitude install -y apache2 mysql-server php5 php5-mysql build-essential libmysqlclient-dev libssl-dev libbz2-dev libpcre3-dev libdbi-perl libarchive-zip-perl libdate-manip-perl libdevice-serialport-perl libmime-perl libpcre3 libwww-perl libdbd-mysql-perl libsys-mmap-perl yasm automake autoconf libjpeg8-dev libjpeg8 apache2-mpm-prefork libapache2-mod-php5 php5-cli libphp-serialization-perl libgnutls-dev libjpeg8-dev libavcodec-dev libavformat-dev libswscale-dev libavutil-dev libv4l-dev libtool ffmpeg libnetpbm10-dev libavdevice-dev libmime-lite-perl dh-autoreconf dpatch;
-
-root@host:~# git clone https://github.com/ZoneMinder/ZoneMinder.git zoneminder;
-root@host:~# cd zoneminder;
-root@host:~# ln -s distros/debian;
-root@host:~# dpkg-checkbuilddeps;
-root@host:~# dpkg-buildpackage;
-```
-
-One level above you'll now find a deb package matching the architecture of the build host:
-
-```bash
-root@host:~# ls -1 ~/zoneminder*;
-/root/zoneminder_1.26.4-1_amd64.changes
-/root/zoneminder_1.26.4-1_amd64.deb
-/root/zoneminder_1.26.4-1.dsc
-/root/zoneminder_1.26.4-1.tar.gz
-```
-
-The dpkg command itself does not resolve dependencies. That's what high-level interfaces like aptitude and apt-get are normally for. Unfortunately, unlike RPM, there's no easy way to install a separate deb package not contained with any repository.
-
-To overcome this "limitation" we'll use dpkg only to install the zoneminder package and apt-get to fetch all needed dependencies afterwards. Running dpkg-reconfigure in the end will ensure that the setup scripts e.g. for database provisioning were executed.
-
-```bash
-root@host:~# dpkg -i /root/zoneminder_1.26.4-1_amd64.deb; apt-get install -f;
-root@host:~# dpkg-reconfigure zoneminder;
-```
-Alternatively you may also use gdebi to automatically resolve dependencies during installation:
-
-```bash
-root@host:~# aptitude install -y gdebi;
-root@host:~# gdebi /root/zoneminder_1.26.4-1_amd64.deb;
-```
-
-#### Fedora / CentOS / RHEL
-
-##### Background
-The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.
-
-The method documented below was chosen because:
-- All of ZoneMinder's dependencies are downloaded and installed automatically
-- Cross platform capable. The build host does not have to be the same distro or release version as the target.
-- Once your build environment is set up, few steps are required to run the build again in the future.
-- Troubleshooting becomes easier if we are all building ZoneMinder the same way.
-
-The build instructions below make use of a custom script called "buildzm.sh". Advanced users are encouraged to view the contents of this script. Notice that the script doesn't really do a whole lot. The goal of the script is to simply make the process a little easier for the first time user. Once you become familar with the build process, you can issue the mock commands found in the buildzm.sh script yourself if you so desire.
-
-***IMPORTANT***
-Certain commands in these instructions require root privileges while other commands do not. Pay close attention to this. If the instructions below state to issue a command without a “sudo” prefix, then you should *not* be root while issuing the command. Getting this incorrect will result in a failed build.
-
-##### Set Up Your Environment
-Before you begin, set up an rpmbuild environment by following [this guide](http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment) by the CentOS developers.
-
-Next, navigate to [Zmrepo](http://zmrepo.zoneminder.com/), and follow the instructions to enable zmrepo on your system.  
-
-With zmrepo enabled, issue the following command:
-````bash
-sudo yum install zmrepo-mock-configs mock
-```
-
-Add your user account to the group mock:
-```bash
-sudo gpasswd -a {your account name} mock
-```
-
-Your build environment is now set up.  
-
-##### Build from SRPM
-To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the [Zmrepo](http://zmrepo.zoneminder.com/) site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
-
-For CentOS 7, I have chosen the following SRPM:
-```bash
-wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
-
-Now comes the fun part. To build ZoneMinder, issue the following command:
-```bash
-buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
-
-Want to build ZoneMinder for Fedora, instead of CentOS, from the same host?  Once you download the Fedora SRPM, issue the following:
-```bash
-buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
-```
-Notice that the buildzm.sh tool requires the following parameters:
-```bash
-buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
-```
-The list of available Mock config files are available here:
-```bash
-ls /etc/mock/zmrepo*.cfg
-```
-
-You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
-
-##### Installation
-Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the [Zmrepo](http://zmrepo.zoneminder.com/) website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
-
-Finally, you may want to consider editing the zmrepo repo file under /etc/yum.repos.d and placing an “exclude=zoneminder*” line into the config file.  This will prevent your system from overwriting your manually built RPM with the ZoneMinder RPM found in the repo.
-
-##### How to Modify the Source Prior to Build
-** UNFINISHED **
-
-Before attempting this part of the instructions, make sure and follow the previous instructions for building one of the unmodified SRPMS from zmrepo. Knowing this part works will assist in troubleshooting should something go wrong.
-
-These instructions may vary depending on what exactly you want to do.  The following example assumes you want to build a development snapshot from the master branch.
-
-From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and placed it into ~/rpmbuild/SRPMS. For this example, install it onto your system:
-```bash
-rpm -Uvh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
-```
-
-IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
-
-Make sure you have git installed:
-```bash
-sudo yum install git
-```
-
-Now clone the ZoneMinder git repository:
-```bash
-git clone https://github.com/ZoneMinder/ZoneMinder
-```
-This will create a sub-folder called ZoneMinder, which will contain the latest development.
-
-We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
-```bash
-ls ~/rpmbuild/SOURCES
-```
-The tarball from the previsouly installed SRPM should be there. This is the name we will use.  For this example, the name is ZoneMinder-1.28.1.tar.gz.  From one folder above the local ZoneMinder git repository, execute the following:
-```bash
-mv ZoneMinder ZoneMinder-1.28.1
-tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
-```
-The trailing "/*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
-Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
-
-Now build a new src.rpm:
-```bash
-rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
-```
-This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on what distro you are building for.
-
-You should now have a a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
-
 #### Docker
 
 Docker is a system to run applications inside isolated containers. ZoneMinder, and the ZM webserver, will run using the 
diff --git a/acinclude.m4 b/acinclude.m4
deleted file mode 100644
index 605842149..000000000
--- a/acinclude.m4
+++ /dev/null
@@ -1,74 +0,0 @@
-AC_DEFUN([AC_DEFINE_DIR], [
-  prefix_NONE=
-  exec_prefix_NONE=
-  test "x$prefix" = xNONE && prefix_NONE=yes && prefix=$ac_default_prefix
-  test "x$exec_prefix" = xNONE && exec_prefix_NONE=yes && exec_prefix=$prefix
-dnl In Autoconf 2.60, ${datadir} refers to ${datarootdir}, which in turn
-dnl refers to ${prefix}.  Thus we have to use `eval' twice.
-  eval ac_define_dir="\"[$]$2\""
-  eval ac_define_dir="\"$ac_define_dir\""
-  AC_SUBST($1, "$ac_define_dir")
-  AC_DEFINE_UNQUOTED($1, "$ac_define_dir", [$3])
-  test "$prefix_NONE" && prefix=NONE
-  test "$exec_prefix_NONE" && exec_prefix=NONE
-])
-
-AC_DEFUN([AC_PROG_PERL_VERSION],[dnl
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-# Check if version of Perl is sufficient
-ac_perl_version="$1"
-
-if test "x$PERL" != "x"; then
-  AC_MSG_CHECKING(for perl version greater than or equal to $ac_perl_version)
-  # NB: It would be nice to log the error if there is one, but we cannot rely
-  # on autoconf internals
-  $PERL -e "use $ac_perl_version;" > /dev/null 2>&1
-  if test $? -ne 0; then
-    AC_MSG_RESULT(no);
-    $3
-  else
-    AC_MSG_RESULT(ok);
-    $2
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi
-])dnl
-
-AC_DEFUN([AC_PROG_PERL_MODULES],[dnl
-ac_perl_modules="$1"
-# Make sure we have perl
-if test -z "$PERL"; then
-AC_CHECK_PROG(PERL,perl,perl)
-fi
-
-if test "x$PERL" != x; then
-  ac_perl_modules_failed=0
-  for ac_perl_module in $ac_perl_modules; do
-    AC_MSG_CHECKING(for perl module $ac_perl_module)
-
-    # Would be nice to log result here, but can't rely on autoconf internals
-    $PERL "-M$ac_perl_module" -e exit > /dev/null 2>&1
-    if test $? -ne 0; then
-      AC_MSG_RESULT(no);
-      ac_perl_modules_failed=1
-   else
-      AC_MSG_RESULT(ok);
-    fi
-  done
-
-  # Run optional shell commands
-  if test "$ac_perl_modules_failed" = 0; then
-    :
-    $2
-  else
-    :
-    $3
-  fi
-else
-  AC_MSG_WARN(could not find perl)
-fi])dnl
diff --git a/bootstrap.sh b/bootstrap.sh
deleted file mode 100755
index 0bc041f18..000000000
--- a/bootstrap.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/bash
-aclocal -I m4
-autoheader
-automake --add-missing
-autoconf
diff --git a/configure.ac b/configure.ac
deleted file mode 100644
index fcdacdd6c..000000000
--- a/configure.ac
+++ /dev/null
@@ -1,512 +0,0 @@
-#
-# Building ZoneMinder via Autotools will be depreciated soon
-# For instructions on building with cmake, please see INSTALL
-#
-AC_PREREQ(2.59)
-AC_INIT(zm,1.29.0,[http://www.zoneminder.com/forums/ - Please check FAQ first],zoneminder,http://www.zoneminder.com/downloads.html)
-AM_INIT_AUTOMAKE
-AC_CONFIG_SRCDIR(src/zm.h)
-AC_CONFIG_HEADERS(config.h)
-AC_CONFIG_MACRO_DIR([m4])
-
-AC_SUBST([AM_CXXFLAGS], [-D__STDC_CONSTANT_MACROS])
-
-AC_SUBST(VERSION)
-#
-# Platform specific setup
-#
-#############################
-AC_CANONICAL_HOST
-# Check for which host we are on and setup a few things
-# specifically based on the host
-case $host_os in
-  darwin* )
-        # Do something specific for mac
-		HOST_OS='darwin'
-        ;;
-  linux*)
-        # Do something specific for linux
-		HOST_OS='linux'
-        ;;
-   *BSD*)
-        # Do something specific for BSD
-		HOST_OS='BSD'
-		AC_DEFINE(BSD,1,"This is a BSD system")
-        ;;
-   *bsd*)
-        # Do something specific for BSD
-		HOST_OS='BSD'
-		AC_DEFINE(BSD,1,"This is a BSD system")
-        ;;
-    *solaris*)
-        # Do something specific for Solaris
-		HOST_OS='solaris'
-		AC_DEFINE(SOLARIS,1,"We are running a Solaroid OS [tested on OmniOS]")
-        ;;
-    *)
-        #Default Case
-        AC_MSG_ERROR([Your platform is not currently supported])
-        ;;
-esac
-
-AC_SUBST(HOST_OS)
-
-AC_ARG_VAR(ZM_DB_TYPE,[Type of the ZoneMinder database, default mysql])
-AC_ARG_VAR(ZM_DB_HOST,[Hostname where ZoneMinder database located, default localhost])
-AC_ARG_VAR(ZM_DB_NAME,[Name of ZoneMinder database, default zm])
-AC_ARG_VAR(ZM_DB_USER,[Name of ZoneMinder database user, default zmuser])
-AC_ARG_VAR(ZM_DB_PASS,[Password of ZoneMinder database user, default zmpass])
-AC_ARG_VAR(ZM_SSL_LIB,[Library to use for ssl functions, default gnutls])
-AC_ARG_VAR(ZM_MYSQL_ENGINE,[MySQL engine to use with database, default InnoDB])
-AC_ARG_VAR(ZM_RUNDIR,[Location of transient process files, default /var/run/zm])
-AC_ARG_VAR(ZM_SOCKDIR,[Location of Unix domain socket files, default /var/run/zm])
-AC_ARG_VAR(ZM_TMPDIR,[Location of temporary files, default /var/tmp/zm])
-AC_ARG_VAR(ZM_LOGDIR,[Location of generated log files, default /var/log/zm])
-AC_ARG_VAR(ZM_CONFIG_DIR,[Location of ZoneMinder configuration, default system config directory])
-
-if test "$ZM_DB_TYPE" == ""; then
-	AC_SUBST(ZM_DB_TYPE,[mysql])
-fi
-if test "$ZM_DB_HOST" == ""; then
-	AC_SUBST(ZM_DB_HOST,[localhost])
-fi
-if test "$ZM_DB_NAME" == ""; then
-	AC_SUBST(ZM_DB_NAME,[zm])
-fi
-if test "$ZM_DB_USER" == ""; then
-	AC_SUBST(ZM_DB_USER,[zmuser])
-fi
-if test "$ZM_DB_PASS" == ""; then
-	AC_SUBST(ZM_DB_PASS,[zmpass])
-fi
-if test "$ZM_SSL_LIB" == ""; then
-	AC_SUBST(ZM_SSL_LIB,gnutls)
-fi
-if test "$ZM_MYSQL_ENGINE" == ""; then
-	AC_SUBST(ZM_MYSQL_ENGINE,InnoDB)
-fi
-if test "$ZM_RUNDIR" == ""; then
-	AC_SUBST(ZM_RUNDIR,[/var/run/zm])
-fi
-if test "$ZM_SOCKDIR" == ""; then
-	AC_SUBST(ZM_SOCKDIR,[/var/run/zm])
-fi
-if test "$ZM_TMPDIR" == ""; then
-	AC_SUBST(ZM_TMPDIR,[/tmp/zm])
-fi
-if test "$ZM_LOGDIR" == ""; then
-	AC_SUBST(ZM_LOGDIR,[/var/log/zm])
-fi
-AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
-if test "$ZM_CONFIG_DIR" == ""; then
-	AC_SUBST(ZM_CONFIG_DIR,[$SYSCONFDIR])
-fi
-
-LIB_ARCH=lib
-AC_ARG_WITH(libarch,
-    [  --with-libarch=<lib>       architecture library path to use, default lib],
-    [LIB_ARCH=$with_libarch],
-    AC_MSG_WARN([You can call configure with the --with-libarch option.
-    This tells configure where to find architecture specific libraries.
-    The default of 'lib' is usually ok but 64 bit machines may require lib64.
-    e.g. --with-libarch=lib or --with-libarch=lib64])
-)
-AC_SUBST(LIB_ARCH)
-
-LDFLAGS="-L/usr/lib/${build_alias} ${LDFLAGS}"
-
-MYSQL_PREFIX=/usr
-AC_ARG_WITH(mysql,
-    [  --with-mysql=<path>        prefix of MySQL installation, default /usr],
-    [MYSQL_PREFIX=$with_mysql],
-    AC_MSG_WARN([You can call configure with the --with-mysql option.
-    This tells configure where to find the MySql C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mysql=/usr/local or --with-mysql=/usr])
-)
-AC_SUBST(MYSQL_PREFIX)
-MYSQL_LIBS="-L${MYSQL_PREFIX}/${LIB_ARCH}/mysql"
-MYSQL_CFLAGS="-I${MYSQL_PREFIX}/include"
-AC_SUBST(MYSQL_LIBS)
-AC_SUBST(MYSQL_CFLAGS)
-LDFLAGS="$LDFLAGS ${MYSQL_LIBS}"
-
-
-MARIADB_PREFIX=/usr
-AC_ARG_WITH(mariadb,
-    [  --with-mariadb=<path>        prefix of MariaDB installation, default /usr],
-    [MYSQL_PREFIX=$with_mariadb],
-    AC_MSG_WARN([You can call configure with the --with-mariadb option.
-    This tells configure where to find the mariaDB C library and headers if configure cannot
-    locate them automatically.
-    e.g. --with-mariadb=/usr/local or --with-mariadb=/usr])
-)
-AC_SUBST(MARIADB_PREFIX)
-MARIADB_LIBS="-L${MARIADB_PREFIX}/${LIB_ARCH}/mariadb"
-MARIADB_CFLAGS="-I${MARIADB_PREFIX}/include"
-AC_SUBST(MARIADB_LIBS)
-AC_SUBST(MARIADB_CFLAGS)
-LDFLAGS="$LDFLAGS ${MARIADB_LIBS}"
-
-POLKIT_PREFIX=/usr
-AC_ARG_WITH(polkit,
-[ --with-polkit=<path> prefix of polkit root directory, default /usr],
-[POLKIT_PREFIX=$with_polkit],
-AC_MSG_WARN([You can call configure with the --with-polkit option.
-This tells configure where to place the polkit policy files.])
-)
-AC_SUBST(POLKIT_PREFIX)
-PKG_CHECK_MODULES(POLKIT, polkit-gobject-1)
-
-FFMPEG_PREFIX=/usr
-AC_ARG_WITH(ffmpeg,
-    [  --with-ffmpeg=<path>       prefix of ffmpeg root directory for libavcodec etc, default /usr],
-    [FFMPEG_PREFIX=$with_ffmpeg],
-    AC_MSG_WARN([You can call configure with the --with-ffmpeg option.
-    This tells configure where to find the ffmpeg root directory within which are the libavcodec 
-    and libavformat files that can be used to build true MPEG streaming into ZoneMinder. Ensure that
-    your copy of ffmpeg has installed libraries as well as binaries (use 'make installlib'). If you
-    are using a local install of ffmpeg you may have to remove or rename a previous real installation
-    as the headers and libraries from that will probably be picked up before your local copy.
-    e.g. --with-ffmpeg=/usr/local])
-)
-AC_SUBST(FFMPEG_PREFIX)
-FFMPEG_LIBS="-L${FFMPEG_PREFIX}/${LIB_ARCH}"
-FFMPEG_CFLAGS="-I${FFMPEG_PREFIX}/include -D__STDC_CONSTANT_MACROS"
-AC_SUBST(FFMPEG_LIBS)
-AC_SUBST(FFMPEG_CFLAGS)
-
-LDFLAGS="${FFMPEG_LIBS} $LDFLAGS"
-CFLAGS="${FFMPEG_CFLAGS} $CFLAGS"
-CPPFLAGS="${FFMPEG_CFLAGS} $CPPFLAGS"
-
-EXTRA_LIBS=
-AC_ARG_WITH(extralibs,
-    [  --with-extralibs="<libs>"  string containing extra libraries to pass to link, default empty],
-    [EXTRA_LIBS=$with_extralibs],
-    AC_MSG_WARN([You can call configure with the --with-extralibs option.
-    Ordinarily you will need to use this option only when your copy of ffmpeg has been built
-    with support for additional formats and you would use this option to detail which additional
-    libraries ffmpeg was built with so that it is able to link successfully with ZoneMinder.
-    You will need to wrap this option in quotes if it contains any spaces.
-    e.g. --with-extralibs="-lmp3lame"])
-)
-AC_SUBST(EXTRA_LIBS)
-
-LDFLAGS="$LDFLAGS ${EXTRA_LIBS}"
-
-AC_ARG_WITH(webdir,
-    [  --with-webdir=<path>       prefix of web directory],
-    [WEB_PREFIX=$with_webdir],
-    AC_MSG_ERROR([You must call configure with the --with-webdir option.
-    This tells configure where to install PHP and web files and scripts.
-    e.g. --with-webdir=/var/www/html or --with-webdir=/www/vhtdocs/<site>])
-)
-AC_SUBST(WEB_PREFIX)
-
-AC_ARG_WITH(cgidir,
-    [  --with-cgidir=<path>       prefix of cgi directory],
-    [CGI_PREFIX=$with_cgidir],
-    AC_MSG_ERROR([You must call configure with the --with-cgidir option.
-    This tells configure where to install cgi files and scripts.
-    e.g. --with-cgidir=/var/www/cgi-bin or --with-webdir=/www/vhtdocs/<site>/cgi-bin])
-)
-AC_SUBST(CGI_PREFIX)
-
-WEB_USER=apache
-AC_ARG_WITH(webuser,
-    [  --with-webuser=<user>      name of web user, default apache],
-    [WEB_USER=$with_webuser],
-    AC_MSG_WARN([You can call configure with the --with-webuser option.
-    This tells configure what the user name of the web user is if it is not the default of 'apache'.
-    e.g. --with-webuser=apache or --with-webuser=web])
-)
-AC_SUBST(WEB_USER)
-
-WEB_GROUP=apache
-AC_ARG_WITH(webgroup,
-    [  --with-webgroup=<group>    name of web group, default apache],
-    [WEB_GROUP=$with_webgroup],
-    AC_MSG_WARN([You can call configure with the --with-webgroup option.
-    This tells configure what the group name of the web group is if it is not the default of 'apache'.
-    e.g. --with-webgroup=apache or --with-webgroup=web])
-)
-AC_SUBST(WEB_GROUP)
-
-WEB_HOST=zm.local
-AC_ARG_WITH(webhost,
-    [  --with-webhost=<hostname>    name of web hostname, default zm.local],
-    [WEB_HOST=$with_webhost],
-    AC_MSG_WARN([You can call configure with the --with-webhost option.
-    This tells configure what the host name is for name based virtual hosting. This is only used to populate the sample web/zmHttpd.conf file.
-    e.g. --with-webhost=zm.localdomain])
-)
-AC_SUBST(WEB_HOST)
-
-ENABLE_DEBUG=yes
-AC_ARG_ENABLE(debug,
-    [  --enable-debug=<yes|no>    enable or disable debug, default enabled],
-    [ENABLE_DEBUG=$enable_debug],
-    AC_MSG_WARN([You can call configure with the --enable-debug=<yes|no> or --disable-debug option.
-    This tells configure whether to compile ZoneMinder with debug included. Although debug is included
-    by default it is not output unless explicitly switched on elsewhere. These checks may induce a
-    small penalty on performance and if you are after squeezing the maximum possible performance out
-    of ZoneMinder you may use this switch to prevent debug from being compiled in.
-    e.g. --enable-debug=yes or --disable-debug])
-)
-if test "$ENABLE_DEBUG" != "yes"; then
-  AC_DEFINE(ZM_DBG_OFF,1,"Whether debug is switched off and compiled out")
-fi
-
-ENABLE_MMAP=yes
-AC_ARG_ENABLE(mmap,
-    [  --enable-mmap=<yes|no> enable or disabled mapped memory versus shared memory, default mapped],
-    [ENABLE_MMAP=$enable_mmap],
-    AC_MSG_WARN([You can call configure with the --enable-mmap=<yes|no> or --disable-mmap option.
-    This tells configure whether to compile ZoneMinder with mmap support rather than IPC shared
-    memory. This is a feature that uses memory mapped into files which all processes can share.
-    Memory mapping requires less configuration and is more flexible than shared memory but may
-    slow down your system unless the mapped files are configured to reside on a fast or RAM based
-    filesystem which will normally be the case by default.
-    e.g. --enable-mmap=yes or --disable-mmap])
-)
-if test "$ENABLE_MMAP" == "yes"; then
-  AC_DEFINE(ZM_MEM_MAPPED,1,"Whether to use mapped rather than shared memory")
-else
-  AC_DEFINE(ZM_MEM_MAPPED,0,"Whether to use mapped rather than shared memory")
-fi
-AC_SUBST(ENABLE_MMAP)
-
-ENABLE_ONVIF=no
-AC_ARG_ENABLE(onvif,
-    [  --enable-onvif=<yes|no> enable or disable basic onvif support, default disabled],
-    [ENABLE_ONVIF=$enable_onvif],
-    AC_MSG_WARN([You can call configure with the --enable-onvif=<yes|no> or --enable-onvif option.
-    This tells configure whether to compile ZoneMinder with basic ONVIF support. This feature will
-    probe for ONVIF compliant cameras on your network and allow you the option to auto-configure them as
-    monitors in zoneminder. This option is EXPERIMENTAL and may not work with all cameras that claim to 
-    be ONVIF compliant.
-    e.g. --enable-onvif=yes or --disable-onvif])
-)
-AM_CONDITIONAL([COND_ONVIF], [test "$enable_onvif" = yes])
-
-# Compiler
-AC_LANG_CPLUSPLUS
-if test "$ENABLE_ONVIF" == "yes"; then
-  AC_SUBST(ZM_HAS_ONVIF,1)
-else
-  AC_SUBST(ZM_HAS_ONVIF,0)
-fi
-
-# Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_INSTALL
-AC_PROG_LN_S
-AC_PROG_RANLIB
-AC_PROG_MAKE_SET
-
-# Checks for typedefs, structures, and compiler characteristics.
-AC_HEADER_STDBOOL
-AC_C_CONST
-AC_TYPE_UID_T
-AC_C_INLINE
-AC_TYPE_MODE_T
-AC_TYPE_SIZE_T
-AC_HEADER_TIME
-AC_STRUCT_TM
-AC_TYPE_SIGNAL
-
-AC_CHECK_TYPES(siginfo_t,,,[#include <signal.h>])
-AC_CHECK_TYPES(ucontext_t,,,[#include <signal.h>])
-
-# Checks for library functions.
-AC_PROG_GCC_TRADITIONAL
-AC_FUNC_MALLOC
-AC_FUNC_MMAP
-AC_FUNC_SELECT_ARGTYPES
-AC_FUNC_STAT
-AC_FUNC_STRFTIME
-AC_FUNC_STRTOD
-AC_FUNC_VPRINTF
-AC_CHECK_FUNCS([gethostbyname gethostname gettimeofday memmove memset mkdir munmap posix_memalign putenv select sendfile socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strspn strstr strtol strtoull])
-AC_CHECK_FUNCS([syscall sleep usleep ioctl ioctlsocket sigaction])
-# this is required for freebsd to compile. Look for it in m4/ac_check_sendfile.m4
-AC_CHECK_SENDFILE
-# Other programs
-AC_CHECK_PROG(OPT_FFMPEG,ffmpeg,yes,no)
-AC_PATH_PROG(PATH_FFMPEG,ffmpeg)
-
-# Checks for libraries.
-AC_CHECK_LIB(rt,clock_gettime,,AC_MSG_ERROR(zm requires librt))
-AC_SEARCH_LIBS(mysql_init,[mysqlclient mariadbclient],,AC_MSG_ERROR(zm requires libmysqlclient.a or libmariadbclient.a))
-AC_CHECK_LIB(jpeg,jpeg_start_compress,,AC_MSG_ERROR(zm requires libjpeg.a))
-AC_CHECK_LIB(pthread,pthread_create,,AC_MSG_ERROR(zm requires libpthread.a))
-if test "$BSD" == "0"; then
-AC_CHECK_LIB(dl,dlsym,,AC_MSG_ERROR(zm requires libdl.a))
-fi
-if test "$ZM_SSL_LIB" == "openssl"; then
-AC_CHECK_HEADERS(openssl/md5.h,,AC_MSG_WARN(zm requires openssl/md5.h header to be installed for openssl),)
-AC_CHECK_LIB(crypto,MD5,,AC_MSG_WARN([libcrypto.a is required for authenticated streaming - use ZM_SSL_LIB option to select gnutls instead]))
-else
-AC_CHECK_HEADERS(gnutls/openssl.h,AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,1),AC_SUBST(ZM_HAS_GNUTLS_OPENSSL,0),)
-AC_CHECK_HEADERS(gnutls/gnutls.h,AC_SUBST(ZM_HAS_GNUTLS,1),AC_SUBST(ZM_HAS_GNUTLS,0),)
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "0" && test "$ZM_HAS_GNUTLS" == "0"; then
-AC_MSG_WARN(gnutls is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead)
-fi
-AC_CHECK_HEADERS(gcrypt.h,,AC_MSG_WARN(zm requires libgcrypt headers to be installed for gnutls),)
-AC_CHECK_LIB(gcrypt,gcry_check_version,,AC_MSG_WARN([libgcrypt.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-AC_CHECK_LIB(gnutls,gnutls_fingerprint,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
-AC_CHECK_LIB(gnutls-openssl,MD5,,AC_MSG_WARN([libgnutls.a is required for authenticated streaming - use ZM_SSL_LIB option to select openssl instead]))
-fi
-fi
-AC_CHECK_LIB(pcre,pcre_compile,,AC_MSG_WARN(libpcre.a may be required for remote/network camera support))
-AC_CHECK_LIB(z,zlibVersion)
-AC_CHECK_LIB(x264,x264_predict_16x16_init)
-AC_CHECK_LIB(mp4v2,MP4AddH264VideoTrack)
-AC_CHECK_LIB(avutil,av_malloc,,AC_MSG_WARN(libavutil.a may be required for MPEG streaming))
-# Don't bother to warn about this one
-AC_CHECK_LIB(avcore,av_image_copy,,)
-AC_CHECK_LIB(avcodec,avcodec_version,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-AC_CHECK_LIB(avformat,avformat_version,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-#AC_CHECK_LIB(avcodec,avcodec_open,,AC_MSG_WARN(libavcodec.a is required for MPEG streaming))
-#AC_CHECK_LIB(avformat,av_new_stream,,AC_MSG_WARN(libavformat.a is required for MPEG streaming))
-AC_CHECK_LIB(avdevice,avdevice_register_all,,AC_MSG_WARN(libavdevice.a may be required for MPEG streaming))
-AC_CHECK_LIB(swscale,sws_scale,,,-lswscale)
-AC_CHECK_LIB(vlc,libvlc_new,,AC_MSG_WARN(libvlc.a may be required for streaming))
-AC_CHECK_LIB(bz2,BZ2_bzCompress,,AC_MSG_WARN(zm requires libbz2.a for recent versions of ffmpeg))
-AC_CHECK_LIB(z,compress,,)
-AC_CHECK_LIB(curl,curl_global_init,,)
-
-# Checks for header files.
-AC_FUNC_ALLOCA
-AC_HEADER_STDC
-AC_CHECK_HEADERS([fcntl.h limits.h memory.h stddef.h stdlib.h string.h strings.h sys/param.h sys/time.h syslog.h unistd.h values.h])
-AC_CHECK_HEADERS([netdb.h netinet/in.h arpa/inet.h sys/ioctl.h sys/socket.h sys/un.h glob.h sys/sendfile.h])
-AC_CHECK_HEADERS(execinfo.h,,,)
-AC_CHECK_HEADERS(ucontext.h,,,)
-AC_CHECK_HEADERS(sys/syscall.h,,,)
-AC_CHECK_HEADERS(pthread.h,,,)
-
-# Check for Video for Linux 1 Header Files
-ZM_HAS_V4L1=0
-AC_CHECK_HEADERS([libv4l1-videodev.h linux/videodev.h],[ZM_HAS_V4L1=1; break;],,)
-AC_SUBST(ZM_HAS_V4L1)
-
-# Check for Video for Linux 2 Header Files
-ZM_HAS_V4L2=0
-AC_CHECK_HEADERS(linux/videodev2.h,ZM_HAS_V4L2=1,,)
-AC_SUBST(ZM_HAS_V4L2)
-
-# Set global Video for Linux flag
-ZM_HAS_V4L=0
-if test "$ZM_HAS_V4L1" == "1" || test "$ZM_HAS_V4L2" == "1"; then
-ZM_HAS_V4L=1
-else
-AC_MSG_WARN(zm requires Video4Linux or Video4Linux2 to be installed for analog or USB camera support)
-fi
-AC_SUBST(ZM_HAS_V4L)
-
-AC_CHECK_HEADERS(jpeglib.h,,AC_MSG_ERROR(zm requires libjpeg headers to be installed),)
-AC_CHECK_HEADERS(mysql/mysql.h,,AC_MSG_ERROR(zm requires MySQL headers - check that MySQL development packages are installed),)
-AC_LANG_PUSH([C])
-AC_CHECK_HEADERS(libavutil/avutil.h,,,)
-AC_CHECK_HEADERS(libavcodec/avcodec.h,,,)
-AC_CHECK_HEADERS(libavformat/avformat.h,,,)
-AC_CHECK_HEADERS(libswscale/swscale.h,,,)
-AC_LANG_POP([C])
-AC_CHECK_HEADERS(pcre/pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
-AC_CHECK_HEADERS(pcre.h,AC_SUBST(ZM_PCRE,"1"),,)
-if test "$ENABLE_MMAP" == "yes"; then
-AC_CHECK_HEADERS(sys/mman.h,,,)
-AC_CHECK_HEADERS(fcntl.h,,,)
-else
-AC_CHECK_HEADERS(sys/ipc.h,,,)
-AC_CHECK_HEADERS(sys/shm.h,,,)
-fi
-AC_CHECK_HEADERS(zlib.h,,,)
-AC_CHECK_HEADERS(x264.h,,,)
-AC_CHECK_HEADERS([mp4v2/mp4v2.h mp4v2.h mp4.h],,,)
-AC_CHECK_HEADERS(vlc/vlc.h,,,)
-AC_CHECK_HEADERS(curl/curl.h,,,)
-
-if test "$ZM_SSL_LIB" == "openssl"; then
-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires openssl/md5.h - use ZM_SSL_LIB option to select gnutls instead]),[#include <stdlib.h>
-#include <openssl/md5.h>])
-else
-if test "$ZM_HAS_GNUTLS_OPENSSL" == "1"; then
-AC_CHECK_DECLS(MD5,,AC_MSG_ERROR([zm requires gnutls/openssl.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
-#include <gnutls/openssl.h>])
-else
-AC_CHECK_DECLS(gnutls_fingerprint,,AC_MSG_ERROR([zm requires gnutls/gnutls.h - use ZM_SSL_LIB option to select openssl instead]),[#include <stdlib.h>
-#include <gnutls/gnutls.h>])
-fi
-fi
-AC_CHECK_DECLS(backtrace,,,[#include <execinfo.h>])
-AC_CHECK_DECLS(backtrace_symbols,,,[#include <execinfo.h>])
-AC_CHECK_LIB(execinfo,backtrace)
-
-AC_SUBST(LDFLAGS)
-
-AC_PROG_PERL_VERSION(5.6.0)
-
-# Compulsory perl modules
-AC_PROG_PERL_MODULES(Sys::Syslog,,AC_MSG_ERROR(zm requires SYS:Syslog))
-AC_PROG_PERL_MODULES(DBI,,AC_MSG_ERROR(zm requires DBI))
-AC_PROG_PERL_MODULES(DBD::mysql,,AC_MSG_ERROR(zm requires DBD::mysql))
-AC_PROG_PERL_MODULES(Getopt::Long,,AC_MSG_ERROR(zm requires Getopt::Long))
-AC_PROG_PERL_MODULES(Time::HiRes,,AC_MSG_ERROR(zm requires Time::HiRes))
-AC_PROG_PERL_MODULES(Date::Manip,,AC_MSG_ERROR(zm requires Date::Manip))
-AC_PROG_PERL_MODULES(LWP::UserAgent,,AC_MSG_ERROR(zm requires LWP::UserAgent))
-AC_PROG_PERL_MODULES(ExtUtils::MakeMaker,,AC_MSG_ERROR(zm requires ExtUtils::MakeMaker))
-if test "$ENABLE_MMAP" == "yes"; then
-AC_PROG_PERL_MODULES(Sys::Mmap,,AC_MSG_ERROR(zm requires Sys::Mmap for mapped memory - set --enable-mmap=no to use IPC shared memory instead))
-fi
-
-# Optional perl modules
-AC_PROG_PERL_MODULES(Module::Load,,AC_MSG_WARN(Module::Load is required for PTZ camera control))
-AC_PROG_PERL_MODULES(Device::SerialPort,,AC_MSG_WARN(Device::SerialPort is required for RS232/RS485 PTZ camera control))
-AC_PROG_PERL_MODULES(Net::FTP,,AC_MSG_WARN(Net::FTP is required for automatic event uploading using ftp))
-AC_PROG_PERL_MODULES(Net::SFTP::Foreign,,AC_MSG_WARN(Net::SFTP::Foreign is required for automatic event uploading using sftp))
-AC_PROG_PERL_MODULES(Expect,,AC_MSG_WARN(Expect is required for automatic event uploading using sftp))
-AC_PROG_PERL_MODULES(Archive::Tar,,AC_MSG_WARN(Archive::Tar may be required for automatic event uploading))
-AC_PROG_PERL_MODULES(Archive::Zip,,AC_MSG_WARN(Archive::Zip may be required for automatic event uploading))
-AC_PROG_PERL_MODULES(Net::SMTP,,AC_MSG_WARN(Net::SMTP may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(MIME::Lite,,AC_MSG_WARN(MIME::Lite may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(MIME::Entity,,AC_MSG_WARN(MIME::Entity may be required for automatic event email notification))
-AC_PROG_PERL_MODULES(X10::ActiveHome,,AC_MSG_WARN(X10::ActiveHome is required for X.10 support))
-
-AC_DEFINE_DIR([BINDIR],[bindir],[Expanded binary directory])
-AC_DEFINE_DIR([LIBDIR],[libdir],[Expanded library directory])
-AC_DEFINE_DIR([DATADIR],[datadir],[Expanded data directory])
-AC_SUBST(PKGDATADIR,"$DATADIR/$PACKAGE")
-AC_SUBST(ZM_PID,"$ZM_RUNDIR/zm.pid")
-#AC_DEFINE_DIR([SYSCONFDIR],[sysconfdir],[Expanded configuration directory])
-#AC_SUBST(ZM_CONFIG,"$SYSCONFDIR/zm.conf")
-AC_SUBST(ZM_CONFIG,"$ZM_CONFIG_DIR/zm.conf")
-
-# Slight hack for non-standard perl install paths
-if test "$prefix" != "NONE"; then
-    PERL_SITE_PREFIX=`perl -V:siteprefix | sed -e "s/.*='\(.*\)';/\1/"`
-    PERL_SITE_LIB=`perl -V:installsitelib | sed -e "s/.*='\(.*\)';/\1/"`
-    PERL_LIB_PATH=`echo $PERL_SITE_LIB | sed -e "s|^$PERL_SITE_PREFIX||"`
-    EXTRA_PERL_LIB="use lib '$prefix$PERL_LIB_PATH'; # Include custom perl install path"
-    PERL_MM_PARMS="\"PREFIX=$prefix INSTALLDIRS=vendor\""
-else
-    EXTRA_PERL_LIB="# Include from system perl paths only"
-    PERL_MM_PARMS="\"INSTALLDIRS=vendor\""
-fi
-AC_SUBST(PERL_MM_PARMS)
-AC_SUBST(EXTRA_PERL_LIB)
-
-AC_CONFIG_FILES([Makefile zm.conf zmconfgen.pl db/Makefile db/zm_create.sql misc/Makefile misc/apache.conf misc/logrotate.conf misc/syslog.conf misc/com.zoneminder.systemctl.policy misc/com.zoneminder.systemctl.rules onvif/Makefile onvif/scripts/Makefile scripts/Makefile scripts/zm scripts/zmaudit.pl scripts/zmcontrol.pl scripts/zmdc.pl scripts/zmfilter.pl scripts/zmpkg.pl scripts/zmtrack.pl scripts/zmcamtool.pl scripts/zmsystemctl.pl scripts/zmtrigger.pl scripts/zmupdate.pl scripts/zmvideo.pl scripts/zmwatch.pl scripts/zmx10.pl scripts/zmdbbackup scripts/zmdbrestore scripts/zmeventdump scripts/zmlogrotate.conf scripts/ZoneMinder/lib/ZoneMinder/Base.pm scripts/ZoneMinder/lib/ZoneMinder/Config.pm scripts/ZoneMinder/lib/ZoneMinder/Memory.pm scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm src/Makefile src/zm_config.h web/Makefile web/ajax/Makefile web/css/Makefile web/graphics/Makefile web/includes/Makefile web/includes/config.php web/js/Makefile web/lang/Makefile web/skins/Makefile web/skins/classic/Makefile web/skins/classic/ajax/Makefile web/skins/classic/css/Makefile web/skins/classic/css/classic/Makefile web/skins/classic/css/classic/views/Makefile web/skins/classic/css/dark/Makefile web/skins/classic/css/dark/views/Makefile web/skins/classic/css/flat/Makefile web/skins/classic/css/flat/views/Makefile web/skins/classic/graphics/Makefile web/skins/classic/includes/Makefile web/skins/classic/js/Makefile web/skins/classic/lang/Makefile web/skins/classic/views/Makefile web/skins/classic/views/js/Makefile web/skins/mobile/Makefile web/skins/mobile/ajax/Makefile web/skins/mobile/css/Makefile web/skins/mobile/graphics/Makefile web/skins/mobile/includes/Makefile web/skins/mobile/lang/Makefile web/skins/mobile/views/Makefile web/skins/mobile/views/css/Makefile web/tools/Makefile web/tools/mootools/Makefile web/views/Makefile web/skins/xml/Makefile web/skins/xml/views/Makefile web/skins/xml/includes/Makefile])
-
-# Create the definitions for compilation and defaults for the database
-AC_CONFIG_COMMANDS([src/zm_config_defines.h],[perl ./zmconfgen.pl])
-# Manually generate the perl Makefile maker
-AC_CONFIG_COMMANDS([scripts/ZoneMinder/Makefile],[(cd scripts/ZoneMinder; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-AC_CONFIG_COMMANDS([onvif/modules/Makefile],[(cd onvif/modules; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-AC_CONFIG_COMMANDS([onvif/proxy/Makefile],[(cd onvif/proxy; echo "perl Makefile.PL $PERL_MM_PARMS"; perl Makefile.PL $PERL_MM_PARMS)],[PERL_MM_PARMS=$PERL_MM_PARMS])
-
-AC_OUTPUT
diff --git a/db/Makefile.am b/db/Makefile.am
deleted file mode 100644
index 9cb4e197c..000000000
--- a/db/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-zmdbdatadir = $(pkgdatadir)/db
-
-EXTRA_DIST = \
-	zm_create.sql.in \
-	$(dbupgrade_scripts)
-
-dist_zmdbdata_DATA = \
-	zm_create.sql \
-	$(dbupgrade_scripts)
-
-dbupgrade_scripts = $(wildcard zm_update-*.sql)
-
diff --git a/db/zm_create.sql.in b/db/zm_create.sql.in
index 3614bfedd..3a3a96691 100644
--- a/db/zm_create.sql.in
+++ b/db/zm_create.sql.in
@@ -193,6 +193,7 @@ CREATE TABLE `Events` (
   `Length` decimal(10,2) NOT NULL default '0.00',
   `Frames` int(10) unsigned default NULL,
   `AlarmFrames` int(10) unsigned default NULL,
+  `DefaultVideo` VARCHAR( 64 ) NOT NULL,
   `TotScore` int(10) unsigned NOT NULL default '0',
   `AvgScore` smallint(5) unsigned default '0',
   `MaxScore` smallint(5) unsigned default '0',
@@ -270,7 +271,7 @@ CREATE TABLE `Logs` (
   `TimeKey` decimal(16,6) NOT NULL,
   `Component` varchar(32) NOT NULL,
   `ServerId` int(10) unsigned,
-  `Pid` smallint(6) DEFAULT NULL,
+  `Pid` int(10) DEFAULT NULL,
   `Level` tinyint(3) NOT NULL,
   `Code` char(3) NOT NULL,
   `Message` text NOT NULL,
@@ -344,6 +345,10 @@ CREATE TABLE `Monitors` (
   `Palette` int(10) unsigned NOT NULL default '0',
   `Orientation` enum('0','90','180','270','hori','vert') NOT NULL default '0',
   `Deinterlacing` int(10) unsigned NOT NULL default '0',
+  `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' ,
+  `VideoWriter` TINYINT NOT NULL DEFAULT '0',
+  `EncoderParameters` TEXT NOT NULL,
+  `RecordAudio` TINYINT NOT NULL DEFAULT '0',
   `RTSPDescribe` tinyint(1) unsigned NOT NULL default '0',
   `Brightness` mediumint(7) NOT NULL default '-1',
   `Contrast` mediumint(7) NOT NULL default '-1',
diff --git a/db/zm_update-1.29.1.sql b/db/zm_update-1.29.1.sql
new file mode 100644
index 000000000..8fd43c318
--- /dev/null
+++ b/db/zm_update-1.29.1.sql
@@ -0,0 +1,7 @@
+--
+-- This updates a 1.29.0 database to 1.29.1
+--
+--
+
+-- Increase the size of the Pid field for FreeBSD
+ALTER TABLE Logs MODIFY Pid int(10);
diff --git a/db/zm_update-1.29.2.sql b/db/zm_update-1.29.2.sql
new file mode 100644
index 000000000..231e2ff63
--- /dev/null
+++ b/db/zm_update-1.29.2.sql
@@ -0,0 +1,73 @@
+--
+-- This updates a 1.29.0 database to 1.30.0
+--
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'SaveJPEGs'
+	) > 0,
+"SELECT 'Column SaveJPEGs exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `SaveJPEGs` TINYINT NOT NULL DEFAULT '3' AFTER `Deinterlacing`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'VideoWriter'
+	) > 0,
+"SELECT 'Column VideoWriter exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `VideoWriter` TINYINT NOT NULL DEFAULT '0' AFTER `SaveJPEGs`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'EncoderParameters'
+	) > 0,
+"SELECT 'Column EncoderParameters exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `EncoderParameters` TEXT NOT NULL AFTER `VideoWriter`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Events'
+	AND table_schema = DATABASE()
+	AND column_name = 'DefaultVideo'
+	) > 0,
+"SELECT 'Column DefaultVideo exists in Events'",
+"ALTER TABLE `Events` ADD `DefaultVideo` VARCHAR( 64 ) NOT NULL AFTER `AlarmFrames`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
+SET @s = (SELECT IF(
+	(SELECT COUNT(*)
+	FROM INFORMATION_SCHEMA.COLUMNS
+	WHERE table_name = 'Monitors'
+	AND table_schema = DATABASE()
+	AND column_name = 'RecordAudio'
+	) > 0,
+"SELECT 'Column RecordAudio exists in Monitors'",
+"ALTER TABLE `Monitors` ADD `RecordAudio` TINYINT NOT NULL DEFAULT '0' AFTER `EncoderParameters`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
diff --git a/distros/debian/README.source b/distros/debian/README.source
deleted file mode 100644
index 646e55d86..000000000
--- a/distros/debian/README.source
+++ /dev/null
@@ -1,5 +0,0 @@
-This package uses quilt to manage all modifications to the upstream source.
-Changes are stored in the source package as diffs in debian/patches and applied
-during the build.
-
-See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/distros/debian/changelog b/distros/debian/changelog
index ceebf9367..46f1e2bd9 100644
--- a/distros/debian/changelog
+++ b/distros/debian/changelog
@@ -1,3 +1,32 @@
+zoneminder (1.28.108-nmu2015100101) wheezy; urgency=low
+
+  * 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 01 Oct 2015 18:20:29 +0000
+
+zoneminder (1.28.107-nmu2015092401) wheezy; urgency=low
+
+  * 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 24 Sep 2015 14:15:46 +0000
+
+zoneminder (1.28.1+106-nmu2015091001) wheezy; urgency=low
+
+  * 
+
+ -- Isaac Connor <iconnor@connortechnology.com>  Thu, 10 Sep 2015 18:03:43 +0000
+
+zoneminder (1.28.0-0.1) wheezy; urgency=low
+
+  * Use CMake instead of Autotools to simplify
+    debian/rules and have less build-depends.
+  * Some lintian love in debian/{control,copyright}
+    and perl ZoneMinder modules.
+  * Don't purge database if we use a remote
+    MySQL server.
+
+ -- Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>  Sun, 09 Nov 2014 02:20:20 +0100
+
 zoneminder (1.28.0-wheezy) wheezy; urgency=medium
 
   * Release
diff --git a/distros/debian/control b/distros/debian/control
index 70d03eaa5..3b11f37b8 100644
--- a/distros/debian/control
+++ b/distros/debian/control
@@ -2,15 +2,46 @@ Source: zoneminder
 Section: net
 Priority: optional
 Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), autoconf, automake, quilt, libphp-serialization-perl, libgnutls-dev|libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev|libgcrypt20-dev, libpolkit-gobject-1-dev
+Build-Depends: debhelper (>= 9), cmake
+    , libphp-serialization-perl
+    , libgnutls28-dev | libgnutls-dev
+    , libmysqlclient-dev | libmariadbclient-dev
+    , libjpeg8-dev
+    , libpcre3-dev
+    , libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev
+    , libv4l-dev (>= 0.8.3)
+    , libbz2-dev
+    , libav-tools
+    , libnetpbm10-dev
+    , libavdevice-dev
+    , libvlccore-dev, libvlc-dev
+    , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
+    , libgcrypt11-dev, libpolkit-gobject-1-dev
 Standards-Version: 3.9.4
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
-Recommends: mysql-server|mariadb-server
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+    , apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm
+    , php5-mysqlnd | php5-mysql
+    , mariadb-client | mysql-client
+    , libphp-serialization-perl
+    , libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, libdbd-mysql-perl
+    , libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl
+    , libmodule-load-perl, libsys-mmap-perl, libjson-any-perl
+    , libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl
+    , libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+    , libsys-cpu-perl, libsys-meminfo-perl
+    , libpcre3
+    , libav-tools, libavdevice53
+    , rsyslog | system-log-daemon
+    , netpbm , libjpeg8
+    , zip
+    , libvlccore5 | libvlccore7, libvlc5
+    , libpolkit-gobject-1-0, php5-gd
+Recommends: mysql-server | mariadb-server
 Description: Video camera security and surveillance solution
- ZoneMinder is intended for use in single or multi-camera video security
+ ZoneMinder is intended for use in single or multi-camera video security 
  applications, including commercial or home CCTV, theft prevention and child
  or family member or home monitoring and other care scenarios. It
  supports capture, analysis, recording, and monitoring of video data coming
@@ -22,9 +53,9 @@ Description: Video camera security and surveillance solution
  via X.10 or other protocols.
 
 Package: zoneminder-dbg
+Architecture: any
 Section: debug
 Priority: extra
-Architecture: any
 Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
 Description: Debugging symbols for zoneminder.
  ZoneMinder is a video camera security and surveillance solution.
diff --git a/distros/debian/copyright b/distros/debian/copyright
index a177502a0..1c10c59db 100644
--- a/distros/debian/copyright
+++ b/distros/debian/copyright
@@ -20,3 +20,38 @@ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian GNU/Linux systems, the text of the GPL can be found in
 /usr/share/common-licenses/GPL.
+
+/usr/share/zoneminder/api/lib/Cake/*:
+Copyright:
+
+Copyright (c) 2005-2013, Cake Software Foundation, Inc.
+
+License:
+
+CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
+
+The MIT License
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+Cake Software Foundation, Inc.
+1785 E. Sahara Avenue,
+Suite 490-204
+Las Vegas, Nevada 89104,
+United States of America.
diff --git a/distros/debian/dirs b/distros/debian/dirs
index 4178482c1..9e29e6113 100644
--- a/distros/debian/dirs
+++ b/distros/debian/dirs
@@ -3,4 +3,3 @@ var/lib/zm
 var/cache/zoneminder/events
 var/cache/zoneminder/images
 var/cache/zoneminder/temp
-usr/share/zoneminder/db
diff --git a/distros/debian/init.d b/distros/debian/init.d
index f22143c38..036bb695d 100644
--- a/distros/debian/init.d
+++ b/distros/debian/init.d
@@ -24,12 +24,10 @@ command="$ZM_PATH_BIN/zmpkg.pl"
 start() {
 	echo -n "Starting $prog: "
 	export TZ=:/etc/localtime
-	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
-	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
+	mkdir -p $RUNDIR $TMPDIR && chown www-data:www-data $RUNDIR $TMPDIR
 	$command start
 	RETVAL=$?
-	[ $RETVAL = 0 ] && echo success
-	[ $RETVAL != 0 ] && echo failure
+	[ $RETVAL = 0 ] && echo success || echo failure
 	echo
 	[ $RETVAL = 0 ] && touch /var/lock/zm
 	return $RETVAL
@@ -52,8 +50,7 @@ stop() {
 	else
 		$command stop
 		RETVAL=$?
-		[ $RETVAL = 0 ] && echo success
-		[ $RETVAL != 0 ] && echo failure
+		[ $RETVAL = 0 ] && echo success || echo failure
 		echo
 		[ $RETVAL = 0 ] && rm -f /var/lock/zm
 	fi
diff --git a/distros/debian/install b/distros/debian/install
index 4b0009cea..97c5f7a03 100644
--- a/distros/debian/install
+++ b/distros/debian/install
@@ -1,12 +1,8 @@
 usr/bin
-usr/lib/cgi-bin
+usr/lib/zoneminder/cgi-bin
 usr/share/man
 usr/share/perl5/ZoneMinder
 usr/share/perl5/ZoneMinder.pm
-usr/share/polkit-1/actions
-usr/share/polkit-1/rules.d
-usr/share/zoneminder
+usr/share/zoneminder/db
+usr/share/zoneminder/www
 etc/zm
-db/zm_create.sql usr/share/zoneminder/db
-db/zm_update-*.sql usr/share/zoneminder/db
-debian/apache.conf etc/zm
diff --git a/distros/debian/links b/distros/debian/links
index 9715ee428..5560a100a 100644
--- a/distros/debian/links
+++ b/distros/debian/links
@@ -1,4 +1,3 @@
 var/cache/zoneminder/events usr/share/zoneminder/events
 var/cache/zoneminder/images usr/share/zoneminder/images
 var/cache/zoneminder/temp   usr/share/zoneminder/temp
-usr/lib/cgi-bin             usr/share/zoneminder/cgi-bin
diff --git a/distros/debian/patches/series b/distros/debian/patches/series
deleted file mode 100644
index e69de29bb..000000000
diff --git a/distros/debian/postinst b/distros/debian/postinst
index 42a3bb1dc..39e3dfc32 100644
--- a/distros/debian/postinst
+++ b/distros/debian/postinst
@@ -3,53 +3,51 @@
 set -e
 
 if [ "$1" = "configure" ]; then
-	if [ -e "/etc/init.d/mysql" ]; then 
-		#
-		# Get mysql started if it isn't
-		#
-		if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
-				invoke-rc.d mysql start
-		fi
-		if $(/etc/init.d/mysql status >/dev/null 2>&1); then
-			mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-			# test if database if already present...
-			if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-				cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-				echo 'grant lock tables, alter,select,insert,update,delete,create,index on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-			fi
 
-			invoke-rc.d zoneminder stop || true
-			zmupdate.pl --nointeractive
+    . /etc/zm/zm.conf
 
-		else
-			echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
-		fi
-	else 
-		echo 'mysql not found, assuming remote server.'
-	fi
-	chown www-data:www-data /var/log/zm
-	chown www-data:www-data /var/lib/zm/
+    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group.
+	chown www-data:root /var/log/zm
+	chown www-data:www-data /var/lib/zm
 	if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
+        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
 	fi
-fi
-# Ensure zoneminder is stopped...
-if [ -x "/etc/init.d/zoneminder" ]; then
-        if invoke-rc.d zoneminder status ; then
-                invoke-rc.d zoneminder stop || exit $?
+
+    # Do this every time the package is installed or upgraded
+
+    if [ "$ZM_DB_HOST" = "localhost" ]; then
+        if [ -e "/etc/init.d/mysql" ]; then 
+            #
+            # Get mysql started if it isn't
+            #
+            if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                    invoke-rc.d mysql start
+            fi
+            if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                # test if database if already present...
+                if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                    # This creates the user.
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                else
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                fi
+
+                # Ensure zoneminder is stopped
+                invoke-rc.d zoneminder stop || true
+                zmupdate.pl --nointeractive
+                zmupdate.pl --nointeractive -f
+                invoke-rc.d zoneminder start || true
+            else
+                echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+            fi
+        else 
+            echo 'mysql not found, assuming remote server.'
         fi
-fi
-
-if [ "$1" = "configure" ]; then
-	if [ -z "$2" ]; then
-		chown www-data:www-data /var/log/zm
-		chown www-data:www-data /var/lib/zm/
-		chown www-data:www-data -R /var/cache/zoneminder
     else
-		chown www-data:www-data /var/log/zm
+        echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
+    fi
 
-		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-		zmupdate.pl
-	fi
 fi
 #DEBHELPER#
diff --git a/distros/debian/postrm b/distros/debian/postrm
index 28a00a7a0..fde590981 100644
--- a/distros/debian/postrm
+++ b/distros/debian/postrm
@@ -1,9 +1,11 @@
 #! /bin/sh
-# set -e # to be reinstated later
+set -e
 
 if [ "$1" = "purge" ]; then
-    echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+    if [ -e "/etc/init.d/mysql" ]; then 
+        echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+        echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
+    fi
 fi
 #DEBHELPER#
diff --git a/distros/debian/preinst b/distros/debian/preinst
old mode 100755
new mode 100644
diff --git a/distros/debian/rules b/distros/debian/rules
index d07d3b823..4bdc7cb0c 100755
--- a/distros/debian/rules
+++ b/distros/debian/rules
@@ -1,66 +1,41 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall -g
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
-
-%:
-	dh $@ --with quilt,autoreconf
+export CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -pipe
+export CXXFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -pipe
+INSTDIR = debian/tmp
 
 override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
+	dh_auto_configure -- \
+		-DCMAKE_INSTALL_PREFIX=/usr \
+		-DCMAKE_SKIP_RPATH=ON \
+		-DCMAKE_VERBOSE_MAKEFILE=OFF \
+		-DCMAKE_COLOR_MAKEFILE=ON \
+		-DZM_RUNDIR=/var/run/zm \
+		-DZM_SOCKDIR=/var/run/zm \
+		-DZM_TMPDIR=/var/tmp/zm \
+		-DZM_LOGDIR=/var/log/zm \
+		-DZM_WEBDIR=/usr/share/zoneminder/www \
+		-DZM_CONTENTDIR=/var/cache/zoneminder \
+		-DZM_CGIDIR=/usr/lib/zoneminder/cgi-bin \
+		-DZM_WEB_USER=www-data \
+		-DZM_WEB_GROUP=www-data \
+		-DCMAKE_INSTALL_SYSCONFDIR=etc/zm
 
-override_dh_clean:
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
-
-override_dh_install:
-	dh_install --fail-missing
-	#
-	# NOTE: This is a short-term kludge; hopefully changes in the next
-	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/images
-	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	dh_link var/cache/zoneminder/events usr/share/zoneminder/events
-	dh_link var/cache/zoneminder/images usr/share/zoneminder/images
-	dh_link var/cache/zoneminder/temp usr/share/zoneminder/temp
-	#
-	# This is a slightly lesser kludge; moving the cgi stuff to
-	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
-	# having it just in /usr/lib/cgi-bin breaks another bit of
-	# behavior.
-	#
-	dh_link usr/lib/cgi-bin usr/share/zoneminder/cgi-bin
-
-override_dh_fixperms:
-	dh_fixperms
-	chown root:root debian/zoneminder/etc/zm/zm.conf
+override_dh_auto_install:
+	dh_auto_install --buildsystem=cmake
+	install -D -m 0644 debian/apache.conf  $(INSTDIR)/etc/zm/apache.conf
+	rm $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/LICENSE.txt
+	rm $(INSTDIR)/usr/share/zoneminder/api/.gitignore
+	rm -r $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/Test
 
 override_dh_auto_test:
 	# do not run tests...
 
-.PHONY: override_dh_strip
 override_dh_strip:
-		dh_strip --dbg-package=zoneminder-dbg
+	dh_strip --dbg-package=zoneminder-dbg
+
+%:
+	dh $@ --buildsystem=cmake --parallel
diff --git a/distros/debian8/README.Debian b/distros/debian8/README.Debian
deleted file mode 100644
index a49b6be72..000000000
--- a/distros/debian8/README.Debian
+++ /dev/null
@@ -1,51 +0,0 @@
-zoneminder for Debian
----------------------
-
-There is one manual step to get the web interface working.
-You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
-then reload the apache config (i.e. /etc/init.d/apache2 reload)
-
-Changing the location for images and events
--------------------------------------------
-
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-
-These lines would mount /dev/sdX1 to /video_storage, and then 'link' /video_storage
-to the locations that ZoneMinder expects them to be at.
-
-         /dev/sdX1 /video_storage ext4 defaults 0 2
-         /video_storage/zoneminder/images /var/cache/zoneminder/images none bind 0 2
-         /video_storage/zoneminder/events /var/cache/zoneminder/events none bind 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext4 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext4 defaults 0 2
-
-
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
-
-Access to /dev/video*
----------------------
-
-For cameras which require access to /dev/video*, zoneminder may need the 
-www-data user added to the video group in order to see those cameras:
-
-  adduser www-data video
-
-Note that all web applications running on the zoneminder server will then have 
-access to all video devices on the system.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/debian8/apache.conf b/distros/debian8/apache.conf
deleted file mode 100644
index 965c67f86..000000000
--- a/distros/debian8/apache.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /zm /usr/share/zoneminder/www
-
-<Directory /usr/share/zoneminder/www>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
diff --git a/distros/debian8/changelog b/distros/debian8/changelog
deleted file mode 100644
index 0035f1e36..000000000
--- a/distros/debian8/changelog
+++ /dev/null
@@ -1,41 +0,0 @@
-zoneminder (1.28.0+nmu1) testing; urgency=medium
-
-  * Non-maintainer upload
-  * Split the debian package into several packages
-  * Switch to native source format
-
- -- Emmanuel Papin <manupap01@gmail.com>  Thu, 15 Jan 2015 20:00:08 +0100
-
-zoneminder (1.28.0-0.2) testing; urgency=medium
-
-  * Non-maintainer upload.
-  * Upstream release for debian jessie
-  * Package dependencies updated
-  * debhelper version upgraded
-  * Standards-Version upgraded
-  * Use debhelper commands instead of standard commands
-  * Install man pages in /usr/share/man (patch added)
-  * Switch to quilt
-  * Switch to systemd
-  * Some lintian fixes
-
- -- Emmanuel Papin <manupap01@gmail.com>  Wed, 26 Nov 2014 00:26:01 +0100
-
-zoneminder (1.28.0-0.1) stable; urgency=medium
-
-  * Release
-
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:27:22 -0400
-
-zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium
-
-  * improve error messages
-  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400
-
-zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high
-
-  * Snapshot release - 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
diff --git a/distros/debian8/compat b/distros/debian8/compat
deleted file mode 100644
index ec635144f..000000000
--- a/distros/debian8/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/distros/debian8/control b/distros/debian8/control
deleted file mode 100644
index af5ba9ad0..000000000
--- a/distros/debian8/control
+++ /dev/null
@@ -1,122 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), po-debconf (>= 1.0), dh-systemd (>= 1.5), autoconf, automake, libphp-serialization-perl, libgnutls28-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev | libjpeg9-dev | libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev | libgcrypt20-dev, libpolkit-gobject-1-dev, libdbi-perl, libnet-sftp-foreign-perl, libexpect-perl, libmime-tools-perl
-Standards-Version: 3.9.6
-
-Package: zoneminder
-Section: metapackages
-Architecture: all
-Depends: ${misc:Depends},
- libzoneminder-perl (>= ${source:Version}),
- zoneminder-database (>= ${source:Version}),
- zoneminder-core (>= ${binary:Version}),
- zoneminder-ui-base (>= ${source:Version}),
- zoneminder-ui-classic (>= ${source:Version}),
- zoneminder-ui-mobile (>= ${source:Version}),
- zoneminder-ui-xml (>= ${source:Version})
-Description: Video camera security and surveillance solution (metapackage)
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-Package: libzoneminder-perl
-Section: perl
-Architecture: all
-Depends: ${misc:Depends}, ${perl:Depends}, libdbi-perl,
- libdevice-serialport-perl, libimage-info-perl, libjson-any-perl,
- libsys-mmap-perl, liburi-encode-perl, libwww-perl
-Description: Perl libraries for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the libraries for the perl scripts, it can be used to
- write custom interfaces as well.
-
-Package: zoneminder-database
-Section: database
-Architecture: all
-Depends: ${misc:Depends}, debconf, dbconfig-common,
- mysql-client | mariadb-client
-Recommends: mysql-server | mariadb-server
-Description: Database management package for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the sql files and maintenance scripts to perform all the
- database operations (installation, upgrade or removal) on a local or a remote
- server.
-
-Package: zoneminder-core
-Section: video
-Architecture: any
-Depends: libzoneminder-perl (= ${source:Version}),
- zoneminder-database (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends},
- ${perl:Depends}, libarchive-tar-perl, libarchive-zip-perl, libdate-manip-perl,
- libdbi-perl, libmodule-load-conditional-perl, libmime-lite-perl,
- libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
- debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, netpbm, zip,
- policykit-1, apache2
-Description: Core binaries and perl scripts for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the executable compiled binaries which do the main video
- processing work and the perl scripts which perform helper and/or external
- interface tasks.
-
-Package: zoneminder-core-dbg
-Priority: extra
-Section: debug
-Architecture: any
-Depends: zoneminder-core (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the debugging symbols for the executable compiled
- binaries.
-
-Package: zoneminder-ui-base
-Section: web
-Architecture: any
-Depends: zoneminder-core (= ${binary:Version}), ${shlibs:Depends},
- ${misc:Depends}, debconf, apache2, libapache2-mod-php5 | libapache2-mod-fcgid,
- php5, php5-mysql | php5-mysqlnd, php5-gd
-Description: Essential files for ZoneMinder's web user interface
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the essential web files and maintenance scripts to set up
- a basic web environment.
-
-Package: zoneminder-ui-classic
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Classic web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the classic web user interface.
-
-Package: zoneminder-ui-mobile
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Mobile web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the web user interface for mobile devices.
-
-Package: zoneminder-ui-xml
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: XML interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides a XML interface mainly intended for use with the eyeZm
- iPhone Application, but can be used with any other custom programs as well.
diff --git a/distros/debian8/copyright b/distros/debian8/copyright
deleted file mode 100644
index a177502a0..000000000
--- a/distros/debian8/copyright
+++ /dev/null
@@ -1,22 +0,0 @@
-Copyright:
-
-Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
-
-License:
-
-This package is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
diff --git a/distros/debian8/docs b/distros/debian8/docs
deleted file mode 100644
index b43bf86b5..000000000
--- a/distros/debian8/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/distros/debian8/libzoneminder-perl.install b/distros/debian8/libzoneminder-perl.install
deleted file mode 100644
index 792ffc15e..000000000
--- a/distros/debian8/libzoneminder-perl.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/perl5/ZoneMinder
-usr/share/perl5/ZoneMinder.pm
-debian/tmp/usr/share/man/man3/ZoneMinder.3pm
-debian/tmp/usr/share/man/man3/ZoneMinder::*
diff --git a/distros/debian8/po/POTFILES.in b/distros/debian8/po/POTFILES.in
deleted file mode 100644
index 5b155907e..000000000
--- a/distros/debian8/po/POTFILES.in
+++ /dev/null
@@ -1,3 +0,0 @@
-[type: gettext/rfc822deb] zoneminder-core.templates
-[type: gettext/rfc822deb] zoneminder-database.templates
-[type: gettext/rfc822deb] zoneminder-ui-base.templates
diff --git a/distros/debian8/po/fr.po b/distros/debian8/po/fr.po
deleted file mode 100644
index 85ced7fd2..000000000
--- a/distros/debian8/po/fr.po
+++ /dev/null
@@ -1,252 +0,0 @@
-# debconf french translation file for ZoneMinder.
-# Copyright (C) 2001-2008 Philip Coombes
-# This file is distributed under the same license as the zoneminder package.
-# First author: Emmanuel Papin <manupap01@gmail.com>, 2014.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: zoneminder\n"
-"Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-16 12:34+0100\n"
-"PO-Revision-Date: 2014-12-07 00:40+0100\n"
-"Last-Translator: Emmanuel Papin <manupap01@gmail.com>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"Language: fr\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid "Delete this non empty directory?"
-msgstr "Supprimer ce répertoire non vide ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"A purge of the ZoneMinder package is performed but the directory '/var/cache/"
-"zoneminder' is not empty so it will not be deleted."
-msgstr ""
-"Une purge du paquet ZoneMinder est en cours mais le répertoire '/var/cache/"
-"zoneminder' n'est pas vide et sera donc conservé."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"Please consider that this directory is designed to contain data resulting "
-"from event detection. Therefore, \"proof of evidence\" could be lost!\""
-msgstr ""
-"Veuillez considérer que ce répertoire est conçu pour contenir des données "
-"résultants de la détection d'événements. Par conséquent, des preuves "
-"pourraient être perdues !"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"If you are not sure of your decision, please do not delete this directory "
-"but perform a manual checkup."
-msgstr ""
-"Si vous n'êtes pas sûr de votre décision, veuillez conserver ce répertoire "
-"et effectuer une vérification manuelle."
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid "Deletion confirmed?"
-msgstr "Supression confirmée ?"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid ""
-"You have allowed the deletion of directory '/var/cache/zoneminder' although "
-"it may contain critical data."
-msgstr ""
-"Vous avez autorisé la suppression du répertoire '/var/cache/zoneminder' bien "
-"qu'il puisse contenir des données critiques."
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "local"
-msgstr "local"
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "remote"
-msgstr "distant"
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid "Database location:"
-msgstr "Emplacement de la base de donnée :"
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"A database server is required to run ZoneMinder. The database can be "
-"installed either locally or remotely on a machine of your network."
-msgstr ""
-"Un serveur de base de données est requis pour ZoneMinder. La base de donnée "
-"peut être installée localement ou à distance sur une machine de votre réseau."
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"If you choose a remote location, you will have to select the 'tcp/ip' "
-"connection method and enter the hostname or ip address of the remote machine "
-"in the next configuration screens."
-msgstr ""
-"Si vous choisissez un emplacement distant, vous devrez sélectionner la "
-"méthode de connexion 'tcp/ip' et entrer le nom réseau ou l'adresse ip de la "
-"machine distante dans les écrans de configuration suivants."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid "No local database server is available:"
-msgstr "Aucun serveur local de base de données n'est disponible :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"Currently ZoneMinder supports mysql or mariadb database server but none of "
-"them appears to be installed on this machine."
-msgstr ""
-"Actuellement ZoneMinder supporte les serveurs de base de données mysql et "
-"mariadb mais aucun d'entre eux n'est installé sur cette machine."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"In order to complete ZoneMinder's installation, after ending of this "
-"assistant, please install a compatible database server and then restart the "
-"assistant by invoking:"
-msgstr ""
-"Afin de compléter l'installation de ZoneMinder, après la fermeture de cet "
-"assitant, veuillez installer un serveur de base de données compatible et "
-"ensuite redémarrez l'assistant en invoquant :"
-
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001 ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr "$ sudo dpkg-reconfigure zoneminder"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "Remote database servers are not allowed:"
-msgstr "Les serveurs de base de données distants ne sont pas autorisés :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"The current configuration of dbconfig-common does not allow installation of "
-"a database on remote servers."
-msgstr ""
-"La configuration actuelle de dbconfig-common ne permet pas l'installation de "
-"bases de données sur des serveurs distants."
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"In order to reconfigure dbconfig-common, please invoke the following command "
-"after ending of this assistant:"
-msgstr ""
-"Afin de reconfigurer dbconfig-common, veuillez invoquer la commande suivante "
-"après la fermeture de cet assitant :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure dbconfig-common"
-msgstr "$ sudo dpkg-reconfigure dbconfig-common"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"Then, to complete ZoneMinder's installation, please restart this assistant "
-"by invoking:"
-msgstr ""
-"Ensuite, pour compléter l'installation de ZoneMinder, veuillez redémarrer "
-"cet assistant en invoquant :"
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "New password for the ZoneMinder 'admin' user:"
-msgstr "Nouveau mot de passe pour le compte 'admin' de ZoneMinder :"
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "Please enter the password of the default administrative user."
-msgstr "Veuillez entrer le mot de passe du compte administrateur par défaut."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid ""
-"While not mandatory, it is highly recommended that you set a custom password "
-"for the administrative 'admin' user."
-msgstr ""
-"Bien que cela ne soit pas obligatoire, il est fortement recommandé de "
-"fournir un mot de passe personnalisé pour le compte administrateur 'admin'."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "If this field is left blank, the password will not be changed."
-msgstr "Si le champ est laissé vide, le mot de passe ne sera pas changé."
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:5001
-msgid "Repeat password for the ZoneMinder 'admin' user:"
-msgstr "Répéter le mot de passe pour le compte 'admin' de ZoneMinder :"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "Password input error"
-msgstr "Erreur de mot de passe"
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-"Les deux mots de passe saisis ne sont pas les mêmes. Veuillez essayer à "
-"nouveau."
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr "Serveur web à reconfigurer automatiquement :"
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured for "
-"ZoneMinder's web portal access."
-msgstr ""
-"Veuillez choisir le serveur web à reconfigurer automatiquement pour l'accès "
-"au portail web de ZoneMinder."
diff --git a/distros/debian8/po/templates.pot b/distros/debian8/po/templates.pot
deleted file mode 100644
index 941a4094e..000000000
--- a/distros/debian8/po/templates.pot
+++ /dev/null
@@ -1,222 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: zoneminder\n"
-"Report-Msgid-Bugs-To: zoneminder@packages.debian.org\n"
-"POT-Creation-Date: 2014-12-16 12:34+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid "Delete this non empty directory?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"A purge of the ZoneMinder package is performed but the directory '/var/cache/"
-"zoneminder' is not empty so it will not be deleted."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"Please consider that this directory is designed to contain data resulting "
-"from event detection. Therefore, \"proof of evidence\" could be lost!\""
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:1001
-msgid ""
-"If you are not sure of your decision, please do not delete this directory "
-"but perform a manual checkup."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid "Deletion confirmed?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../zoneminder-core.templates:2001
-msgid ""
-"You have allowed the deletion of directory '/var/cache/zoneminder' although "
-"it may contain critical data."
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "local"
-msgstr ""
-
-#. Type: select
-#. Choices
-#: ../zoneminder-database.templates:1001
-msgid "remote"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid "Database location:"
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"A database server is required to run ZoneMinder. The database can be "
-"installed either locally or remotely on a machine of your network."
-msgstr ""
-
-#. Type: select
-#. Description
-#: ../zoneminder-database.templates:1002
-msgid ""
-"If you choose a remote location, you will have to select the 'tcp/ip' "
-"connection method and enter the hostname or ip address of the remote machine "
-"in the next configuration screens."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid "No local database server is available:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"Currently ZoneMinder supports mysql or mariadb database server but none of "
-"them appears to be installed on this machine."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001
-msgid ""
-"In order to complete ZoneMinder's installation, after ending of this "
-"assistant, please install a compatible database server and then restart the "
-"assistant by invoking:"
-msgstr ""
-
-#. Type: error
-#. Description
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:2001 ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure zoneminder"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "Remote database servers are not allowed:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"The current configuration of dbconfig-common does not allow installation of "
-"a database on remote servers."
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"In order to reconfigure dbconfig-common, please invoke the following command "
-"after ending of this assistant:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid "$ sudo dpkg-reconfigure dbconfig-common"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:3001
-msgid ""
-"Then, to complete ZoneMinder's installation, please restart this assistant "
-"by invoking:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "New password for the ZoneMinder 'admin' user:"
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "Please enter the password of the default administrative user."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid ""
-"While not mandatory, it is highly recommended that you set a custom password "
-"for the administrative 'admin' user."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:4001
-msgid "If this field is left blank, the password will not be changed."
-msgstr ""
-
-#. Type: password
-#. Description
-#: ../zoneminder-database.templates:5001
-msgid "Repeat password for the ZoneMinder 'admin' user:"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "Password input error"
-msgstr ""
-
-#. Type: error
-#. Description
-#: ../zoneminder-database.templates:6001
-msgid "The two passwords you entered were not the same. Please try again."
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid "Web server to reconfigure automatically:"
-msgstr ""
-
-#. Type: multiselect
-#. Description
-#: ../zoneminder-ui-base.templates:1001
-msgid ""
-"Please choose the web server that should be automatically configured for "
-"ZoneMinder's web portal access."
-msgstr ""
diff --git a/distros/debian8/rules b/distros/debian8/rules
deleted file mode 100755
index 3364d8750..000000000
--- a/distros/debian8/rules
+++ /dev/null
@@ -1,154 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-
-CFLAGS = -Wall
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
-DEBOPT = --enable-debug
-CFLAGS += -g
-CXXFLAGS += -g
-else
-DEBOPT =
-endif
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-# These are used to get the most recent version of the original sources from github
-UURL = $(shell git config --get remote.origin.url)
-BRANCH = $(shell git rev-parse --abbrev-ref HEAD)
-HEAD = $(shell git rev-parse HEAD)
-PKD  = $(abspath $(dir $(MAKEFILE_LIST)))
-PKG  = $(word 2,$(shell dpkg-parsechangelog -l$(PKD)/changelog | grep ^Source))
-VER ?= $(shell dpkg-parsechangelog -l$(PKD)/changelog | perl -ne 'print $$1 if m{^Version:\s+(?:\d+:)?(\d.*)(?:\-|\+nmu\d+.*)};')
-DTYPE =
-TARBALL = ../$(PKG)_$(VER)$(DTYPE).orig.tar.xz
-
-%:
-	dh $@ --with autoreconf,systemd
-
-override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- \
-	  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
-	  --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man \
-	  --infodir=\$${prefix}/share/info --with-mysql=/usr \
-	  --with-mariadb=/usr --with-webdir=/usr/share/zoneminder \
-	  --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin \
-	  --with-webuser=www-data --with-webgroup=www-data \
-	  --enable-crashtrace=no --enable-mmap=yes $(DEBOPT)
-
-override_dh_clean:
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean src/zm_config_defines.h
-	#
-	# Delete remaining auto-generated Makefile if Makefile.in exists
-	find $(CURDIR)/ -type f -name "Makefile" | while read file; do \
-	  [ -f $$file.in ] && rm -f $$file; \
-	done || true
-	#
-	# Delete remaining auto-generated Makefile.in if Makefile.am exists
-	find $(CURDIR)/ -type f -name "Makefile.in" | while read filein; do \
-	  fileam=`echo $$filein | sed 's/\(.*\)\.in/\1\.am/'`; \
-	  [ -f $$fileam ] && rm -f $$filein; \
-	done || true
-
-override_dh_install:
-	dh_install --fail-missing
-	#
-	# NOTE: This is a short-term kludge; hopefully changes in the next
-	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/images
-	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	# The link stuff for these folders has been moved to
-	# zoneminder-core.links file
-	#
-	# This is a slightly lesser kludge; moving the cgi stuff to
-	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
-	# having it just in /usr/lib/cgi-bin breaks another bit of
-	# behavior.
-	# The link stuff for /usr/share/zoneminder/cgi-bin has been moved to
-	# zoneminder-ui-base.links file
-
-override_dh_installinit:
-	dh_installinit --package=zoneminder-core --name=zoneminder
-
-override_dh_systemd_start:
-	dh_systemd_start --package=zoneminder-core --name=zoneminder \
-	  --restart-after-upgrade
-
-override_dh_systemd_enable:
-	dh_systemd_enable --package=zoneminder-core --name=zoneminder
-
-override_dh_fixperms:
-	dh_fixperms
-	#
-	# As requested by the Debian Webapps Policy Manual §3.2.1
-	chown root:www-data debian/zoneminder-core/etc/zm/zm.conf
-	chmod 640 debian/zoneminder-core/etc/zm/zm.conf
-
-override_dh_auto_test:
-	# do not run tests...
-
-.PHONY: override_dh_strip
-override_dh_strip:
-	dh_strip --dbg-package=zoneminder-core-dbg
-
-# Inspired by https://wiki.debian.org/onlyjob/get-orig-source
-.PHONY: get-orig-source
-get-orig-source: $(TARBALL) $(info I: $(PKG)_$(VER)$(DTYPE))
-	@
-
-$(TARBALL):
-	$(if $(wildcard $(PKG)-$(VER)),$(error folder '$(PKG)-$(VER)' exists, aborting...))
-	@echo "# Cloning origin repository..."; \
-	if ! git clone $(UURL) $(PKG)-$(VER); then \
-	  $(RM) -r $(PKG)-$(VER); \
-	  echo "failed to clone repository, aborting..."; \
-	  false; \
-	fi
-	@if [ $(BRANCH) != "master" ]; then \
-	  cd $(PKG)-$(VER); \
-	  echo "# Not on master branch, fetching origin branch '$(BRANCH)'..."; \
-	  git fetch origin $(BRANCH):$(BRANCH) || false; \
-	  echo "# Switching to branch '$(BRANCH)'..."; \
-	  git checkout $(BRANCH) || false; \
-	fi
-	@echo "# Checking local source..."
-	@if [ $$(cd $(PKG)-$(VER) && git rev-parse HEAD) = $(HEAD) ]; then \
-	  echo "even with origin, ok"; \
-	  true; \
-	else \
-	  echo "not even with origin, aborting..."; \
-	  false; \
-	fi
-	@echo "# Setting times..."
-	@cd $(PKG)-$(VER) \
-	&& for F in $$(git ls-tree -r --name-only HEAD | sed -e "s/\s/\*/g"); do \
-	  touch --no-dereference -d "$$(git log -1 --format="%ai" -- $$F)" "$$F"; \
-	done
-	@echo "# Cleaning-up..."
-	cd $(PKG)-$(VER) && $(RM) -r .git
-	@echo "# Packing file '$(TARBALL)'..."
-	@find -L "$(PKG)-$(VER)" -xdev -type f -print | sort \
-	| XZ_OPT="-6v" tar -caf "$(TARBALL)" -T- --owner=root --group=root --mode=a+rX \
-	&& $(RM) -r "$(PKG)-$(VER)"
diff --git a/distros/debian8/source/local-options b/distros/debian8/source/local-options
deleted file mode 100644
index e69de29bb..000000000
diff --git a/distros/debian8/source/options b/distros/debian8/source/options
deleted file mode 100644
index 8bd61fce6..000000000
--- a/distros/debian8/source/options
+++ /dev/null
@@ -1 +0,0 @@
-extend-diff-ignore = "(^|/)(config\.sub|config\.guess|Makefile|aclocal.m4|compile|config.h.in|configure|depcomp|install-sh|missing)$"
diff --git a/distros/debian8/zoneminder-core.config b/distros/debian8/zoneminder-core.config
deleted file mode 100644
index 2a15a599e..000000000
--- a/distros/debian8/zoneminder-core.config
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-core.dirs b/distros/debian8/zoneminder-core.dirs
deleted file mode 100644
index 350c32aff..000000000
--- a/distros/debian8/zoneminder-core.dirs
+++ /dev/null
@@ -1,4 +0,0 @@
-var/log/zm
-var/cache/zoneminder/events
-var/cache/zoneminder/images
-var/cache/zoneminder/temp
diff --git a/distros/debian8/zoneminder-core.install b/distros/debian8/zoneminder-core.install
deleted file mode 100644
index afd9ada95..000000000
--- a/distros/debian8/zoneminder-core.install
+++ /dev/null
@@ -1,4 +0,0 @@
-etc/zm
-usr/bin
-usr/share/polkit-1/actions
-usr/share/polkit-1/rules.d
diff --git a/distros/debian8/zoneminder-core.links b/distros/debian8/zoneminder-core.links
deleted file mode 100644
index 5560a100a..000000000
--- a/distros/debian8/zoneminder-core.links
+++ /dev/null
@@ -1,3 +0,0 @@
-var/cache/zoneminder/events usr/share/zoneminder/events
-var/cache/zoneminder/images usr/share/zoneminder/images
-var/cache/zoneminder/temp   usr/share/zoneminder/temp
diff --git a/distros/debian8/zoneminder-core.postinst b/distros/debian8/zoneminder-core.postinst
deleted file mode 100644
index b1552e73b..000000000
--- a/distros/debian8/zoneminder-core.postinst
+++ /dev/null
@@ -1,80 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Source the config file
-CONFIGFILE=/etc/zm/zm.conf
-. $CONFIGFILE
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Retrieve data from dbconfig (inputs from user)
-    . /etc/dbconfig-common/zoneminder.conf
-
-    # ZoneMinder config file handling
-    # Inspired by: http://manpages.debian.org/cgi-bin/man.cgi?query=debconf-devel&sektion=7
-
-    # Backup the config file
-    cp -a -f $CONFIGFILE ${CONFIGFILE}.postinst.bak
-
-    # Redeclare variables if missing in config file
-    test -z $dbc_dbserver || grep -Eq "^ *ZM_DB_HOST=" $CONFIGFILE \
-      || echo "ZM_DB_HOST=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbname || grep -Eq "^ *ZM_DB_NAME=" $CONFIGFILE \
-      || echo "ZM_DB_NAME=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbuser || grep -Eq "^ *ZM_DB_USER=" $CONFIGFILE \
-      || echo "ZM_DB_USER=" >> ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbpass || grep -Eq "^ *ZM_DB_PASS=" $CONFIGFILE \
-      || echo "ZM_DB_PASS=" >> ${CONFIGFILE}.postinst.bak
-
-    # Prevent ZM_DB_HOST to be empty if user selected the 'unix socket' method
-    if test -z $dbc_dbserver; then
-        dbc_dbserver_override="localhost"
-    else
-        dbc_dbserver_override=$dbc_dbserver
-    fi
-
-    # Update variables in config file
-    sed -i "s/^ *ZM_DB_HOST=.*/ZM_DB_HOST=$dbc_dbserver_override/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbname || sed -i "s/^ *ZM_DB_NAME=.*/ZM_DB_NAME=$dbc_dbname/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbuser || sed -i "s/^ *ZM_DB_USER=.*/ZM_DB_USER=$dbc_dbuser/" \
-      ${CONFIGFILE}.postinst.bak
-    test -z $dbc_dbpass || sed -i "s/^ *ZM_DB_PASS=.*/ZM_DB_PASS=$dbc_dbpass/" \
-      ${CONFIGFILE}.postinst.bak
-
-    # Clean-up backup file
-    mv -f ${CONFIGFILE}.postinst.bak $CONFIGFILE
-
-
-    # Set some file permissions
-    chown $ZM_WEB_USER:$ZM_WEB_GROUP /var/log/zm
-    if [ -z "$2" ]; then
-        chown $ZM_WEB_USER:$ZM_WEB_GROUP -R /var/cache/zoneminder
-    fi
-    # As requested by the Debian Webapps Policy Manual §3.2.1
-    chown root:${ZM_WEB_GROUP} $CONFIGFILE
-    chmod 640 $CONFIGFILE
-fi
-
-# Do this every time the package is installed or upgraded
-# Test for database presence to avoid failure of zmupdate.pl
-if [ "$dbc_install" = "true" ] && [ "$1" = "configure" ]; then
-
-    # Ensure zoneminder is stopped
-    deb-systemd-invoke stop zoneminder.service || exit $?
-
-    # Run the ZoneMinder update tool
-    zmupdate.pl --nointeractive
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-core.postrm b/distros/debian8/zoneminder-core.postrm
deleted file mode 100644
index d75e75e8b..000000000
--- a/distros/debian8/zoneminder-core.postrm
+++ /dev/null
@@ -1,37 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-core package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-if [ "$1" = "purge" ]; then
-
-    # Ask the user if we have to remove the cache directory even if not empty
-    if [ -d /var/cache/zoneminder ] \
-      && [ ! $(find /var/cache/zoneminder -maxdepth 0 -type d -empty 2>/dev/null) ]; then
-        RET=""
-        db_input high zoneminder/ask_delete || true
-        db_go || true
-        db_get zoneminder/ask_delete
-        if [ "$RET" = "true" ]; then
-            RET=""
-            db_input high zoneminder/ask_delete_again || true
-            db_go || true
-            db_get zoneminder/ask_delete_again
-            if [ "$RET" = "true" ]; then
-                rm -rf /var/cache/zoneminder
-            fi
-        fi
-    fi
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
diff --git a/distros/debian8/zoneminder-core.preinst b/distros/debian8/zoneminder-core.preinst
deleted file mode 100644
index 3ed1ef661..000000000
--- a/distros/debian8/zoneminder-core.preinst
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/bin/sh
-# preinst maintainer script for zoneminder-core package
-
-set -e
-
-abort=false
-if [ -L /usr/share/zoneminder/events ]; then
-    l=$(readlink /usr/share/zoneminder/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -L /usr/share/zoneminder/images ]; then
-    l=$(readlink /usr/share/zoneminder/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-core.templates b/distros/debian8/zoneminder-core.templates
deleted file mode 100644
index 35fdefd7a..000000000
--- a/distros/debian8/zoneminder-core.templates
+++ /dev/null
@@ -1,19 +0,0 @@
-Template: zoneminder/ask_delete
-Type: boolean
-Default: false
-_Description: Delete this non empty directory?
- A purge of the ZoneMinder package is performed but the directory
- '/var/cache/zoneminder' is not empty so it will not be deleted.
- .
- Please consider that this directory is designed to contain data resulting from
- event detection. Therefore, "proof of evidence" could be lost!"
- .
- If you are not sure of your decision, please do not delete this directory but
- perform a manual checkup.
-
-Template: zoneminder/ask_delete_again
-Type: boolean
-Default: false
-_Description: Deletion confirmed?
- You have allowed the deletion of directory '/var/cache/zoneminder' although
- it may contain critical data.
diff --git a/distros/debian8/zoneminder-core.zoneminder.init b/distros/debian8/zoneminder-core.zoneminder.init
deleted file mode 100644
index 41d3cb9dc..000000000
--- a/distros/debian8/zoneminder-core.zoneminder.init
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/bin/sh
-#
-### BEGIN INIT INFO
-# Provides:          zoneminder
-# Required-Start:
-# Required-Stop:
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description: Do nothing more than fixing a lintian error
-# Description:       This script is provided by the Zoneminder package
-#                    Zomeminder init configuration has been switched to systemd
-#                    This dummy script can be safely deleted; It does nothing
-#                    more than fixing a lintian error when testing the package
-### END INIT INFO
-
-. /lib/lsb/init-functions
-
-case "$1" in
-    start)
-        ;;
-    stop)
-        ;;
-    status)
-        ;;
-    restart|reload)
-        ;;
-    force-reload)
-        ;;
-    *)
-        echo "Usage: ${0:-} {start|stop|status|restart|reload|force-reload}" >&2
-        exit 1
-        ;;
-esac
-
-exit 0
-
diff --git a/distros/debian8/zoneminder-core.zoneminder.service b/distros/debian8/zoneminder-core.zoneminder.service
deleted file mode 100644
index d82270024..000000000
--- a/distros/debian8/zoneminder-core.zoneminder.service
+++ /dev/null
@@ -1,19 +0,0 @@
-# ZoneMinder systemd unit file
-# This file is intended to work with debian distributions
-
-[Unit]
-Description=ZoneMinder CCTV recording and security system
-After=network.target mysql.service apache2.service
-Requires=apache2.service
-Wants=mysql.service
-
-[Service]
-User=www-data
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecReload=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-PIDFile=/var/run/zm/zm.pid
-
-[Install]
-WantedBy=multi-user.target
diff --git a/distros/debian8/zoneminder-core.zoneminder.tmpfile b/distros/debian8/zoneminder-core.zoneminder.tmpfile
deleted file mode 100644
index 6ea70bf35..000000000
--- a/distros/debian8/zoneminder-core.zoneminder.tmpfile
+++ /dev/null
@@ -1 +0,0 @@
-d /var/run/zm 0755 www-data www-data
diff --git a/distros/debian8/zoneminder-database.config b/distros/debian8/zoneminder-database.config
deleted file mode 100644
index f6a84d36d..000000000
--- a/distros/debian8/zoneminder-database.config
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Set the first version in which dbconfig-common was introduced in the package
-dbc_first_version="1.28.0"
-
-CONFIGFILE=/etc/zm/zm.conf
-if [ -e $CONFIGFILE ]; then
-    # Source the config file if exists
-    . $CONFIGFILE
-elif [ -e ${CONFIGFILE}.dpkg-new ]; then
-    # If no config file, source the config file which is going to be installed
-    # by the core package
-    . ${CONFIGFILE}.dpkg-new
-else
-    # If no config file is going to be installed, set some default values
-    ZM_DB_HOST=
-    ZM_DB_NAME="zm"
-    ZM_DB_USER="zmuser"
-fi
-
-# Set some variables for the dbconfig-common stuff
-dbc_dbserver="$ZM_DB_HOST"
-dbc_dbname="$ZM_DB_NAME"
-dbc_dbuser="$ZM_DB_USER"
-
-if [ -f /usr/share/dbconfig-common/dpkg/config ]; then
-
-    # Default use dbconfig-common
-    dbc_install="true"
-
-    # Currently we only support mysql database
-    dbc_dbtypes="mysql"
-
-    # Set authentication method to password
-    dbc_authmethod_user="password"
-
-    # Source the dbconfig-common stuff
-    . /usr/share/dbconfig-common/dpkg/config
-fi
-
-# Do this when the package is installed, upgraded or reconfigured
-# Most of answers are cached so the questions will not be asked again
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Ask the user if the database shall be installed locally or remotely
-    db_input high zoneminder/debconf_dblocation || true
-    db_go || true
-    db_get zoneminder/debconf_dblocation
-
-    if [ "$RET" = "local" ]; then
-        if [ ! -e "/usr/sbin/mysqld" ]; then
-            # Display a message and exit if the user want a local database but
-            # no database server is available
-            db_input high zoneminder/debconf_dblocalmissingerror || true
-            db_go || true
-            exit 0
-        else
-            # Set the database server to localhost
-            dbc_dbserver="localhost"
-        fi
-    else
-        # Source the dbconfig main configuration file
-        if [ -f /etc/dbconfig-common/config ]; then
-            . /etc/dbconfig-common/config
-        fi
-        if [ "$dbc_remote_questions_default" = "false" ]; then
-            # Display a message and exit if the dbconfig configuration does not
-            # allow installation of remote databases
-            # Note: To overcome this issue, we could think to override the
-            # default setting by using dbc_remote_questions_default='true' in
-            # maintainer scripts but unfortunately this does not work due to
-            # current dbconfig design
-            # More information here:
-            # https://bugs.launchpad.net/ubuntu/+source/dbconfig-common/+bug/1065331
-            db_input high zoneminder/debconf_dbconfigerror || true
-            db_go || true
-            exit 0
-        fi
-    fi
-
-    # Ask the user for all database settings
-    dbc_go zoneminder $@
-
-    # Ask the user for the password of the database administrator if the user
-    # has not yet answered to this question.
-    # This situation may occur if the user skipped the database creation step
-    # when reconfiguring the package.
-    RET=""
-    db_get zoneminder/mysql/admin-pass
-    if [ -z "$RET" ]; then
-        db_input high zoneminder/mysql/admin-pass || true
-        db_go || true
-    fi
-
-    # Do this only when not upgrading the package (no old version in argument)
-    if [ -z "$2" ]; then
-        # Ask for the password of 'admin' user
-        while :; do
-            RET=""
-            db_input high zoneminder/admin_password || true
-            db_go || true
-            db_get zoneminder/admin_password
-            # If password isn't empty we ask for password verification
-            if [ -z "$RET" ]; then
-                db_fset zoneminder/admin_password seen false
-                db_fset zoneminder/admin_password_again seen false
-                break
-            fi
-            ROOT_PW="$RET"
-            db_input high zoneminder/admin_password_again || true
-            db_go || true
-            db_get zoneminder/admin_password_again
-            if [ "$RET" = "$ROOT_PW" ]; then
-                ROOT_PW=""
-                break
-            fi
-            db_fset zoneminder/password_mismatch seen false
-            db_input critical zoneminder/password_mismatch || true
-            db_set zoneminder/admin_password ""
-            db_set zoneminder/admin_password_again ""
-            db_go || true
-        done
-    else
-        # If we are upgrading the package, set an empty password to disable
-        # password update in ZoneMinder database
-        db_set zoneminder/admin_password ""
-    fi
-    # Set the seen flag to not ask this question again if no password is
-    # provided
-    db_fset zoneminder/admin_password seen true
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-database.dirs b/distros/debian8/zoneminder-database.dirs
deleted file mode 100644
index b37463a9e..000000000
--- a/distros/debian8/zoneminder-database.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/share/zoneminder/db
-usr/share/dbconfig-common/data/zoneminder/install
-usr/share/dbconfig-common/data/zoneminder/upgrade/mysql
diff --git a/distros/debian8/zoneminder-database.install b/distros/debian8/zoneminder-database.install
deleted file mode 100644
index 756c5bbfa..000000000
--- a/distros/debian8/zoneminder-database.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/db
diff --git a/distros/debian8/zoneminder-database.postinst b/distros/debian8/zoneminder-database.postinst
deleted file mode 100644
index 41d4e5b5b..000000000
--- a/distros/debian8/zoneminder-database.postinst
+++ /dev/null
@@ -1,79 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-db package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-mysql_update() {
-
-    # Source the dbconfig stuff
-    . /usr/share/dbconfig-common/internal/mysql
-
-    # Update the password of the hard-coded default 'admin' account
-    test -z $ADMIN_PASSWORD || dbc_mysql_exec_command "UPDATE Users SET Password = password('$ADMIN_PASSWORD') WHERE Username = 'admin';" || true
-
-    # Update the database version
-    dbc_mysql_exec_command "UPDATE Config SET Value = '$DB_VERSION' WHERE Name = 'ZM_DYN_DB_VERSION';" || true
-}
-
-if [ -f /usr/share/dbconfig-common/dpkg/postinst ]; then
-
-    # Set the first version in which dbconfig-common was introduced in the package
-    dbc_first_version="1.28.0"
-
-    # Set the database type
-    dbc_dbtypes="mysql"
-
-    # Source the dbconfig-common stuff
-    . /usr/share/dbconfig-common/dpkg/postinst
-fi
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Install sql database create file for dbconfig
-    # (needed at first package installation)
-    if [ ! -f /usr/share/dbconfig-common/data/zoneminder/install/mysql ]; then
-        install -m 644 /usr/share/zoneminder/db/zm_create.sql \
-          /usr/share/dbconfig-common/data/zoneminder/install/mysql
-        # Remove unneeded sql requests
-        # dbconfig will create the underlying database
-        sed -i "/^ *CREATE DATABASE /d" \
-          /usr/share/dbconfig-common/data/zoneminder/install/mysql
-        sed -i "/^ *USE /d" \
-          /usr/share/dbconfig-common/data/zoneminder/install/mysql
-    fi
-
-    # Symlink sql update files for dbconfig (needed when upgrading the package)
-    for sqlfile in /usr/share/zoneminder/db/zm_update-*.sql; do
-        lnk=`echo $sqlfile | sed "s/^\/usr\/share\/zoneminder\/db\/zm_update-\(.*\)\.sql/\1/"`
-        if [ ! -L /usr/share/dbconfig-common/data/zoneminder/upgrade/mysql/$lnk ]; then
-            ln -sf $sqlfile \
-              /usr/share/dbconfig-common/data/zoneminder/upgrade/mysql/$lnk
-        fi
-    done || true
-
-    # Create the underlying database and populate it
-    # dbconfig will take care of applying any updates which are newer than the
-    # previously installed version
-    dbc_go zoneminder $@
-
-    # Get the password of ZoneMinder user 'admin' from debconf
-    db_get zoneminder/admin_password
-    ADMIN_PASSWORD=$RET
-
-    # Remove the password from debconf database
-    test -z $ADMIN_PASSWORD || db_reset zoneminder/admin_password || true
-
-    # Get the lastest database version from dbconfig upgrade folder
-    DB_VERSION=$(ls -rv /usr/share/dbconfig-common/data/zoneminder/upgrade/$dbc_dbtypes | head -1)
-
-    # Update the default admin account and database version
-    mysql_update
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-database.postrm b/distros/debian8/zoneminder-database.postrm
deleted file mode 100644
index 231f01ad7..000000000
--- a/distros/debian8/zoneminder-database.postrm
+++ /dev/null
@@ -1,34 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-db package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-# Source the dbconfig stuff
-if [ -f /usr/share/dbconfig-common/dpkg/postrm ]; then
-    . /usr/share/dbconfig-common/dpkg/postrm
-    # Ask the user what do to with dbconfig when removing the package
-    dbc_go zoneminder $@
-fi
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    # Remove dbconfig stuff added in postinst script
-    rm -rf /usr/share/dbconfig-common/data/zoneminder
-    # No need to manually remove the zm database, dbconfig take care of this
-fi
-
-if [ "$1" = "purge" ]; then
-    # Delete a potential remaining file used in postinst script
-    rm -f /etc/zm/zm.conf.postinst.bak
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
diff --git a/distros/debian8/zoneminder-database.prerm b/distros/debian8/zoneminder-database.prerm
deleted file mode 100644
index 31786116a..000000000
--- a/distros/debian8/zoneminder-database.prerm
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/sh
-# prerm script for zoneminder-db package
-
-set -e
-
-# Source the debconf stuff if file exists
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-# If dbconfig-common is installed and has been used by zoneminder
-if [ -f /usr/share/dbconfig-common/dpkg/prerm ] \
-  &&  [ -f /etc/dbconfig-common/zoneminder.conf ]; then
-    # Source the dbconfig stuff
-    . /usr/share/dbconfig-common/dpkg/prerm
-    # Ask the user what do to with dbconfig before removing the package
-    dbc_go zoneminder $@
-fi
-
-# #DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-database.templates b/distros/debian8/zoneminder-database.templates
deleted file mode 100644
index 4de4342f6..000000000
--- a/distros/debian8/zoneminder-database.templates
+++ /dev/null
@@ -1,58 +0,0 @@
-Template: zoneminder/debconf_dblocation
-Type: select
-__Choices: local, remote
-Default: local
-_Description: Database location:
- A database server is required to run ZoneMinder. The database can be installed
- either locally or remotely on a machine of your network.
- .
- If you choose a remote location, you will have to select the 'tcp/ip'
- connection method and enter the hostname or ip address of the remote machine
- in the next configuration screens.
-
-Template: zoneminder/debconf_dblocalmissingerror
-Type: error
-_Description: No local database server is available:
- Currently ZoneMinder supports mysql or mariadb database server but none of them
- appears to be installed on this machine.
- .
- In order to complete ZoneMinder's installation, after ending of this assistant,
- please install a compatible database server and then restart the assistant by
- invoking:
- .
- $ sudo dpkg-reconfigure zoneminder
-
-Template: zoneminder/debconf_dbconfigerror
-Type: error
-_Description: Remote database servers are not allowed:
- The current configuration of dbconfig-common does not allow installation of
- a database on remote servers.
- .
- In order to reconfigure dbconfig-common, please invoke the following command
- after ending of this assistant:
- .
- $ sudo dpkg-reconfigure dbconfig-common
- .
- Then, to complete ZoneMinder's installation, please restart this assistant by
- invoking:
- .
- $ sudo dpkg-reconfigure zoneminder
-
-Template: zoneminder/admin_password
-Type: password
-_Description: New password for the ZoneMinder 'admin' user:
- Please enter the password of the default administrative user.
- .
- While not mandatory, it is highly recommended that you set a custom password
- for the administrative 'admin' user.
- .
- If this field is left blank, the password will not be changed.
-
-Template: zoneminder/admin_password_again
-Type: password
-_Description: Repeat password for the ZoneMinder 'admin' user:
-
-Template: zoneminder/password_mismatch
-Type: error
-_Description: Password input error
- The two passwords you entered were not the same. Please try again.
diff --git a/distros/debian8/zoneminder-ui-base.config b/distros/debian8/zoneminder-ui-base.config
deleted file mode 100644
index 2660208a8..000000000
--- a/distros/debian8/zoneminder-ui-base.config
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh
-# config maintainer script for zoneminder-ui-base package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-# Do this when the package is installed, upgraded or reconfigured
-# Most of answers are cached so the questions will not be asked again
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Ask the user for the web server(s) to configure
-    db_input high zoneminder/webserver || true
-    db_go || true
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-ui-base.install b/distros/debian8/zoneminder-ui-base.install
deleted file mode 100644
index f72b569be..000000000
--- a/distros/debian8/zoneminder-ui-base.install
+++ /dev/null
@@ -1,11 +0,0 @@
-debian/apache.conf etc/zm
-usr/lib/cgi-bin
-usr/share/zoneminder/ajax
-usr/share/zoneminder/css
-usr/share/zoneminder/graphics
-usr/share/zoneminder/includes
-usr/share/zoneminder/index.php
-usr/share/zoneminder/js
-usr/share/zoneminder/lang
-usr/share/zoneminder/tools
-usr/share/zoneminder/views
diff --git a/distros/debian8/zoneminder-ui-base.links b/distros/debian8/zoneminder-ui-base.links
deleted file mode 100644
index b00a147d6..000000000
--- a/distros/debian8/zoneminder-ui-base.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/cgi-bin usr/share/zoneminder/cgi-bin
diff --git a/distros/debian8/zoneminder-ui-base.postinst b/distros/debian8/zoneminder-ui-base.postinst
deleted file mode 100644
index a5bce3c98..000000000
--- a/distros/debian8/zoneminder-ui-base.postinst
+++ /dev/null
@@ -1,48 +0,0 @@
-#! /bin/sh
-# postinst maintainer script for zoneminder-ui-base package
-
-set -e
-
-# Source the debconf stuff
-. /usr/share/debconf/confmodule
-
-apache_install() {
-
-    mkdir -p /etc/apache2/conf-available
-    ln -sf ../../zm/apache.conf /etc/apache2/conf-available/zoneminder.conf
-
-    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-
-    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-        . /usr/share/apache2/apache2-maintscript-helper
-        apache2_invoke enconf zoneminder
-    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
-        [ -d /etc/apache2/conf.d/ ] && [ ! -L /etc/apache2/conf.d/zoneminder.conf ] && ln -s ../conf-available/zoneminder.conf /etc/apache2/conf.d/zoneminder.conf
-    fi
-
-    # Enable CGI script module in apache (not enabled by default on jessie)
-    a2enmod cgi >/dev/null 2>&1
-
-    # Reload the web server
-    deb-systemd-invoke reload apache2.service || true
-}
-
-# Do this when the package is installed, upgraded or reconfigured
-if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
-
-    # Configure the web server
-    db_get zoneminder/webserver
-    webservers="$RET"
-
-    for webserver in $webservers; do
-        webserver=${webserver%,}
-        # Currently we only support apache2
-        if [ "$webserver" = "apache2" ] ; then
-            apache_install $1
-        fi
-    done
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian8/zoneminder-ui-base.postrm b/distros/debian8/zoneminder-ui-base.postrm
deleted file mode 100644
index fd4d0d6d8..000000000
--- a/distros/debian8/zoneminder-ui-base.postrm
+++ /dev/null
@@ -1,41 +0,0 @@
-#! /bin/sh
-# postrm maintainer script for zoneminder-ui-base package
-
-set -e
-
-# Source the debconf stuff
-if [ -f /usr/share/debconf/confmodule ]; then
-    . /usr/share/debconf/confmodule
-fi
-
-apache_remove() {
-    COMMON_STATE=$(dpkg-query -f '${Status}' -W 'apache2.2-common' 2>/dev/null | awk '{print $3}' || true)
-    if [ -e /usr/share/apache2/apache2-maintscript-helper ] ; then
-        . /usr/share/apache2/apache2-maintscript-helper
-        apache2_invoke disconf zoneminder
-    elif [ "$COMMON_STATE" = "installed" ] || [ "$COMMON_STATE" = "unpacked" ] ; then
-        rm -f /etc/apache2/conf.d/zoneminder.conf
-    fi
-    rm -f /etc/apache2/conf-available/zoneminder.conf
-    # Reload the web server
-    deb-systemd-invoke reload apache2.service || true
-}
-
-if [ "$1" = "remove" ] || [ "$1" = "purge" ]; then
-    # Deconfigure the web server
-    db_get zoneminder/webserver || true
-    for webserver in $RET; do
-        webserver=${webserver%,}
-        # Currently we only support apache2
-        if [ "$webserver" = "apache2" ] ; then
-            apache_remove $1
-        fi
-    done
-fi
-
-#DEBHELPER#
-
-# postrm rm may freeze without that
-db_stop
-
-exit 0
diff --git a/distros/debian8/zoneminder-ui-base.templates b/distros/debian8/zoneminder-ui-base.templates
deleted file mode 100644
index 31e70277f..000000000
--- a/distros/debian8/zoneminder-ui-base.templates
+++ /dev/null
@@ -1,7 +0,0 @@
-Template: zoneminder/webserver
-Type: multiselect
-Choices: apache2
-Default: apache2
-_Description: Web server to reconfigure automatically:
- Please choose the web server that should be automatically configured for
- ZoneMinder's web portal access.
diff --git a/distros/debian8/zoneminder-ui-classic.install b/distros/debian8/zoneminder-ui-classic.install
deleted file mode 100644
index 9532d9dc9..000000000
--- a/distros/debian8/zoneminder-ui-classic.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/classic
diff --git a/distros/debian8/zoneminder-ui-mobile.install b/distros/debian8/zoneminder-ui-mobile.install
deleted file mode 100644
index 464bb74eb..000000000
--- a/distros/debian8/zoneminder-ui-mobile.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/mobile
diff --git a/distros/debian8/zoneminder-ui-xml.install b/distros/debian8/zoneminder-ui-xml.install
deleted file mode 100644
index 6617707f8..000000000
--- a/distros/debian8/zoneminder-ui-xml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/xml
diff --git a/distros/debian_cmake/README.Debian b/distros/debian_cmake/README.Debian
deleted file mode 100644
index a49b6be72..000000000
--- a/distros/debian_cmake/README.Debian
+++ /dev/null
@@ -1,51 +0,0 @@
-zoneminder for Debian
----------------------
-
-There is one manual step to get the web interface working.
-You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
-then reload the apache config (i.e. /etc/init.d/apache2 reload)
-
-Changing the location for images and events
--------------------------------------------
-
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-
-These lines would mount /dev/sdX1 to /video_storage, and then 'link' /video_storage
-to the locations that ZoneMinder expects them to be at.
-
-         /dev/sdX1 /video_storage ext4 defaults 0 2
-         /video_storage/zoneminder/images /var/cache/zoneminder/images none bind 0 2
-         /video_storage/zoneminder/events /var/cache/zoneminder/events none bind 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext4 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext4 defaults 0 2
-
-
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
-
-Access to /dev/video*
----------------------
-
-For cameras which require access to /dev/video*, zoneminder may need the 
-www-data user added to the video group in order to see those cameras:
-
-  adduser www-data video
-
-Note that all web applications running on the zoneminder server will then have 
-access to all video devices on the system.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/debian_cmake/apache.conf b/distros/debian_cmake/apache.conf
deleted file mode 100644
index 965c67f86..000000000
--- a/distros/debian_cmake/apache.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /zm /usr/share/zoneminder/www
-
-<Directory /usr/share/zoneminder/www>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
diff --git a/distros/debian_cmake/changelog b/distros/debian_cmake/changelog
deleted file mode 100644
index 46f1e2bd9..000000000
--- a/distros/debian_cmake/changelog
+++ /dev/null
@@ -1,47 +0,0 @@
-zoneminder (1.28.108-nmu2015100101) wheezy; urgency=low
-
-  * 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 01 Oct 2015 18:20:29 +0000
-
-zoneminder (1.28.107-nmu2015092401) wheezy; urgency=low
-
-  * 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 24 Sep 2015 14:15:46 +0000
-
-zoneminder (1.28.1+106-nmu2015091001) wheezy; urgency=low
-
-  * 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 10 Sep 2015 18:03:43 +0000
-
-zoneminder (1.28.0-0.1) wheezy; urgency=low
-
-  * Use CMake instead of Autotools to simplify
-    debian/rules and have less build-depends.
-  * Some lintian love in debian/{control,copyright}
-    and perl ZoneMinder modules.
-  * Don't purge database if we use a remote
-    MySQL server.
-
- -- Cosme Domínguez Díaz <cosme.ddiaz@gmail.com>  Sun, 09 Nov 2014 02:20:20 +0100
-
-zoneminder (1.28.0-wheezy) wheezy; urgency=medium
-
-  * Release
-
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:27:22 -0400
-
-zoneminder (1.27.99+1-testing-SNAPSHOT2014072901) testing; urgency=medium
-
-  * improve error messages
-  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates
-
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 29 Jul 2014 14:50:20 -0400
-
-zoneminder (1.27.0+1-testing-v4ltomonitor-1) testing; urgency=high
-
-  * Snapshot release - 
-
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
diff --git a/distros/debian_cmake/compat b/distros/debian_cmake/compat
deleted file mode 100644
index ec635144f..000000000
--- a/distros/debian_cmake/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/distros/debian_cmake/control b/distros/debian_cmake/control
deleted file mode 100644
index 4c4d405e9..000000000
--- a/distros/debian_cmake/control
+++ /dev/null
@@ -1,40 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), cmake, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libsys-mmap-perl, libav-tools, libnetpbm10-dev, libavdevice-dev, libdevice-serialport-perl, libarchive-zip-perl, libmime-lite-perl, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
-Standards-Version: 3.9.4
-
-Package: zoneminder
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2 | httpd, libapache2-mod-php5 | libapache2-mod-fcgid | php5-fpm, php5-mysqlnd | php5-mysql, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client | mysql-client, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, netpbm, libavdevice53, libjpeg8, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, php5-gd
-Recommends: mysql-server | mariadb-server
-Description: Video camera security and surveillance solution
- ZoneMinder is intended for use in single or multi-camera video security 
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-Package: zoneminder-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for zoneminder.
- ZoneMinder is a video camera security and surveillance solution.
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
diff --git a/distros/debian_cmake/copyright b/distros/debian_cmake/copyright
deleted file mode 100644
index 1c10c59db..000000000
--- a/distros/debian_cmake/copyright
+++ /dev/null
@@ -1,57 +0,0 @@
-Copyright:
-
-Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
-
-License:
-
-This package is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
-
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public
-License along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
-
-/usr/share/zoneminder/api/lib/Cake/*:
-Copyright:
-
-Copyright (c) 2005-2013, Cake Software Foundation, Inc.
-
-License:
-
-CakePHP(tm) : The Rapid Development PHP Framework (http://cakephp.org)
-
-The MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
-
-Cake Software Foundation, Inc.
-1785 E. Sahara Avenue,
-Suite 490-204
-Las Vegas, Nevada 89104,
-United States of America.
diff --git a/distros/debian_cmake/dirs b/distros/debian_cmake/dirs
deleted file mode 100644
index 9e29e6113..000000000
--- a/distros/debian_cmake/dirs
+++ /dev/null
@@ -1,5 +0,0 @@
-var/log/zm
-var/lib/zm
-var/cache/zoneminder/events
-var/cache/zoneminder/images
-var/cache/zoneminder/temp
diff --git a/distros/debian_cmake/docs b/distros/debian_cmake/docs
deleted file mode 100644
index b43bf86b5..000000000
--- a/distros/debian_cmake/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/distros/debian_cmake/init.d b/distros/debian_cmake/init.d
deleted file mode 100644
index 036bb695d..000000000
--- a/distros/debian_cmake/init.d
+++ /dev/null
@@ -1,88 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          zoneminder
-# Required-Start:    $network $remote_fs $syslog
-# Required-Stop:     $network $remote_fs $syslog
-# Should-Start:      mysql
-# Should-Stop:       mysql
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description:  Control ZoneMinder as a Service
-### END INIT INFO
-# description: Control ZoneMinder as a Service
-# chkconfig: 2345 20 20
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-prog=ZoneMinder
-ZM_PATH_BIN="/usr/bin"
-RUNDIR=/var/run/zm
-TMPDIR=/tmp/zm
-command="$ZM_PATH_BIN/zmpkg.pl"
-
-start() {
-	echo -n "Starting $prog: "
-	export TZ=:/etc/localtime
-	mkdir -p $RUNDIR $TMPDIR && chown www-data:www-data $RUNDIR $TMPDIR
-	$command start
-	RETVAL=$?
-	[ $RETVAL = 0 ] && echo success || echo failure
-	echo
-	[ $RETVAL = 0 ] && touch /var/lock/zm
-	return $RETVAL
-}
-stop() {
-	echo -n "Stopping $prog: "
-	#
-	# Why is this status check being done?
-	# as $command stop returns 1 if zoneminder 
-	# is stopped, which will result in 
-	# this returning 1, which will stuff 
-	# dpkg when it tries to stop zoneminder before
-	# uninstalling . . . 
-	#
-	result=`$command status`
-	if [ ! "$result" = "running" ]; then
-		echo "Zoneminder already stopped"
-		echo
-		RETVAL=0
-	else
-		$command stop
-		RETVAL=$?
-		[ $RETVAL = 0 ] && echo success || echo failure
-		echo
-		[ $RETVAL = 0 ] && rm -f /var/lock/zm
-	fi
-}
-status() {
-	result=`$command status`
-	if [ "$result" = "running" ]; then
-		echo "ZoneMinder is running"
-		RETVAL=0
-	else
-		echo "ZoneMinder is stopped"
-		RETVAL=1
-	fi
-}
-
-case "$1" in
-'start')
-	start
-	;;
-'stop')
-	stop
-	;;
-'restart' | 'force-reload')
-	stop
-	start
-	;;
-'status')
-	status
-	;;
-*)
-	echo "Usage: $0 { start | stop | restart | status }"
-	RETVAL=1
-	;;
-esac
-exit $RETVAL
diff --git a/distros/debian_cmake/install b/distros/debian_cmake/install
deleted file mode 100644
index 97c5f7a03..000000000
--- a/distros/debian_cmake/install
+++ /dev/null
@@ -1,8 +0,0 @@
-usr/bin
-usr/lib/zoneminder/cgi-bin
-usr/share/man
-usr/share/perl5/ZoneMinder
-usr/share/perl5/ZoneMinder.pm
-usr/share/zoneminder/db
-usr/share/zoneminder/www
-etc/zm
diff --git a/distros/debian_cmake/links b/distros/debian_cmake/links
deleted file mode 100644
index 5560a100a..000000000
--- a/distros/debian_cmake/links
+++ /dev/null
@@ -1,3 +0,0 @@
-var/cache/zoneminder/events usr/share/zoneminder/events
-var/cache/zoneminder/images usr/share/zoneminder/images
-var/cache/zoneminder/temp   usr/share/zoneminder/temp
diff --git a/distros/debian_cmake/postinst b/distros/debian_cmake/postinst
deleted file mode 100644
index d06f9c641..000000000
--- a/distros/debian_cmake/postinst
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	if [ -e "/etc/init.d/mysql" ]; then 
-		#
-		# Get mysql started if it isn't
-		#
-		if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
-				invoke-rc.d mysql start
-		fi
-		if $(/etc/init.d/mysql status >/dev/null 2>&1); then
-			mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-			# test if database if already present...
-			if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-				cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-				echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-			fi
-
-			invoke-rc.d zoneminder stop || true
-			zmupdate.pl --nointeractive
-
-		else
-			echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
-		fi
-	else 
-		echo 'mysql not found, assuming remote server.'
-	fi
-	chown www-data:www-data /var/log/zm
-	chown www-data:www-data /var/lib/zm/
-	if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
-	fi
-fi
-# Ensure zoneminder is stopped...
-if [ -x "/etc/init.d/zoneminder" ]; then
-        if invoke-rc.d zoneminder status ; then
-                invoke-rc.d zoneminder stop || exit $?
-        fi
-fi
-
-if [ "$1" = "configure" ]; then
-	if [ -z "$2" ]; then
-		chown www-data:www-data /var/log/zm
-		chown www-data:www-data /var/lib/zm/
-		chown www-data:www-data -R /var/cache/zoneminder
-    else
-		chown www-data:www-data /var/log/zm
-		zmupdate.pl
-	fi
-fi
-#DEBHELPER#
diff --git a/distros/debian_cmake/postrm b/distros/debian_cmake/postrm
deleted file mode 100644
index fde590981..000000000
--- a/distros/debian_cmake/postrm
+++ /dev/null
@@ -1,11 +0,0 @@
-#! /bin/sh
-set -e
-
-if [ "$1" = "purge" ]; then
-    if [ -e "/etc/init.d/mysql" ]; then 
-        echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-        mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
-    fi
-fi
-#DEBHELPER#
diff --git a/distros/debian_cmake/preinst b/distros/debian_cmake/preinst
deleted file mode 100644
index 6cd01ba55..000000000
--- a/distros/debian_cmake/preinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-abort=false
-if [ -L /usr/share/zoneminder/events ]; then
-    l=$(readlink /usr/share/zoneminder/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -L /usr/share/zoneminder/images ]; then
-    l=$(readlink /usr/share/zoneminder/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF 
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/debian_cmake/rules b/distros/debian_cmake/rules
deleted file mode 100755
index 4bdc7cb0c..000000000
--- a/distros/debian_cmake/rules
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export CFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -pipe
-export CXXFLAGS = -g -O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -pipe
-INSTDIR = debian/tmp
-
-override_dh_auto_configure:
-	dh_auto_configure -- \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_VERBOSE_MAKEFILE=OFF \
-		-DCMAKE_COLOR_MAKEFILE=ON \
-		-DZM_RUNDIR=/var/run/zm \
-		-DZM_SOCKDIR=/var/run/zm \
-		-DZM_TMPDIR=/var/tmp/zm \
-		-DZM_LOGDIR=/var/log/zm \
-		-DZM_WEBDIR=/usr/share/zoneminder/www \
-		-DZM_CONTENTDIR=/var/cache/zoneminder \
-		-DZM_CGIDIR=/usr/lib/zoneminder/cgi-bin \
-		-DZM_WEB_USER=www-data \
-		-DZM_WEB_GROUP=www-data \
-		-DCMAKE_INSTALL_SYSCONFDIR=etc/zm
-
-override_dh_auto_install:
-	dh_auto_install --buildsystem=cmake
-	install -D -m 0644 debian/apache.conf  $(INSTDIR)/etc/zm/apache.conf
-	rm $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/LICENSE.txt
-	rm $(INSTDIR)/usr/share/zoneminder/api/.gitignore
-	rm -r $(INSTDIR)/usr/share/zoneminder/api/lib/Cake/Test
-
-override_dh_auto_test:
-	# do not run tests...
-
-override_dh_strip:
-	dh_strip --dbg-package=zoneminder-dbg
-
-%:
-	dh $@ --buildsystem=cmake --parallel
diff --git a/distros/debian_cmake/watch b/distros/debian_cmake/watch
deleted file mode 100644
index 5a8a9c4d7..000000000
--- a/distros/debian_cmake/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-http://www.zoneminder.com/downloads.html \
-  .*/ZoneMinder-(.*).tar.gz
diff --git a/distros/fedora/README.Fedora b/distros/fedora/README.Fedora
index 18d091772..74386c9df 100644
--- a/distros/fedora/README.Fedora
+++ b/distros/fedora/README.Fedora
@@ -42,7 +42,7 @@ New installs
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
-   anything that suits your envinroment.
+   anything that suits your environment.
 
 3. If you have chosen to change the zoneminder database account credentials to
    something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.
diff --git a/distros/fedora/archive/zoneminder.cmake.f19.spec b/distros/fedora/archive/zoneminder.cmake.f19.spec
index 771209247..0af88f41f 100644
--- a/distros/fedora/archive/zoneminder.cmake.f19.spec
+++ b/distros/fedora/archive/zoneminder.cmake.f19.spec
@@ -140,7 +140,6 @@ fi
 # zmfix removed from zoneminder 1.26.6
 #%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/archive/zoneminder.f19.spec b/distros/fedora/archive/zoneminder.f19.spec
index 11a8ba249..d1be12aa2 100644
--- a/distros/fedora/archive/zoneminder.f19.spec
+++ b/distros/fedora/archive/zoneminder.f19.spec
@@ -232,7 +232,6 @@ fi
 # zmfix removed from zoneminder 1.26.6
 #%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/archive/zoneminder.f20.spec b/distros/fedora/archive/zoneminder.f20.spec
index b06db673d..513a9cfee 100644
--- a/distros/fedora/archive/zoneminder.f20.spec
+++ b/distros/fedora/archive/zoneminder.f20.spec
@@ -142,7 +142,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/archive/zoneminder.f21.spec b/distros/fedora/archive/zoneminder.f21.spec
index 6dfabceea..35662bf6c 100644
--- a/distros/fedora/archive/zoneminder.f21.spec
+++ b/distros/fedora/archive/zoneminder.f21.spec
@@ -142,7 +142,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/fedora/zonemidner.f22.spec b/distros/fedora/zoneminder.f22.spec
similarity index 100%
rename from distros/fedora/zonemidner.f22.spec
rename to distros/fedora/zoneminder.f22.spec
diff --git a/distros/fedora/zoneminder.f23.spec b/distros/fedora/zoneminder.f23.spec
index 435a3ba58..5335b90cc 100644
--- a/distros/fedora/zoneminder.f23.spec
+++ b/distros/fedora/zoneminder.f23.spec
@@ -163,7 +163,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
@@ -180,6 +179,7 @@ fi
 %{perl_vendorlib}/ONVIF*
 %{perl_vendorlib}/WSDiscovery*
 %{perl_vendorlib}/WSSecurity*
+%{perl_vendorlib}/WSNotification*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/zoneminder
 %{_libexecdir}/zoneminder/cgi-bin
diff --git a/distros/redhat/README.CentOS b/distros/redhat/README.CentOS
index 35718a691..2cdaea68e 100644
--- a/distros/redhat/README.CentOS
+++ b/distros/redhat/README.CentOS
@@ -34,7 +34,7 @@ New installs
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
-   anything that suits your envinroment.
+   anything that suits your environment.
 
 3. If you have chosen to change the zoneminder mysql credentials to something
    other than zmuser/zmpass then you must now edit /etc/zm.conf. Change
diff --git a/distros/redhat/README.Centos7 b/distros/redhat/README.Centos7
index de0bd52d6..47ec542ac 100644
--- a/distros/redhat/README.Centos7
+++ b/distros/redhat/README.Centos7
@@ -40,7 +40,7 @@ New installs
      mysqladmin -uroot -p reload
 
    The database account credentials, zmuser/zmpass, are arbitrary. Set them to
-   anything that suits your envinroment.
+   anything that suits your environment.
 
 3. If you have chosen to change the zoneminder database account credentials to
    something other than zmuser/zmpass, you must now edit /etc/zm/zm.conf.
diff --git a/distros/redhat/archive/zoneminder.el6.spec b/distros/redhat/archive/zoneminder.el6.spec
index d61a153e7..46bce099a 100644
--- a/distros/redhat/archive/zoneminder.el6.spec
+++ b/distros/redhat/archive/zoneminder.el6.spec
@@ -237,7 +237,6 @@ fi
 # zmfix removed from zoneminder 1.26.6
 #%attr(4755,root,root) %{_bindir}/zmfix
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
diff --git a/distros/redhat/zoneminder.el6.spec b/distros/redhat/zoneminder.el6.spec
index 69e3b972f..0b7770b50 100644
--- a/distros/redhat/zoneminder.el6.spec
+++ b/distros/redhat/zoneminder.el6.spec
@@ -150,7 +150,6 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
@@ -169,6 +168,7 @@ rm -rf %{_docdir}/%{name}-%{version}
 %{perl_vendorlib}/ONVIF*
 %{perl_vendorlib}/WSDiscovery*
 %{perl_vendorlib}/WSSecurity*
+%{perl_vendorlib}/WSNotification*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/%{name}
 %{_libexecdir}/%{name}/cgi-bin
diff --git a/distros/redhat/zoneminder.el7.spec b/distros/redhat/zoneminder.el7.spec
index 485c214c2..b72e0bbe7 100644
--- a/distros/redhat/zoneminder.el7.spec
+++ b/distros/redhat/zoneminder.el7.spec
@@ -159,7 +159,6 @@ fi
 %{_bindir}/zmf
 %{_bindir}/zmfilter.pl
 %{_bindir}/zmpkg.pl
-%{_bindir}/zmstreamer
 %{_bindir}/zmtrack.pl
 %{_bindir}/zmtrigger.pl
 %{_bindir}/zmu
@@ -178,6 +177,7 @@ fi
 %{perl_vendorlib}/ONVIF*
 %{perl_vendorlib}/WSDiscovery*
 %{perl_vendorlib}/WSSecurity*
+%{perl_vendorlib}/WSNotification*
 %{_mandir}/man*/*
 %dir %{_libexecdir}/zoneminder
 %{_libexecdir}/zoneminder/cgi-bin
diff --git a/distros/ubuntu1204_cmake/NEWS b/distros/ubuntu1204/NEWS
similarity index 100%
rename from distros/ubuntu1204_cmake/NEWS
rename to distros/ubuntu1204/NEWS
diff --git a/distros/ubuntu1204/README.Debian b/distros/ubuntu1204/README.Debian
index b8ea413e3..2ba809fe4 100644
--- a/distros/ubuntu1204/README.Debian
+++ b/distros/ubuntu1204/README.Debian
@@ -1,9 +1,120 @@
-zoneminder for Debian
+Zoneminder for Debian
 ---------------------
 
-There is one manual step to get the web interface working.
-You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
-then reload the apache config (i.e. /etc/init.d/apache2 reload)
+Initializing database
+---------------------
+
+    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+OR
+    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+
+    echo 'grant lock tables,alter,create,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
+accordingly.
+
+The following command can help to ensure that zoneminder can read its
+configuration file:
+
+    chgrp -c www-data /etc/zm/zm.conf
+
+
+Upgrading database
+------------------
+
+Prior to 1.28.1 database upgrade was performed automatically.
+"zoneminder" service will refuse to start with outdated database.
+
+Assuming that database is on "localhost" then the following command can be
+used to upgrade "zm" database:
+
+    zmupdate.pl
+
+Additional permissions may be required to perform upgrade:
+
+    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+The following command prints the current version of zoneminder database:
+
+    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
+
+
+Enabling service
+----------------
+
+By default Zoneminder service is not starting automatically and need to be
+manually activated once database is configured:
+
+On systemd:
+
+    sudo systemctl enable zoneminder.service
+
+On SysV:
+
+    sudo update-rc.d zoneminder enable
+
+
+Web server set-up
+-----------------
+
+There are few manual steps to get the web interface working:
+
+## Apache2
+
+Apache can be configured as folder "/zm" using sample .conf:
+
+    sudo a2enconf zoneminder
+
+Alternatively Apache web site configuration template can be used to setup
+zoneminder as "http://zoneminder":
+
+    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
+    sudo a2ensite zoneminder.conf
+
+Common configuration steps for Apache2:
+
+    sudo a2enmod cgi
+    sudo service apache2 reload
+
+
+## nginx / fcgiwrap
+
+Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
+for binary "cgi-bin" applications:
+
+    sudo apt-get install php5-fpm fcgiwrap
+
+To enable a URL alias that makes Zoneminder available from
+
+    http://yourserver/zm
+
+the following line is to be added to "server" section of a web site
+configuration:
+
+    include /usr/share/doc/zoneminder/examples/nginx.conf;
+
+For "default" web site it would be sufficient to include the above
+statement to the file
+
+    /etc/nginx/sites-enabled/default
+
+To avoid problems with feeds from multiple cameras "fcgiwrap" should be
+configured to start at least as many processes as there are cameras.
+It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
+Systemd users may be affected by the following bug:
+
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
+
+
+## Note:
+
+When Zoneminder web site is running it may be necessary to set
+Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
+site configuration.
+
 
 Changing the location for images and events
 -------------------------------------------
@@ -33,19 +144,17 @@ These lines in fstab could allow you to bind-mount an alternate location
          /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
          /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
 
-
-
  -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
 
 Access to /dev/video*
 ---------------------
 
-For cameras which require access to /dev/video*, zoneminder may need the 
+For cameras which require access to /dev/video*, zoneminder may need the
 www-data user added to the video group in order to see those cameras:
 
   adduser www-data video
 
-Note that all web applications running on the zoneminder server will then have 
+Note that all web applications running on the zoneminder server will then have
 access to all video devices on the system.
 
  -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu1204_cmake/TODO.Debian b/distros/ubuntu1204/TODO.Debian
similarity index 100%
rename from distros/ubuntu1204_cmake/TODO.Debian
rename to distros/ubuntu1204/TODO.Debian
diff --git a/distros/ubuntu1204/apache.conf b/distros/ubuntu1204/apache.conf
deleted file mode 100644
index 262db423f..000000000
--- a/distros/ubuntu1204/apache.conf
+++ /dev/null
@@ -1,21 +0,0 @@
-Alias /zm /usr/share/zoneminder/www
-
-<IfModule mod_fcgid.c>
-	<Directory /usr/share/zoneminder/www>
-		Options +ExecCGI
-		AllowOverride All
-		AddHandler fcgid-script .php
-		FCGIWrapper /usr/bin/php5-cgi
-		Order allow,deny
-		Allow from all
-	</Directory>
-</IfModule>
-<IfModule mod_php5.c>
-	<Directory /usr/share/zoneminder/www>
-		php_flag register_globals off
-		Options Indexes FollowSymLinks
-		<IfModule mod_dir.c>
-			DirectoryIndex index.php
-		</IfModule>
-	</Directory>
-</IfModule>
diff --git a/distros/ubuntu1204/changelog b/distros/ubuntu1204/changelog
index 1a5ab6ee9..74cf1d0b8 100644
--- a/distros/ubuntu1204/changelog
+++ b/distros/ubuntu1204/changelog
@@ -1,99 +1,573 @@
-zoneminder (1.28.1+1-trusty-SNAPSHOT2015071501) trusty; urgency=medium
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
 
-  * fix for issue #586 and #932
-  * fix for db not being upgraded
-  * version upgraded to .100
+  * include api, switch to cmake build
 
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 15 Jul 2015 11:56:28 -0400
-zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201ubuntu1) UNRELEASED; urgency=medium
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
 
-  * add h264
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 27 Mar 2015 10:08:27 -0400
+zoneminder (1.28.1-8) unstable; urgency=medium
 
-zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium
+  * Patchworks:
+    + New upstream "980-fix-image-size.patch".
+    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
+  * postinst: set "root" as group owner for "/var/log/zm" to silence
+    logrotate warnings.
+  * Minor correction to README.Debian.
 
-  * maybe fix for RTSP Basic Auth
-  * Also remove dependency on netpbm
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 02 Mar 2015 11:25:59 -0500
+zoneminder (1.28.1-7) unstable; urgency=medium
 
-zoneminder (1.28.1+1-utopic-SNAPSHOT2015022301) utopic; urgency=medium
+  * Build-Depends += "cakephp (<< 3.0.0~)";
+    Zoneminder is not compatible with latest CakePHP.
+  * Handle conffile removal from maintscript.
+  * rules: build man pages reproducibly.
+  * gbp.conf: renamed old style config section [git-dch] to [dch].
+  * README
+    + added instructions to update owner of the "/etc/zm/zm.conf"
+      (Closes: #789327).
+    + zmupdate.pl needs CREATE rights.
+    + added note about required number of "fcgiwrap" workers.
+  * New upstream patch: "zmtrigger-plus.patch".
 
-  * Big merge of onvif support and some fixes.
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 23 Feb 2015 19:45:45 -0500
+zoneminder (1.28.1-6) unstable; urgency=low
 
-zoneminder (1.28.0+1-trusty-SNAPSHOT2015021201) trusty; urgency=medium
+  * New "zoneminder-doc" and "zoneminder-dbg" packages.
 
-  * add mysql-client-5.6 as a dependency instaed of mysql-client.  
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 13 Feb 2015 09:35:13 -0500
+zoneminder (1.28.1-5) unstable; urgency=low
 
-zoneminder (1.28.0+1-trusty-SNAPSHOT2015011101) trusty; urgency=medium
+  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
+    Let dh_installinit do the job. Thanks, Andrew Bauer.
+  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
+  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
+  * Build-Depends:
+    + dh-linktree
+    + cakephp (>= 2.6.3)
+    + libjs-jquery
+    + libjs-mootools
+  * Depends:
+    - libjs-jquery
+    - libjs-mootools
+  * Build-time replace bundled CakePHP with system one using "dh-linktree".
+  * Use "dh-linktree" to handle mootools and jquery symlinks.
 
-  * small changes
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 12 Dec 2014 16:38:36 -0500
+zoneminder (1.28.1-4) unstable; urgency=low
 
-zoneminder (1.28.0+1-utopic-SNAPSHOT2014112001) utopic; urgency=medium
+  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
+  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
+  * New patch to change default date format to region-neutral ISO notation
+    with time zone.
+  * Build sphinx documentation:
+    + Install "zoneminder.1" man page.
+    + Build-Depends += "python-sphinx | python3-sphinx"
+    + Added commented "zoneminder-doc" package.
+    + Added "docs.patch" to unlink distro-specific installation docs.
+  * rules:
+    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
+    + remove mistakengly installed Perl module templates.
+  * Updated startup scripts to create ZM_TMPDIR.
+  * Hurd improvements:
+    + New patch to add PATH_MAX definitions.
+    + Build without MMAP support on Hurd.
+    + libsys-mmap-perl [!hurd-any].
 
-  * Various fixes and developments since 1.28.0.  Includes Digest-Auth for HTTP and better for RTSP
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 20 Nov 2014 10:57:57 -0500
+zoneminder (1.28.1-3) unstable; urgency=low
 
-zoneminder (1.28.0-trusty) trusty; urgency=medium
+  * Updated Apache2 and nginx configuration templates to support CGI.
+  * Updated README.Debian to document cgi-bin setup.
+  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
+  * Added "apache2.patch" to correct Apache2 site configuration example.
+  * control: Suggests += "fcgiwrap".
+  * rules: added dh_systemd overrides to prevent automatic service
+    activation and start.
+  * Added note about manual service activation to README.Debian
+    (Closes: #781733).
 
-  * Release
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:25:55 -0400
+zoneminder (1.28.1-2) unstable; urgency=low
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014101401) trusty; urgency=medium
+  * Removed word "Linux" from short package description.
+  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
+  * Added run-time Perl Depends:
+     + libdbd-mysql-perl
+     + libimage-info-perl
+     + libmodule-load-conditional-perl
+     + libnet-sftp-foreign-perl
+     + liburi-encode-perl
+  * Prepare for package split: added commented "libzoneminder-perl"
+    and "zoneminder-dbg" packages to "debian/control".
+  * rules: do not install worthless ".packlist" file.
+  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
 
-  * Several PR merges in big push for 1.28.0
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
 
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 14 Oct 2014 09:28:29 -0400
+zoneminder (1.28.1-1) unstable; urgency=low
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014092601) trusty; urgency=medium
+  [ Dmitry Smirnov <onlyjob@debian.org> ]
+  * New upstream release [February 2015].
+  * Upload to unstable.
+  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
+    touch database or do unexpected stuff (Closes: #779254).
+    See README.Debian for details.
+  * Updated installation paths:
+    + /usr/share/zoneminder --> /usr/share/zoneminder/www
+    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+  * Added logrotate config (Closes: #544826).
+    Thanks, Alberto Reyes.
+  * Native systemd service; "--with systemd" added to dh.
+  * Build with CMake instead of autoconf; rules clean-up.
+  * Build with all hardening.
+  * Build and install "zmupdate.pl.1" man page.
+  * Added nginx/php5-fpm configuration example.
+  * Install upstream "apache.conf" example.
+  * Described setup of Zoneminer web site and database in README.Debian.
+  * Install "/etc/zm/zm.conf" with tighter permissions.
+  * Added TODO.Debian.
+  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
+  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
+  * Standards-Version: 3.9.6; compat/debhelper to version 9.
+  * Vcs links to new git repository at collab-maint.
+  * Build-Depends:
+    + dh-systemd
+    + libgcrypt11-dev --> libgcrypt-dev
+    + libcurl4-gnutls-dev
+    + libvlc-dev
+    + policykit-1 (required by "zmsystemctl.pl")
+    - dh-autoreconf, autoconf, automake
+  * Depends:
+    - apache2
+    - libapache2-mod-php5 (moved to Suggests)
+    - libpcre3 (invalid)
+    - libmodule-load-perl (obsolete; replaced with perl-modules)
+    - libarchive-tar-perl (obsolete; replaced with perl-modules)
+    - mysql-server (moved to Recommends, Closes: #759504).
+    - php5
+    + libav-tools
+    + libjs-jquery  (replaces bundled component)
+    + libjs-mootool (replaces bundled component)
+    + libjson-any-perl (Closes: #690803).
+    + perl-modules (Closes: #745819).
+  * Recommends:
+    + apache2 | httpd
+    + mysql-server | virtual-mysql-server (Closes: #732874).
+  * Suggests:
+    + libapache2-mod-php5 | php5-fpm
+    + logrotate
+  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
+  * Removed "vendor_perl" patch (applied-upstream).
+  * New patches:
+    + cmake-fix-confpath.patch
+    + cmake-gnutls.patch
+    + cmake-nossl.patch
+    + cmake.patch
+    + format-hardening.patch
+    + pod_man_fixes.patch
+    + pod_name_fixes.patch
+    + pod_zmupdate-to-pod2usage.patch
+  * Lintianisation (incomplete):
+    - extra-license-file
+    - init.d-script-missing-lsb-description
+    - init.d-script-does-not-source-init-functions
+    - privacy-breach-generic
+    - package-contains-empty-directory
+    - manpage-has-errors-from-pod2man
+    - manpage-has-bad-whatis-entry
+    - quilt-patch-missing-description
+    - no-dep5-copyright
+  * Lintian-overrides:
+    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
+    + script-not-executable usr/share/zoneminder/www/api/*
+    + script-with-language-extension usr/bin/*.pl
+    + source-is-missing web/tools/mootools/mootools-*-yc.js
+    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+    + source-contains-prebuilt-javascript-object
+  * Renamed files in "debian".
+  * watch: dfsg repacksuffix and dversionmangle.
+  * "debian/copyright" to Copyright-Format-1.0.
+  * Set myself as new Maintainer (Closes: #760314).
 
-  * style updates and db fixes for database logging filters
+  [ Vagrant Cascadian <vagrant@debian.org> ]
+  * Removed obsolete DM-Upload-Allowed flag.
+  * Update debian/watch to use tarballs from github.
+  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
+  * Use canonical alioth Vcs-Hg URL.
+  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
+  * Removed configure flag "--enable-crashtrace=no", which is no longer
+    present upstream.
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 26 Sep 2014 14:44:45 -0400
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014090801) trusty; urgency=medium
+zoneminder (1.26.5-3.1) experimental; urgency=low
 
-  * several segfault fixes for local cameras
+  * Non-maintainer upload.
+  * Add libav10.patch and compile against libav10 (Closes: #739461)
 
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 08 Sep 2014 16:56:57 -0400
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014090701) trusty; urgency=medium
+zoneminder (1.26.5-3) unstable; urgency=low
 
-  * Fix segfaults for local cameras, also now includes the systemd support patch
 
- -- Isaac Connor <iconnor@connortechnology.com>  Sun, 07 Sep 2014 17:19:01 -0400
+  * Previous release still didn't build on PPC - this has been corrected.
+    (Closes: #736516)
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014082102) trusty; urgency=medium
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
 
-  * Fix UI inputs for v4l multibuffer and captures per frame
+zoneminder (1.26.5-2) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 12:03:31 -0400
+  * Remove dependency on ffmpeg
+    (Closes: #721161)
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014082101) trusty; urgency=medium
+  * Builds again on non-x86 target architectures.
 
-  * fall back to Config table values for V4l MultiBUffer and Captures Per Frame
-  * add mention of monitor page settings for thse in the config table
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 10:04:46 -0400
+zoneminder (1.26.5-1) unstable; urgency=low
 
-zoneminder (1.27.99+1-precise-SNAPSHOT2014080601) precise; urgency=medium
+  * New upstream version
+    (Closes: #694131)
+  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
+    (Closes: #731560)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
 
-  * improve error messages
-  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates
+zoneminder (1.25.0-4) unstable; urgency=high
 
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 06 Aug 2014 20:20:20 -0400
+  * Add CVE-2013-0232 patch
+    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
+    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
+    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
 
-zoneminder (1.27.0+1-trusty-v4ltomonitor-1) trusty; urgency=high
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
 
-  * Snapshot release - 
+zoneminder (1.25.0-3) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
+  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
+    hardening build flags are enabled.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
+
+zoneminder (1.25.0-2) unstable; urgency=low
+
+  [ Vagrant Cascadian ]
+  * Add a patch to disable checking for updated versions by default, as
+    upgrades should happen through package management.
+  * Use dpkg-buildflags in debian/rules to set default compiler flags.
+  * Ensure zoneminder is stopped before starting (Closes: #657407).
+
+  [ Peter Howard ]
+  * Fix postinst to add permission for table creation during upgrade
+    (Closes: #657407).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
+
+zoneminder (1.25.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
+    Brulebois: fix missing <unistd.h> includes.
+    (Closes: #667428)
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
+
+zoneminder (1.25.0-1) unstable; urgency=low
+
+  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
+    dropped.
+  * Fail to build if version in postinst doesn't match upstream version.
+  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
+  * debian/rules: Convert to using debhelper overrides.
+  * Set debian/compat to 7.
+  * Simplify debian/watch file.
+  * Refresh debian/patches/use_libjs-mootools.
+  * Refresh debian/patches/libv4l1-videodev.h.
+  * Remove dependencies on php4 and related packages.
+  * Remove build-dependencies on libmysqlclient14-dev and
+    libmysqlclient15-dev.
+  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
+    (Closes: #647114).
+  * Add patch to fix build by testing for C headers rather than C++ headers.
+    Thanks to Ryan Niebur. (Closes: #654230)
+  * Add a patch to fix build problems caused by API changes in libav 0.8.
+    Thanks again to Ryan Niebur. (Closes: #654230)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
+
+zoneminder (1.24.4-1) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Initial release of 1.24.4 (Closes: #634985).
+    - Fix 32/64-bit type declarations (Closes: #614404).
+  * Update patches.
+
+  [ Vagrant Cascadian ]
+  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
+    Thanks to Andreas Metzler for reporting the issue.
+    (Closes: #619813).
+  * Document adding the www-data user to the video group in README.Debian.
+    (Closes: #611324)
+  * Depend on libsys-mmap-perl to enable mapped memory support.
+    (Closes: #607331)
+  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
+  * Depend on javascript-common, to ensure that /javascript is available in
+    the web server.
+  * Set the upstream version in postinst at build time.
+  * Use dh-autoreconf to properly clean up autogenerated files during build.
+  * Add Vcs-HG to debian/control.
+  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
+
+zoneminder (1.24.2-9) unstable; urgency=low
+
+  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
+    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
+  * Update Standards-Version to 3.9.1, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
+
+zoneminder (1.24.2-8) unstable; urgency=medium
+
+  [ Vagrant Cascadian ]
+  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
+    Thanks to piratebab.
+  * Add preinst script which aborts if dangerous symlinks exist.
+    (closes: #608793)
+
+  [ Peter Howard ]
+  * Added to README.Debian with info about images and events directories.
+    (closes: #608793)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
+
+zoneminder (1.24.2-7) unstable; urgency=medium
+
+  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
+    regression causing upgrades to take inordinately long with large
+    installations (closes: #597040).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
+
+zoneminder (1.24.2-6) unstable; urgency=low
+
+  * Only remove database on purge. This requires only creating the database if
+    it doesn't already exist, and upgrading the database only if the database
+    is an older version (closes: #497107).
+
+  * Do not prompt the user on database upgrades by using the --nointeractive
+    flag when calling zmupdate.pl from postinst (closes: #595902).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
+
+zoneminder (1.24.2-5) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Add zip dependency
+    (closes: #494261)
+  * Add debian/watch file
+    (closes: #545552)
+  * Use packaged libjs-mootools
+    (closes: #585590)
+  * Miscellaneous cleanups
+
+  [ Vagrant Cascadian ]
+  * Add vagrant@debian.org as uploader
+  * Update Standards-Version to 3.9.0, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
+
+zoneminder (1.24.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "package removed, processes still running": apply patch to
+    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
+    mysql-related actions only when mysql is running (closes: #583648).
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
+
+zoneminder (1.24.2-4) unstable; urgency=high
+  * Update init.d to list mysql dependency
+    (closes: #583505)
+  * Change depenency from libmime-perl to libmime-tools-perl
+    (closes: #585589)
+  * Problems in changelog format fixed
+    (closes: #585592)
+  * Fix debian-rules-ignores-make-clean-error
+    (closes: #585593)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
+
+zoneminder (1.24.2-3) unstable; urgency=high
+  * Changes symbols to build with libjpeg8
+    (closes: #565326, #568327)
+  * Note: location of all perl files should have been fixed in previous release
+    (closes: #553096)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
+
+zoneminder (1.24.2-2) unstable; urgency=high
+
+  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
+    (closes: #551746, #553092)
+  * Fix GCC4.4 bug
+    (closes: #531717)
+  * Fix potential bug in postinst script
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
+
+zoneminder (1.24.2-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.2
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
+
+zoneminder (1.24.1-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
+    CVE-2008-3881, CVE-2008-3880
+    (closes: #497640)
+  * Change syslog dependency to rsyslog.
+    (closes: #526918)
+  * Add missing perl depenency.
+  * Restore patch to disable "check for updates" by default.
+  * Removed spurious '$' in init script.
+    (closes: #486064)
+  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
+    (closes: #528252)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
+
+zoneminder (1.23.3-4) unstable; urgency=high
+
+  * update to get it building with latest unstable. Thanks to waldi@debian.org
+    (closes: #517569)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
+
+zoneminder (1.23.3-3) unstable; urgency=high
+
+  * ffmpeg confirmed  working
+    (closes: #475145)
+  * Fix upgrade problem intrudouced in 1.23.3-1
+    (closes: #481637)
+  * Include libmime-lite-perl in dependencies
+    (closes: #486312)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
+
+zoneminder (1.23.3-2) unstable; urgency=high
+
+  * ffmpeg finally working?
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
+
+zoneminder (1.23.3-1) unstable; urgency=high
+
+  * Initial version for 1.23.3 - security fix.
+    (closes: #479034)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-2) unstable; urgency=low
+
+  * Update to init.d
+    (closes: #468856)
+  * Add dependency on logging daemon
+    (closes: #471277)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-1) unstable; urgency=low
+
+  * Initial version for 1.23.2
+    (closes: #464152)
+  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
+    (closes: #454980)
+  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
+
+zoneminder (1.22.3-10) unstable; urgency=low
+
+  * Fix bug introduced in -9 where perl is put under /usr/local
+    (closes: #457507)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-9) unstable; urgency=low
+
+  * Starting zoneminder via init script now  invokes "zmfix -a"
+    (closes: #481637)
+  * Change apache2-mpm-prefork dependency to apache2
+  * Temp dir for export under /var/cache/zoneminder (but linked back to
+    /usr/share/zoneminder for now)
+  * Redo use of gnutls rather than openssl for md5 hashes
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-8) unstable; urgency=low
+
+  * Build now includes libpcre3
+    (closes: #437533)
+  * "Monitor Presets" patch now applied to package during build.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
+
+zoneminder (1.22.3-7) unstable; urgency=low
+
+  * Turn off debug trace and crash dump on build
+    (closes:#414857,#414891)
+  * Additional perl libraries added in dependencies
+    (closes:#416291)
+  * Change preferred PHP version from 4 to 5
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
+
+zoneminder (1.22.3-6) unstable; urgency=low
+
+  * Removed a similar bash only statement from zmpkg.pl
+    (closes:414882)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
+
+zoneminder (1.22.3-5) unstable; urgency=low
+
+  * Installs with "phone home" feature turned off by default, and permissions
+    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
+    (closes:415349)
+  * Removed "stupid bash-ism" on mysqld check in postinst file.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
+
+zoneminder (1.22.3-4) unstable; urgency=low
+
+  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
+    (closes: #414410)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
+
+zoneminder (1.22.3-3) unstable; urgency=low
+
+  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
+  * Also in postinstall: check and start MySQL if it's not running.
+  * init.d script now checks if zoneminder isn't running and still returns 0
+    (which helps uninstalling)
+  * Addition of php5 dependency options as well as php4.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
+
+zoneminder (1.22.3-2) unstable; urgency=low
+
+  * Added zmuser in the mysql creation; this should fix the install problem
+    for people, but needs to be cleaned up (in -3)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
+
+zoneminder (1.22.3-1) unstable; urgency=low
+
+  * Initial Version. (closes: #248393)
+  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
+  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
+    various scripts; replaced with GPL.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100
diff --git a/distros/ubuntu1204_cmake/clean b/distros/ubuntu1204/clean
similarity index 100%
rename from distros/ubuntu1204_cmake/clean
rename to distros/ubuntu1204/clean
diff --git a/distros/ubuntu1204_cmake/conf/apache2/zoneminder.conf b/distros/ubuntu1204/conf/apache2/zoneminder.conf
similarity index 100%
rename from distros/ubuntu1204_cmake/conf/apache2/zoneminder.conf
rename to distros/ubuntu1204/conf/apache2/zoneminder.conf
diff --git a/distros/ubuntu1204/control b/distros/ubuntu1204/control
index 170504b5a..6368d9417 100644
--- a/distros/ubuntu1204/control
+++ b/distros/ubuntu1204/control
@@ -1,33 +1,64 @@
 Source: zoneminder
 Section: net
 Priority: optional
-Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), autoconf, automake, quilt, libphp-serialization-perl, libgnutls-dev, libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl, libdate-manip-perl, libwww-perl, libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev, libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libv4l-dev (>= 0.8.3), libbz2-dev, libtool, libsys-mmap-perl, ffmpeg | libav-tools, libavdevice-dev, libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl, dh-autoreconf, libvlccore-dev, libvlc-dev, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libgcrypt11-dev, libpolkit-gobject-1-dev
+Maintainer: Dmitry Smirnov <onlyjob@debian.org>
+Uploaders: Vagrant Cascadian <vagrant@debian.org>
+Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
+              ,cmake
+			  ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
+              ,libbz2-dev
+              ,libgcrypt-dev
+              ,libcurl4-gnutls-dev
+              ,libgnutls-openssl-dev
+			  ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
+              ,libmysqlclient-dev
+              ,libpcre3-dev
+              ,libpolkit-gobject-1-dev
+              ,libv4l-dev (>= 0.8.3) [!hurd-any]
+              ,libvlc-dev
+# Unbundled (dh_linktree):
+        ,libjs-jquery
+        ,libjs-mootools
 Standards-Version: 3.9.4
+Homepage: http://www.zoneminder.com/
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg | libav-tools, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice53 | libavdevice55, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
-Recommends: mysql-server|mariadb-server
-Description: Video camera security and surveillance solution
- ZoneMinder is intended for use in single or multi-camera video security 
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-Package: zoneminder-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for zoneminder.
- ZoneMinder is a video camera security and surveillance solution.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+        ,javascript-common
+        ,libav-tools|ffmpeg
+        ,libdate-manip-perl
+        ,libdbd-mysql-perl
+        ,libmime-lite-perl
+        ,libmime-tools-perl
+        ,libphp-serialization-perl
+        ,libmodule-load-conditional-perl
+        ,libnet-sftp-foreign-perl
+#       ,libzoneminder-perl (= ${source:Version})
+          ,libarchive-zip-perl
+          ,libdbd-mysql-perl
+          ,libdevice-serialport-perl
+          ,libimage-info-perl
+          ,libjson-any-perl
+          ,libsys-mmap-perl [!hurd-any]
+          ,liburi-encode-perl
+          ,libwww-perl
+        ,mysql-client | virtual-mysql-client
+        ,perl-modules
+        ,php5-mysql, php5-gd
+        ,policykit-1
+        ,rsyslog | system-log-daemon
+        ,zip
+        ,libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
+        , libsys-cpu-perl, libsys-meminfo-perl
+Recommends: ${misc:Recommends}
+           ,libapache2-mod-php5 | php5-fpm
+           ,mysql-server | virtual-mysql-server
+           ,zoneminder-doc (>= ${source:Version})
+Suggests: fcgiwrap, logrotate
+Description: video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security
  applications, including commercial or home CCTV, theft prevention and child
  or family member or home monitoring and other care scenarios. It
@@ -38,3 +69,70 @@ Description: Debugging symbols for zoneminder.
  video security system and for commercial or professional video security
  and surveillance. It can also be integrated into a home automation system
  via X.10 or other protocols.
+
+#Package: libzoneminder-perl
+#Section: perl
+#Architecture: all
+#Multi-Arch: foreign
+#Depends: ${misc:Depends}, ${perl:Depends}
+#        ,libarchive-zip-perl
+#        ,libdbd-mysql-perl
+#        ,libdevice-serialport-perl
+#        ,libimage-info-perl
+#        ,libjson-any-perl
+#        ,libsys-mmap-perl [!hurd-any]
+#        ,liburi-encode-perl
+#        ,libwww-perl
+#Description: ZoneMinder Perl libraries
+# ZoneMinder is intended for use in single or multi-camera video security
+# applications, including commercial or home CCTV, theft prevention and child
+# or family member or home monitoring and other care scenarios. It
+# supports capture, analysis, recording, and monitoring of video data coming
+# from one or more video or network cameras attached to a Linux system.
+# ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+# cameras using a variety of protocols. It is suitable for use as a home
+# video security system and for commercial or professional video security
+# and surveillance. It can also be integrated into a home automation system
+# via X.10 or other protocols.
+# .
+# This package provides ZoneMinder Perl libraries; it can be used to
+# write custom interfaces as well.
+
+Package: zoneminder-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}
+Suggests: www-browser
+Description: ZoneMinder documentation
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides ZoneMinder documentation in HTML format.
+
+Package: zoneminder-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
+Description: Zoneminder -- debugging symbols
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides debugging symbols
diff --git a/distros/ubuntu1204/copyright b/distros/ubuntu1204/copyright
index a177502a0..c48025a25 100644
--- a/distros/ubuntu1204/copyright
+++ b/distros/ubuntu1204/copyright
@@ -1,22 +1,174 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ZoneMinder
+Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
+Source: https://github.com/ZoneMinder/ZoneMinder
+Comment:
+ This package was originally debianized by matrix <matrix@cecilia>
+ on Mon,  7 Mar 2005 02:07:57 -0500.
+ It was re-done for submission to the Debian project by Peter Howard
+ <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
+Files-Excluded:
+    web/skins/*/js/jquery-*
+    web/tools/mootools/*-yc.js
+
+Files: *
+Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
+           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
+           2014      Vincent Giovannone
+           2013      Tim Craig <timcraigNO@SPAMsonic.net>
+           2003-2008 Corey DeLasaux
+           2001-2010 Chris Kistner
+License: GPL-2+
+
+Files: distros/*
+Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+           2014      Isaac Connor <iconnor@connortechnology.com>
+           2005      Serg Oskin
+License: GPL-2+
+
+Files: web/skins/*/js/jquery-*
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: GPL-2 or Expat
+Comment:
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
+ .
+ Includes Sizzle.js http://sizzlejs.com/
+ Released under the MIT, BSD, and GPL Licenses.
+
+Files: web/tools/mootools/*.js
+Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+           2006-2010 Valerio Proietti (http://mad4milk.net/)
+License: Expat
+
+Files: web/api/*
+Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
+License: Expat
+
+Files:
+    cmake/Modules/CheckPrototypeDefinition*.cmake
+    cmake/Modules/FindGLIB2.cmake
+    cmake/Modules/FindPolkit.cmake
+    cmake/Modules/GNUInstallDirs.cmake
 Copyright:
+    2005-2011 Kitware, Inc.
+    2010-2011 Andreas Schneider <asn@cryptomilk.org>
+    2009      Dario Freddi <drf@kde.org>
+    2008      Laurent Montel, <montel@kde.org>
+    2011      Nikita Krupen'ko <krnekit@gmail.com>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ .
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+  * The names of Kitware, Inc., the Insight Consortium, or the names of
+    any consortium members, or of any contributors, may not be used to
+    endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
+Files: cmake/Modules/FindPerlModules.cmake
+Copyright: 2012 Iowa State University
+License: Boost-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
 
-License:
+Files: debian/*
+Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
+           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
+           2010-2012 Vagrant Cascadian <vagrant@debian.org>
+           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+License: GPL-2+
 
-This package is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
 
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
 
-You should have received a copy of the GNU General Public
-License along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; version 2 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/distros/ubuntu1204/dirs b/distros/ubuntu1204/dirs
deleted file mode 100644
index 4178482c1..000000000
--- a/distros/ubuntu1204/dirs
+++ /dev/null
@@ -1,6 +0,0 @@
-var/log/zm
-var/lib/zm
-var/cache/zoneminder/events
-var/cache/zoneminder/images
-var/cache/zoneminder/temp
-usr/share/zoneminder/db
diff --git a/distros/ubuntu1204/docs b/distros/ubuntu1204/docs
deleted file mode 100644
index b43bf86b5..000000000
--- a/distros/ubuntu1204/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/distros/ubuntu1204_cmake/examples/nginx.conf b/distros/ubuntu1204/examples/nginx.conf
similarity index 100%
rename from distros/ubuntu1204_cmake/examples/nginx.conf
rename to distros/ubuntu1204/examples/nginx.conf
diff --git a/distros/ubuntu1204_cmake/gbp.conf b/distros/ubuntu1204/gbp.conf
similarity index 100%
rename from distros/ubuntu1204_cmake/gbp.conf
rename to distros/ubuntu1204/gbp.conf
diff --git a/distros/ubuntu1204/init.d b/distros/ubuntu1204/init.d
deleted file mode 100644
index f22143c38..000000000
--- a/distros/ubuntu1204/init.d
+++ /dev/null
@@ -1,91 +0,0 @@
-#!/bin/sh
-### BEGIN INIT INFO
-# Provides:          zoneminder
-# Required-Start:    $network $remote_fs $syslog
-# Required-Stop:     $network $remote_fs $syslog
-# Should-Start:      mysql
-# Should-Stop:       mysql
-# Default-Start:     2 3 4 5
-# Default-Stop:      0 1 6
-# Short-Description:  Control ZoneMinder as a Service
-### END INIT INFO
-# description: Control ZoneMinder as a Service
-# chkconfig: 2345 20 20
-
-# Source function library.
-#. /etc/rc.d/init.d/functions
-
-prog=ZoneMinder
-ZM_PATH_BIN="/usr/bin"
-RUNDIR=/var/run/zm
-TMPDIR=/tmp/zm
-command="$ZM_PATH_BIN/zmpkg.pl"
-
-start() {
-	echo -n "Starting $prog: "
-	export TZ=:/etc/localtime
-	mkdir -p $RUNDIR && chown www-data:www-data $RUNDIR
-	mkdir -p $TMPDIR && chown www-data:www-data $TMPDIR
-	$command start
-	RETVAL=$?
-	[ $RETVAL = 0 ] && echo success
-	[ $RETVAL != 0 ] && echo failure
-	echo
-	[ $RETVAL = 0 ] && touch /var/lock/zm
-	return $RETVAL
-}
-stop() {
-	echo -n "Stopping $prog: "
-	#
-	# Why is this status check being done?
-	# as $command stop returns 1 if zoneminder 
-	# is stopped, which will result in 
-	# this returning 1, which will stuff 
-	# dpkg when it tries to stop zoneminder before
-	# uninstalling . . . 
-	#
-	result=`$command status`
-	if [ ! "$result" = "running" ]; then
-		echo "Zoneminder already stopped"
-		echo
-		RETVAL=0
-	else
-		$command stop
-		RETVAL=$?
-		[ $RETVAL = 0 ] && echo success
-		[ $RETVAL != 0 ] && echo failure
-		echo
-		[ $RETVAL = 0 ] && rm -f /var/lock/zm
-	fi
-}
-status() {
-	result=`$command status`
-	if [ "$result" = "running" ]; then
-		echo "ZoneMinder is running"
-		RETVAL=0
-	else
-		echo "ZoneMinder is stopped"
-		RETVAL=1
-	fi
-}
-
-case "$1" in
-'start')
-	start
-	;;
-'stop')
-	stop
-	;;
-'restart' | 'force-reload')
-	stop
-	start
-	;;
-'status')
-	status
-	;;
-*)
-	echo "Usage: $0 { start | stop | restart | status }"
-	RETVAL=1
-	;;
-esac
-exit $RETVAL
diff --git a/distros/ubuntu1204/install b/distros/ubuntu1204/install
deleted file mode 100644
index 4b0009cea..000000000
--- a/distros/ubuntu1204/install
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin
-usr/lib/cgi-bin
-usr/share/man
-usr/share/perl5/ZoneMinder
-usr/share/perl5/ZoneMinder.pm
-usr/share/polkit-1/actions
-usr/share/polkit-1/rules.d
-usr/share/zoneminder
-etc/zm
-db/zm_create.sql usr/share/zoneminder/db
-db/zm_update-*.sql usr/share/zoneminder/db
-debian/apache.conf etc/zm
diff --git a/distros/ubuntu1204_cmake/libzoneminder-perl.install b/distros/ubuntu1204/libzoneminder-perl.install
similarity index 100%
rename from distros/ubuntu1204_cmake/libzoneminder-perl.install
rename to distros/ubuntu1204/libzoneminder-perl.install
diff --git a/distros/ubuntu1204/links b/distros/ubuntu1204/links
deleted file mode 100644
index 9715ee428..000000000
--- a/distros/ubuntu1204/links
+++ /dev/null
@@ -1,4 +0,0 @@
-var/cache/zoneminder/events usr/share/zoneminder/events
-var/cache/zoneminder/images usr/share/zoneminder/images
-var/cache/zoneminder/temp   usr/share/zoneminder/temp
-usr/lib/cgi-bin             usr/share/zoneminder/cgi-bin
diff --git a/distros/ubuntu1204_cmake/patches/default_cgi-path.patch b/distros/ubuntu1204/patches/default_cgi-path.patch
similarity index 100%
rename from distros/ubuntu1204_cmake/patches/default_cgi-path.patch
rename to distros/ubuntu1204/patches/default_cgi-path.patch
diff --git a/distros/ubuntu1204/patches/series b/distros/ubuntu1204/patches/series
index e69de29bb..fc70f4006 100644
--- a/distros/ubuntu1204/patches/series
+++ b/distros/ubuntu1204/patches/series
@@ -0,0 +1,2 @@
+default_cgi-path.patch
+use_libjs-mootools.patch
diff --git a/distros/ubuntu1204_cmake/patches/use_libjs-mootools.patch b/distros/ubuntu1204/patches/use_libjs-mootools.patch
similarity index 100%
rename from distros/ubuntu1204_cmake/patches/use_libjs-mootools.patch
rename to distros/ubuntu1204/patches/use_libjs-mootools.patch
diff --git a/distros/ubuntu1204/postinst b/distros/ubuntu1204/postinst
deleted file mode 100644
index d06f9c641..000000000
--- a/distros/ubuntu1204/postinst
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	if [ -e "/etc/init.d/mysql" ]; then 
-		#
-		# Get mysql started if it isn't
-		#
-		if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
-				invoke-rc.d mysql start
-		fi
-		if $(/etc/init.d/mysql status >/dev/null 2>&1); then
-			mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-			# test if database if already present...
-			if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-				cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-				echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-			fi
-
-			invoke-rc.d zoneminder stop || true
-			zmupdate.pl --nointeractive
-
-		else
-			echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
-		fi
-	else 
-		echo 'mysql not found, assuming remote server.'
-	fi
-	chown www-data:www-data /var/log/zm
-	chown www-data:www-data /var/lib/zm/
-	if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
-	fi
-fi
-# Ensure zoneminder is stopped...
-if [ -x "/etc/init.d/zoneminder" ]; then
-        if invoke-rc.d zoneminder status ; then
-                invoke-rc.d zoneminder stop || exit $?
-        fi
-fi
-
-if [ "$1" = "configure" ]; then
-	if [ -z "$2" ]; then
-		chown www-data:www-data /var/log/zm
-		chown www-data:www-data /var/lib/zm/
-		chown www-data:www-data -R /var/cache/zoneminder
-    else
-		chown www-data:www-data /var/log/zm
-		zmupdate.pl
-	fi
-fi
-#DEBHELPER#
diff --git a/distros/ubuntu1204/postrm b/distros/ubuntu1204/postrm
deleted file mode 100644
index 28a00a7a0..000000000
--- a/distros/ubuntu1204/postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-# set -e # to be reinstated later
-
-if [ "$1" = "purge" ]; then
-    echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
-fi
-#DEBHELPER#
diff --git a/distros/ubuntu1204/preinst b/distros/ubuntu1204/preinst
deleted file mode 100755
index 6cd01ba55..000000000
--- a/distros/ubuntu1204/preinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-abort=false
-if [ -L /usr/share/zoneminder/events ]; then
-    l=$(readlink /usr/share/zoneminder/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -L /usr/share/zoneminder/images ]; then
-    l=$(readlink /usr/share/zoneminder/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF 
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1204/rules b/distros/ubuntu1204/rules
index e25e5514d..b467c870f 100755
--- a/distros/ubuntu1204/rules
+++ b/distros/ubuntu1204/rules
@@ -1,67 +1,87 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
 
-CFLAGS = -Wall -g
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+ifeq ($(DEB_BUILD_ARCH_OS),hurd)
+ARGS:= -DZM_NO_MMAP=ON
 endif
 
 %:
-	dh $@ --with quilt,autoreconf
+	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
+            --with sphinxdoc,apache2,linktree
 
 override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
+	dh_auto_configure -- $(ARGS)                  \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                \
+            -DCMAKE_BUILD_TYPE=Release                 \
+            -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_RUNDIR="/var/run/zm"                  \
+            -DZM_SOCKDIR="/var/run/zm"                 \
+            -DZM_TMPDIR="/tmp/zm"                      \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CONTENTDIR="/var/cache/zoneminder"
 
 override_dh_clean:
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+	dh_clean $(MANPAGES1)
+	$(RM) -r docs/_build docs/installationguide
 
-override_dh_install:
-	dh_install --fail-missing
-	#
-	# NOTE: This is a short-term kludge; hopefully changes in the next
-	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/images
-	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	dh_link var/cache/zoneminder/events usr/share/zoneminder/events
-	dh_link var/cache/zoneminder/images usr/share/zoneminder/images
-	dh_link var/cache/zoneminder/temp usr/share/zoneminder/temp
+build-indep:
+	#$(MAKE) -C docs text
+	$(MAKE) -C docs html
 
-	#
-	# This is a slightly lesser kludge; moving the cgi stuff to
-	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
-	# having it just in /usr/lib/cgi-bin breaks another bit of
-	# behavior.
-	#
-	dh_link usr/lib/cgi-bin usr/share/zoneminder/cgi-bin
+MANPAGES1 = dbuild/scripts/zmupdate.pl.1
+$(MANPAGES1):
+	# generate man page(s):
+	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
+
+## reproducible build:
+LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
+BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
+override_dh_installman: $(MANPAGES1)
+	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
+	dh_installman --language=C $(MANPAGES1)
+
+override_dh_auto_install:
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	# remove worthless files:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
+	# remove empty directories:
+	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
+	# remove extra-license-file:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
 
 override_dh_fixperms:
 	dh_fixperms
-	chown root:root debian/zoneminder/etc/zm/zm.conf
+	## 637685
+	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
-override_dh_auto_test:
-	# do not run tests...
+override_dh_installinit:
+	dh_installinit --no-start
+
+override_dh_apache2:
+	dh_apache2 --noenable
 
-.PHONY: override_dh_strip
 override_dh_strip:
-		dh_strip --dbg-package=zoneminder-dbg
+	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
+        && dh_strip --dbg-package=zoneminder-dbg \
+        || dh_strip
+
+#%:
+#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
+#
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#            --sysconfdir=/etc/zm \
+#            --with-mysql=/usr \
+#            --with-webdir=/usr/share/zoneminder \
+#            --with-ffmpeg=/usr \
+#            --with-cgidir=/usr/lib/cgi-bin \
+#            --with-webuser=www-data \
+#            --with-webgroup=www-data \
+#            --enable-mmap=yes
diff --git a/distros/debian8/source/format b/distros/ubuntu1204/source/format
similarity index 100%
rename from distros/debian8/source/format
rename to distros/ubuntu1204/source/format
diff --git a/distros/ubuntu1204_cmake/source/lintian-overrides b/distros/ubuntu1204/source/lintian-overrides
similarity index 100%
rename from distros/ubuntu1204_cmake/source/lintian-overrides
rename to distros/ubuntu1204/source/lintian-overrides
diff --git a/distros/ubuntu1204/watch b/distros/ubuntu1204/watch
index 5a8a9c4d7..7ee690edb 100644
--- a/distros/ubuntu1204/watch
+++ b/distros/ubuntu1204/watch
@@ -1,3 +1,7 @@
 version=3
-http://www.zoneminder.com/downloads.html \
-  .*/ZoneMinder-(.*).tar.gz
+
+opts=\
+repacksuffix=+dfsg,\
+dversionmangle=s{\+dfsg\d*}{},\
+ https://github.com/ZoneMinder/ZoneMinder/releases \
+  .*/ZoneMinder/archive/v(.*).tar.gz
diff --git a/distros/ubuntu1204_cmake/zoneminder-doc.doc-base b/distros/ubuntu1204/zoneminder-doc.doc-base
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder-doc.doc-base
rename to distros/ubuntu1204/zoneminder-doc.doc-base
diff --git a/distros/ubuntu1204_cmake/zoneminder-doc.install b/distros/ubuntu1204/zoneminder-doc.install
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder-doc.install
rename to distros/ubuntu1204/zoneminder-doc.install
diff --git a/distros/ubuntu1204_cmake/zoneminder-doc.links b/distros/ubuntu1204/zoneminder-doc.links
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder-doc.links
rename to distros/ubuntu1204/zoneminder-doc.links
diff --git a/distros/ubuntu1204_cmake/zoneminder.apache2 b/distros/ubuntu1204/zoneminder.apache2
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.apache2
rename to distros/ubuntu1204/zoneminder.apache2
diff --git a/distros/ubuntu1204_cmake/zoneminder.bug-presubj b/distros/ubuntu1204/zoneminder.bug-presubj
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.bug-presubj
rename to distros/ubuntu1204/zoneminder.bug-presubj
diff --git a/distros/ubuntu1204_cmake/zoneminder.dirs b/distros/ubuntu1204/zoneminder.dirs
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.dirs
rename to distros/ubuntu1204/zoneminder.dirs
diff --git a/distros/ubuntu1204_cmake/zoneminder.docs b/distros/ubuntu1204/zoneminder.docs
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.docs
rename to distros/ubuntu1204/zoneminder.docs
diff --git a/distros/ubuntu1204_cmake/zoneminder.examples b/distros/ubuntu1204/zoneminder.examples
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.examples
rename to distros/ubuntu1204/zoneminder.examples
diff --git a/distros/ubuntu1204_cmake/zoneminder.init b/distros/ubuntu1204/zoneminder.init
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.init
rename to distros/ubuntu1204/zoneminder.init
diff --git a/distros/ubuntu1204_cmake/zoneminder.install b/distros/ubuntu1204/zoneminder.install
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.install
rename to distros/ubuntu1204/zoneminder.install
diff --git a/distros/ubuntu1204_cmake/zoneminder.links b/distros/ubuntu1204/zoneminder.links
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.links
rename to distros/ubuntu1204/zoneminder.links
diff --git a/distros/ubuntu1204_cmake/zoneminder.linktrees b/distros/ubuntu1204/zoneminder.linktrees
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.linktrees
rename to distros/ubuntu1204/zoneminder.linktrees
diff --git a/distros/ubuntu1204_cmake/zoneminder.lintian-overrides b/distros/ubuntu1204/zoneminder.lintian-overrides
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.lintian-overrides
rename to distros/ubuntu1204/zoneminder.lintian-overrides
diff --git a/distros/ubuntu1204_cmake/zoneminder.logrotate b/distros/ubuntu1204/zoneminder.logrotate
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.logrotate
rename to distros/ubuntu1204/zoneminder.logrotate
diff --git a/distros/ubuntu1204_cmake/zoneminder.maintscript b/distros/ubuntu1204/zoneminder.maintscript
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.maintscript
rename to distros/ubuntu1204/zoneminder.maintscript
diff --git a/distros/ubuntu1204_cmake/zoneminder.manpages b/distros/ubuntu1204/zoneminder.manpages
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.manpages
rename to distros/ubuntu1204/zoneminder.manpages
diff --git a/distros/ubuntu1204/zoneminder.postinst b/distros/ubuntu1204/zoneminder.postinst
new file mode 100644
index 000000000..7c01cdde4
--- /dev/null
+++ b/distros/ubuntu1204/zoneminder.postinst
@@ -0,0 +1,53 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+
+    . /etc/zm/zm.conf
+
+    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
+    chown www-data:root /var/log/zm
+    chown www-data:www-data /var/lib/zm
+    if [ -z "$2" ]; then
+        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
+    fi
+
+    # Do this every time the package is installed or upgraded
+
+    if [ "$ZM_DB_HOST" = "localhost" ]; then
+        if [ -e "/etc/init.d/mysql" ]; then 
+            #
+            # Get mysql started if it isn't
+            #
+            if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                    invoke-rc.d mysql start
+            fi
+            if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                # test if database if already present...
+                if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                    # This creates the user.
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                else
+                    echo "grant lock tables, alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                fi
+
+                # Ensure zoneminder is stopped
+                invoke-rc.d zoneminder stop || true
+                zmupdate.pl --nointeractive
+                zmupdate.pl --nointeractive -f
+                invoke-rc.d zoneminder start || true
+            else
+                echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+            fi
+        else 
+            echo 'mysql not found, assuming remote server.'
+        fi
+    else 
+        echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
+    fi
+fi
+
+#DEBHELPER#
diff --git a/distros/ubuntu1204_cmake/zoneminder.postrm b/distros/ubuntu1204/zoneminder.postrm
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.postrm
rename to distros/ubuntu1204/zoneminder.postrm
diff --git a/distros/ubuntu1204_cmake/zoneminder.preinst b/distros/ubuntu1204/zoneminder.preinst
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.preinst
rename to distros/ubuntu1204/zoneminder.preinst
diff --git a/distros/ubuntu1204_cmake/zoneminder.service b/distros/ubuntu1204/zoneminder.service
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.service
rename to distros/ubuntu1204/zoneminder.service
diff --git a/distros/ubuntu1204_cmake/zoneminder.tmpfile b/distros/ubuntu1204/zoneminder.tmpfile
similarity index 100%
rename from distros/ubuntu1204_cmake/zoneminder.tmpfile
rename to distros/ubuntu1204/zoneminder.tmpfile
diff --git a/distros/ubuntu1204_cmake/README.Debian b/distros/ubuntu1204_cmake/README.Debian
deleted file mode 100644
index 2ba809fe4..000000000
--- a/distros/ubuntu1204_cmake/README.Debian
+++ /dev/null
@@ -1,160 +0,0 @@
-Zoneminder for Debian
----------------------
-
-Initializing database
----------------------
-
-    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
-OR
-    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
-
-    echo 'grant lock tables,alter,create,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
-accordingly.
-
-The following command can help to ensure that zoneminder can read its
-configuration file:
-
-    chgrp -c www-data /etc/zm/zm.conf
-
-
-Upgrading database
-------------------
-
-Prior to 1.28.1 database upgrade was performed automatically.
-"zoneminder" service will refuse to start with outdated database.
-
-Assuming that database is on "localhost" then the following command can be
-used to upgrade "zm" database:
-
-    zmupdate.pl
-
-Additional permissions may be required to perform upgrade:
-
-    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-The following command prints the current version of zoneminder database:
-
-    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
-
-
-Enabling service
-----------------
-
-By default Zoneminder service is not starting automatically and need to be
-manually activated once database is configured:
-
-On systemd:
-
-    sudo systemctl enable zoneminder.service
-
-On SysV:
-
-    sudo update-rc.d zoneminder enable
-
-
-Web server set-up
------------------
-
-There are few manual steps to get the web interface working:
-
-## Apache2
-
-Apache can be configured as folder "/zm" using sample .conf:
-
-    sudo a2enconf zoneminder
-
-Alternatively Apache web site configuration template can be used to setup
-zoneminder as "http://zoneminder":
-
-    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
-    sudo a2ensite zoneminder.conf
-
-Common configuration steps for Apache2:
-
-    sudo a2enmod cgi
-    sudo service apache2 reload
-
-
-## nginx / fcgiwrap
-
-Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
-for binary "cgi-bin" applications:
-
-    sudo apt-get install php5-fpm fcgiwrap
-
-To enable a URL alias that makes Zoneminder available from
-
-    http://yourserver/zm
-
-the following line is to be added to "server" section of a web site
-configuration:
-
-    include /usr/share/doc/zoneminder/examples/nginx.conf;
-
-For "default" web site it would be sufficient to include the above
-statement to the file
-
-    /etc/nginx/sites-enabled/default
-
-To avoid problems with feeds from multiple cameras "fcgiwrap" should be
-configured to start at least as many processes as there are cameras.
-It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
-Systemd users may be affected by the following bug:
-
-    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
-
-
-## Note:
-
-When Zoneminder web site is running it may be necessary to set
-Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
-site configuration.
-
-
-Changing the location for images and events
--------------------------------------------
-
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-(thanks to vagrant@freegeek.org):
-
-These lines in fstab could allow you to bind-mount an alternate location
-
-         /dev/sdX1 /otherdrive ext3 defaults 0 2
-         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
-         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
-
-Access to /dev/video*
----------------------
-
-For cameras which require access to /dev/video*, zoneminder may need the
-www-data user added to the video group in order to see those cameras:
-
-  adduser www-data video
-
-Note that all web applications running on the zoneminder server will then have
-access to all video devices on the system.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu1204_cmake/changelog b/distros/ubuntu1204_cmake/changelog
deleted file mode 100644
index 74cf1d0b8..000000000
--- a/distros/ubuntu1204_cmake/changelog
+++ /dev/null
@@ -1,573 +0,0 @@
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
-
-  * include api, switch to cmake build
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
-
-
-zoneminder (1.28.1-8) unstable; urgency=medium
-
-  * Patchworks:
-    + New upstream "980-fix-image-size.patch".
-    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
-  * postinst: set "root" as group owner for "/var/log/zm" to silence
-    logrotate warnings.
-  * Minor correction to README.Debian.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
-
-zoneminder (1.28.1-7) unstable; urgency=medium
-
-  * Build-Depends += "cakephp (<< 3.0.0~)";
-    Zoneminder is not compatible with latest CakePHP.
-  * Handle conffile removal from maintscript.
-  * rules: build man pages reproducibly.
-  * gbp.conf: renamed old style config section [git-dch] to [dch].
-  * README
-    + added instructions to update owner of the "/etc/zm/zm.conf"
-      (Closes: #789327).
-    + zmupdate.pl needs CREATE rights.
-    + added note about required number of "fcgiwrap" workers.
-  * New upstream patch: "zmtrigger-plus.patch".
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
-
-zoneminder (1.28.1-6) unstable; urgency=low
-
-  * New "zoneminder-doc" and "zoneminder-dbg" packages.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
-
-zoneminder (1.28.1-5) unstable; urgency=low
-
-  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
-    Let dh_installinit do the job. Thanks, Andrew Bauer.
-  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
-  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
-  * Build-Depends:
-    + dh-linktree
-    + cakephp (>= 2.6.3)
-    + libjs-jquery
-    + libjs-mootools
-  * Depends:
-    - libjs-jquery
-    - libjs-mootools
-  * Build-time replace bundled CakePHP with system one using "dh-linktree".
-  * Use "dh-linktree" to handle mootools and jquery symlinks.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
-
-zoneminder (1.28.1-4) unstable; urgency=low
-
-  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
-  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
-  * New patch to change default date format to region-neutral ISO notation
-    with time zone.
-  * Build sphinx documentation:
-    + Install "zoneminder.1" man page.
-    + Build-Depends += "python-sphinx | python3-sphinx"
-    + Added commented "zoneminder-doc" package.
-    + Added "docs.patch" to unlink distro-specific installation docs.
-  * rules:
-    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
-    + remove mistakengly installed Perl module templates.
-  * Updated startup scripts to create ZM_TMPDIR.
-  * Hurd improvements:
-    + New patch to add PATH_MAX definitions.
-    + Build without MMAP support on Hurd.
-    + libsys-mmap-perl [!hurd-any].
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
-
-zoneminder (1.28.1-3) unstable; urgency=low
-
-  * Updated Apache2 and nginx configuration templates to support CGI.
-  * Updated README.Debian to document cgi-bin setup.
-  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
-  * Added "apache2.patch" to correct Apache2 site configuration example.
-  * control: Suggests += "fcgiwrap".
-  * rules: added dh_systemd overrides to prevent automatic service
-    activation and start.
-  * Added note about manual service activation to README.Debian
-    (Closes: #781733).
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
-
-zoneminder (1.28.1-2) unstable; urgency=low
-
-  * Removed word "Linux" from short package description.
-  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
-  * Added run-time Perl Depends:
-     + libdbd-mysql-perl
-     + libimage-info-perl
-     + libmodule-load-conditional-perl
-     + libnet-sftp-foreign-perl
-     + liburi-encode-perl
-  * Prepare for package split: added commented "libzoneminder-perl"
-    and "zoneminder-dbg" packages to "debian/control".
-  * rules: do not install worthless ".packlist" file.
-  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
-
-zoneminder (1.28.1-1) unstable; urgency=low
-
-  [ Dmitry Smirnov <onlyjob@debian.org> ]
-  * New upstream release [February 2015].
-  * Upload to unstable.
-  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
-    touch database or do unexpected stuff (Closes: #779254).
-    See README.Debian for details.
-  * Updated installation paths:
-    + /usr/share/zoneminder --> /usr/share/zoneminder/www
-    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
-  * Added logrotate config (Closes: #544826).
-    Thanks, Alberto Reyes.
-  * Native systemd service; "--with systemd" added to dh.
-  * Build with CMake instead of autoconf; rules clean-up.
-  * Build with all hardening.
-  * Build and install "zmupdate.pl.1" man page.
-  * Added nginx/php5-fpm configuration example.
-  * Install upstream "apache.conf" example.
-  * Described setup of Zoneminer web site and database in README.Debian.
-  * Install "/etc/zm/zm.conf" with tighter permissions.
-  * Added TODO.Debian.
-  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
-  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
-  * Standards-Version: 3.9.6; compat/debhelper to version 9.
-  * Vcs links to new git repository at collab-maint.
-  * Build-Depends:
-    + dh-systemd
-    + libgcrypt11-dev --> libgcrypt-dev
-    + libcurl4-gnutls-dev
-    + libvlc-dev
-    + policykit-1 (required by "zmsystemctl.pl")
-    - dh-autoreconf, autoconf, automake
-  * Depends:
-    - apache2
-    - libapache2-mod-php5 (moved to Suggests)
-    - libpcre3 (invalid)
-    - libmodule-load-perl (obsolete; replaced with perl-modules)
-    - libarchive-tar-perl (obsolete; replaced with perl-modules)
-    - mysql-server (moved to Recommends, Closes: #759504).
-    - php5
-    + libav-tools
-    + libjs-jquery  (replaces bundled component)
-    + libjs-mootool (replaces bundled component)
-    + libjson-any-perl (Closes: #690803).
-    + perl-modules (Closes: #745819).
-  * Recommends:
-    + apache2 | httpd
-    + mysql-server | virtual-mysql-server (Closes: #732874).
-  * Suggests:
-    + libapache2-mod-php5 | php5-fpm
-    + logrotate
-  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
-  * Removed "vendor_perl" patch (applied-upstream).
-  * New patches:
-    + cmake-fix-confpath.patch
-    + cmake-gnutls.patch
-    + cmake-nossl.patch
-    + cmake.patch
-    + format-hardening.patch
-    + pod_man_fixes.patch
-    + pod_name_fixes.patch
-    + pod_zmupdate-to-pod2usage.patch
-  * Lintianisation (incomplete):
-    - extra-license-file
-    - init.d-script-missing-lsb-description
-    - init.d-script-does-not-source-init-functions
-    - privacy-breach-generic
-    - package-contains-empty-directory
-    - manpage-has-errors-from-pod2man
-    - manpage-has-bad-whatis-entry
-    - quilt-patch-missing-description
-    - no-dep5-copyright
-  * Lintian-overrides:
-    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
-    + script-not-executable usr/share/zoneminder/www/api/*
-    + script-with-language-extension usr/bin/*.pl
-    + source-is-missing web/tools/mootools/mootools-*-yc.js
-    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
-    + source-contains-prebuilt-javascript-object
-  * Renamed files in "debian".
-  * watch: dfsg repacksuffix and dversionmangle.
-  * "debian/copyright" to Copyright-Format-1.0.
-  * Set myself as new Maintainer (Closes: #760314).
-
-  [ Vagrant Cascadian <vagrant@debian.org> ]
-  * Removed obsolete DM-Upload-Allowed flag.
-  * Update debian/watch to use tarballs from github.
-  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
-  * Use canonical alioth Vcs-Hg URL.
-  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
-  * Removed configure flag "--enable-crashtrace=no", which is no longer
-    present upstream.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
-
-zoneminder (1.26.5-3.1) experimental; urgency=low
-
-  * Non-maintainer upload.
-  * Add libav10.patch and compile against libav10 (Closes: #739461)
-
- -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
-
-zoneminder (1.26.5-3) unstable; urgency=low
-
-
-  * Previous release still didn't build on PPC - this has been corrected.
-    (Closes: #736516)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
-
-zoneminder (1.26.5-2) unstable; urgency=low
-
-  * Remove dependency on ffmpeg
-    (Closes: #721161)
-
-  * Builds again on non-x86 target architectures.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
-
-zoneminder (1.26.5-1) unstable; urgency=low
-
-  * New upstream version
-    (Closes: #694131)
-  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
-    (Closes: #731560)
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
-
-zoneminder (1.25.0-4) unstable; urgency=high
-
-  * Add CVE-2013-0232 patch
-    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
-    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
-    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
-
-zoneminder (1.25.0-3) unstable; urgency=low
-
-  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
-    hardening build flags are enabled.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
-
-zoneminder (1.25.0-2) unstable; urgency=low
-
-  [ Vagrant Cascadian ]
-  * Add a patch to disable checking for updated versions by default, as
-    upgrades should happen through package management.
-  * Use dpkg-buildflags in debian/rules to set default compiler flags.
-  * Ensure zoneminder is stopped before starting (Closes: #657407).
-
-  [ Peter Howard ]
-  * Fix postinst to add permission for table creation during upgrade
-    (Closes: #657407).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
-
-zoneminder (1.25.0-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
-    Brulebois: fix missing <unistd.h> includes.
-    (Closes: #667428)
-
- -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
-
-zoneminder (1.25.0-1) unstable; urgency=low
-
-  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
-    dropped.
-  * Fail to build if version in postinst doesn't match upstream version.
-  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
-  * debian/rules: Convert to using debhelper overrides.
-  * Set debian/compat to 7.
-  * Simplify debian/watch file.
-  * Refresh debian/patches/use_libjs-mootools.
-  * Refresh debian/patches/libv4l1-videodev.h.
-  * Remove dependencies on php4 and related packages.
-  * Remove build-dependencies on libmysqlclient14-dev and
-    libmysqlclient15-dev.
-  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
-    (Closes: #647114).
-  * Add patch to fix build by testing for C headers rather than C++ headers.
-    Thanks to Ryan Niebur. (Closes: #654230)
-  * Add a patch to fix build problems caused by API changes in libav 0.8.
-    Thanks again to Ryan Niebur. (Closes: #654230)
-
- -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
-
-zoneminder (1.24.4-1) unstable; urgency=low
-
-  [ Peter Howard ]
-  * Initial release of 1.24.4 (Closes: #634985).
-    - Fix 32/64-bit type declarations (Closes: #614404).
-  * Update patches.
-
-  [ Vagrant Cascadian ]
-  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
-    Thanks to Andreas Metzler for reporting the issue.
-    (Closes: #619813).
-  * Document adding the www-data user to the video group in README.Debian.
-    (Closes: #611324)
-  * Depend on libsys-mmap-perl to enable mapped memory support.
-    (Closes: #607331)
-  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
-  * Depend on javascript-common, to ensure that /javascript is available in
-    the web server.
-  * Set the upstream version in postinst at build time.
-  * Use dh-autoreconf to properly clean up autogenerated files during build.
-  * Add Vcs-HG to debian/control.
-  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
-
-zoneminder (1.24.2-9) unstable; urgency=low
-
-  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
-    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
-  * Update Standards-Version to 3.9.1, no changes necessary.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
-
-zoneminder (1.24.2-8) unstable; urgency=medium
-
-  [ Vagrant Cascadian ]
-  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
-    Thanks to piratebab.
-  * Add preinst script which aborts if dangerous symlinks exist.
-    (closes: #608793)
-
-  [ Peter Howard ]
-  * Added to README.Debian with info about images and events directories.
-    (closes: #608793)
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
-
-zoneminder (1.24.2-7) unstable; urgency=medium
-
-  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
-    regression causing upgrades to take inordinately long with large
-    installations (closes: #597040).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
-
-zoneminder (1.24.2-6) unstable; urgency=low
-
-  * Only remove database on purge. This requires only creating the database if
-    it doesn't already exist, and upgrading the database only if the database
-    is an older version (closes: #497107).
-
-  * Do not prompt the user on database upgrades by using the --nointeractive
-    flag when calling zmupdate.pl from postinst (closes: #595902).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
-
-zoneminder (1.24.2-5) unstable; urgency=low
-
-  [ Peter Howard ]
-  * Add zip dependency
-    (closes: #494261)
-  * Add debian/watch file
-    (closes: #545552)
-  * Use packaged libjs-mootools
-    (closes: #585590)
-  * Miscellaneous cleanups
-
-  [ Vagrant Cascadian ]
-  * Add vagrant@debian.org as uploader
-  * Update Standards-Version to 3.9.0, no changes necessary.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
-
-zoneminder (1.24.2-4.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "package removed, processes still running": apply patch to
-    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
-    mysql-related actions only when mysql is running (closes: #583648).
-
- -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
-
-zoneminder (1.24.2-4) unstable; urgency=high
-  * Update init.d to list mysql dependency
-    (closes: #583505)
-  * Change depenency from libmime-perl to libmime-tools-perl
-    (closes: #585589)
-  * Problems in changelog format fixed
-    (closes: #585592)
-  * Fix debian-rules-ignores-make-clean-error
-    (closes: #585593)
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
-
-zoneminder (1.24.2-3) unstable; urgency=high
-  * Changes symbols to build with libjpeg8
-    (closes: #565326, #568327)
-  * Note: location of all perl files should have been fixed in previous release
-    (closes: #553096)
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
-
-zoneminder (1.24.2-2) unstable; urgency=high
-
-  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
-    (closes: #551746, #553092)
-  * Fix GCC4.4 bug
-    (closes: #531717)
-  * Fix potential bug in postinst script
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
-
-zoneminder (1.24.2-1) unstable; urgency=high
-
-  * Initial release of zoneminder 1.24.2
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
-
-zoneminder (1.24.1-1) unstable; urgency=high
-
-  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
-    CVE-2008-3881, CVE-2008-3880
-    (closes: #497640)
-  * Change syslog dependency to rsyslog.
-    (closes: #526918)
-  * Add missing perl depenency.
-  * Restore patch to disable "check for updates" by default.
-  * Removed spurious '$' in init script.
-    (closes: #486064)
-  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
-    (closes: #528252)
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
-
-zoneminder (1.23.3-4) unstable; urgency=high
-
-  * update to get it building with latest unstable. Thanks to waldi@debian.org
-    (closes: #517569)
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
-
-zoneminder (1.23.3-3) unstable; urgency=high
-
-  * ffmpeg confirmed  working
-    (closes: #475145)
-  * Fix upgrade problem intrudouced in 1.23.3-1
-    (closes: #481637)
-  * Include libmime-lite-perl in dependencies
-    (closes: #486312)
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
-
-zoneminder (1.23.3-2) unstable; urgency=high
-
-  * ffmpeg finally working?
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
-
-zoneminder (1.23.3-1) unstable; urgency=high
-
-  * Initial version for 1.23.3 - security fix.
-    (closes: #479034)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
-
-zoneminder (1.23.2-2) unstable; urgency=low
-
-  * Update to init.d
-    (closes: #468856)
-  * Add dependency on logging daemon
-    (closes: #471277)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
-
-zoneminder (1.23.2-1) unstable; urgency=low
-
-  * Initial version for 1.23.2
-    (closes: #464152)
-  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
-    (closes: #454980)
-  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
-
-zoneminder (1.22.3-10) unstable; urgency=low
-
-  * Fix bug introduced in -9 where perl is put under /usr/local
-    (closes: #457507)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
-
-zoneminder (1.22.3-9) unstable; urgency=low
-
-  * Starting zoneminder via init script now  invokes "zmfix -a"
-    (closes: #481637)
-  * Change apache2-mpm-prefork dependency to apache2
-  * Temp dir for export under /var/cache/zoneminder (but linked back to
-    /usr/share/zoneminder for now)
-  * Redo use of gnutls rather than openssl for md5 hashes
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
-
-zoneminder (1.22.3-8) unstable; urgency=low
-
-  * Build now includes libpcre3
-    (closes: #437533)
-  * "Monitor Presets" patch now applied to package during build.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
-
-zoneminder (1.22.3-7) unstable; urgency=low
-
-  * Turn off debug trace and crash dump on build
-    (closes:#414857,#414891)
-  * Additional perl libraries added in dependencies
-    (closes:#416291)
-  * Change preferred PHP version from 4 to 5
- -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
-
-zoneminder (1.22.3-6) unstable; urgency=low
-
-  * Removed a similar bash only statement from zmpkg.pl
-    (closes:414882)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
-
-zoneminder (1.22.3-5) unstable; urgency=low
-
-  * Installs with "phone home" feature turned off by default, and permissions
-    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
-    (closes:415349)
-  * Removed "stupid bash-ism" on mysqld check in postinst file.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
-
-zoneminder (1.22.3-4) unstable; urgency=low
-
-  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
-    (closes: #414410)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
-
-zoneminder (1.22.3-3) unstable; urgency=low
-
-  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
-  * Also in postinstall: check and start MySQL if it's not running.
-  * init.d script now checks if zoneminder isn't running and still returns 0
-    (which helps uninstalling)
-  * Addition of php5 dependency options as well as php4.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
-
-zoneminder (1.22.3-2) unstable; urgency=low
-
-  * Added zmuser in the mysql creation; this should fix the install problem
-    for people, but needs to be cleaned up (in -3)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
-
-zoneminder (1.22.3-1) unstable; urgency=low
-
-  * Initial Version. (closes: #248393)
-  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
-  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
-    various scripts; replaced with GPL.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100
diff --git a/distros/ubuntu1204_cmake/compat b/distros/ubuntu1204_cmake/compat
deleted file mode 100644
index ec635144f..000000000
--- a/distros/ubuntu1204_cmake/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/distros/ubuntu1204_cmake/control b/distros/ubuntu1204_cmake/control
deleted file mode 100644
index fd7a53049..000000000
--- a/distros/ubuntu1204_cmake/control
+++ /dev/null
@@ -1,140 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Dmitry Smirnov <onlyjob@debian.org>
-Uploaders: Vagrant Cascadian <vagrant@debian.org>
-Build-Depends: debhelper (>= 9), python-sphinx | python3-sphinx, apache2-dev, dh-linktree
-              ,cmake
-			  ,libavcodec-dev, libavformat-dev (>= 3:0.svn20090204), libswscale-dev (>= 3:0.svn20090204), libavutil-dev, libavdevice-dev
-              ,libbz2-dev
-              ,libdate-manip-perl
-              ,libdbd-mysql-perl
-              ,libgcrypt-dev
-              ,libcurl4-gnutls-dev
-              ,libgnutls-openssl-dev
-			  ,libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, 
-              ,libmysqlclient-dev
-              ,libpcre3-dev
-              ,libphp-serialization-perl
-              ,libpolkit-gobject-1-dev
-              ,libsys-mmap-perl [!hurd-any]
-              ,libv4l-dev (>= 0.8.3) [!hurd-any]
-              ,libvlc-dev
-              ,libwww-perl
-# Unbundled (dh_linktree):
-        ,libjs-jquery
-        ,libjs-mootools
-Standards-Version: 3.9.4
-Homepage: http://www.zoneminder.com/
-Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
-
-Package: zoneminder
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-        ,javascript-common
-        ,libav-tools|ffmpeg
-        ,libdate-manip-perl
-        ,libmime-lite-perl
-        ,libmime-tools-perl
-        ,libphp-serialization-perl
-        ,libmodule-load-conditional-perl
-        ,libnet-sftp-foreign-perl
-#       ,libzoneminder-perl (= ${source:Version})
-          ,libarchive-zip-perl
-          ,libdbd-mysql-perl
-          ,libdevice-serialport-perl
-          ,libimage-info-perl
-          ,libjson-any-perl
-          ,libsys-mmap-perl [!hurd-any]
-          ,liburi-encode-perl
-          ,libwww-perl
-        ,mysql-client | virtual-mysql-client
-        ,perl-modules
-        ,php5-mysql, php5-gd
-        ,policykit-1
-        ,rsyslog | system-log-daemon
-        ,zip
-Recommends: ${misc:Recommends}
-           ,libapache2-mod-php5 | php5-fpm
-           ,mysql-server | virtual-mysql-server
-           ,zoneminder-doc (>= ${source:Version})
-Suggests: fcgiwrap, logrotate
-Description: video camera security and surveillance solution
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-#Package: libzoneminder-perl
-#Section: perl
-#Architecture: all
-#Multi-Arch: foreign
-#Depends: ${misc:Depends}, ${perl:Depends}
-#        ,libarchive-zip-perl
-#        ,libdbd-mysql-perl
-#        ,libdevice-serialport-perl
-#        ,libimage-info-perl
-#        ,libjson-any-perl
-#        ,libsys-mmap-perl [!hurd-any]
-#        ,liburi-encode-perl
-#        ,libwww-perl
-#Description: ZoneMinder Perl libraries
-# ZoneMinder is intended for use in single or multi-camera video security
-# applications, including commercial or home CCTV, theft prevention and child
-# or family member or home monitoring and other care scenarios. It
-# supports capture, analysis, recording, and monitoring of video data coming
-# from one or more video or network cameras attached to a Linux system.
-# ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
-# cameras using a variety of protocols. It is suitable for use as a home
-# video security system and for commercial or professional video security
-# and surveillance. It can also be integrated into a home automation system
-# via X.10 or other protocols.
-# .
-# This package provides ZoneMinder Perl libraries; it can be used to
-# write custom interfaces as well.
-
-Package: zoneminder-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}
-Suggests: www-browser
-Description: ZoneMinder documentation
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
- .
- This package provides ZoneMinder documentation in HTML format.
-
-Package: zoneminder-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: Zoneminder -- debugging symbols
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
- .
- This package provides debugging symbols
diff --git a/distros/ubuntu1204_cmake/copyright b/distros/ubuntu1204_cmake/copyright
deleted file mode 100644
index c48025a25..000000000
--- a/distros/ubuntu1204_cmake/copyright
+++ /dev/null
@@ -1,174 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ZoneMinder
-Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
-Source: https://github.com/ZoneMinder/ZoneMinder
-Comment:
- This package was originally debianized by matrix <matrix@cecilia>
- on Mon,  7 Mar 2005 02:07:57 -0500.
- It was re-done for submission to the Debian project by Peter Howard
- <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
-Files-Excluded:
-    web/skins/*/js/jquery-*
-    web/tools/mootools/*-yc.js
-
-Files: *
-Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
-           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
-           2014      Vincent Giovannone
-           2013      Tim Craig <timcraigNO@SPAMsonic.net>
-           2003-2008 Corey DeLasaux
-           2001-2010 Chris Kistner
-License: GPL-2+
-
-Files: distros/*
-Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
-           2014      Isaac Connor <iconnor@connortechnology.com>
-           2005      Serg Oskin
-License: GPL-2+
-
-Files: web/skins/*/js/jquery-*
-Copyright: 2010 John Resig
-           2010 The Dojo Foundation
-License: GPL-2 or Expat
-Comment:
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
- .
- Includes Sizzle.js http://sizzlejs.com/
- Released under the MIT, BSD, and GPL Licenses.
-
-Files: web/tools/mootools/*.js
-Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-           2006-2010 Valerio Proietti (http://mad4milk.net/)
-License: Expat
-
-Files: web/api/*
-Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
-License: Expat
-
-Files:
-    cmake/Modules/CheckPrototypeDefinition*.cmake
-    cmake/Modules/FindGLIB2.cmake
-    cmake/Modules/FindPolkit.cmake
-    cmake/Modules/GNUInstallDirs.cmake
-Copyright:
-    2005-2011 Kitware, Inc.
-    2010-2011 Andreas Schneider <asn@cryptomilk.org>
-    2009      Dario Freddi <drf@kde.org>
-    2008      Laurent Montel, <montel@kde.org>
-    2011      Nikita Krupen'ko <krnekit@gmail.com>
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- .
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- .
-  * The names of Kitware, Inc., the Insight Consortium, or the names of
-    any consortium members, or of any contributors, may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: cmake/Modules/FindPerlModules.cmake
-Copyright: 2012 Iowa State University
-License: Boost-1.0
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
-           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
-           2010-2012 Vagrant Cascadian <vagrant@debian.org>
-           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
-License: GPL-2+
-
-License: Expat
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
-
-License: GPL-2
- This package is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; version 2 of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/distros/ubuntu1204_cmake/patches/series b/distros/ubuntu1204_cmake/patches/series
deleted file mode 100644
index fc70f4006..000000000
--- a/distros/ubuntu1204_cmake/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch
diff --git a/distros/ubuntu1204_cmake/rules b/distros/ubuntu1204_cmake/rules
deleted file mode 100755
index b467c870f..000000000
--- a/distros/ubuntu1204_cmake/rules
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
-
-ifeq ($(DEB_BUILD_ARCH_OS),hurd)
-ARGS:= -DZM_NO_MMAP=ON
-endif
-
-%:
-	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
-            --with sphinxdoc,apache2,linktree
-
-override_dh_auto_configure:
-	dh_auto_configure -- $(ARGS)                  \
-            -DCMAKE_VERBOSE_MAKEFILE=ON                \
-            -DCMAKE_BUILD_TYPE=Release                 \
-            -DZM_CONFIG_DIR="/etc/zm"                  \
-            -DZM_RUNDIR="/var/run/zm"                  \
-            -DZM_SOCKDIR="/var/run/zm"                 \
-            -DZM_TMPDIR="/tmp/zm"                      \
-            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
-            -DZM_CONTENTDIR="/var/cache/zoneminder"
-
-override_dh_clean:
-	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
-
-build-indep:
-	#$(MAKE) -C docs text
-	$(MAKE) -C docs html
-
-MANPAGES1 = dbuild/scripts/zmupdate.pl.1
-$(MANPAGES1):
-	# generate man page(s):
-	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
-
-## reproducible build:
-LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
-BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
-override_dh_installman: $(MANPAGES1)
-	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
-	dh_installman --language=C $(MANPAGES1)
-
-override_dh_auto_install:
-	dh_auto_install --destdir=$(CURDIR)/debian/tmp
-	# remove worthless files:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
-	# remove empty directories:
-	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
-	# remove extra-license-file:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
-
-override_dh_fixperms:
-	dh_fixperms
-	## 637685
-	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-
-override_dh_installinit:
-	dh_installinit --no-start
-
-override_dh_apache2:
-	dh_apache2 --noenable
-
-override_dh_strip:
-	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
-        && dh_strip --dbg-package=zoneminder-dbg \
-        || dh_strip
-
-#%:
-#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
-#
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#            --sysconfdir=/etc/zm \
-#            --with-mysql=/usr \
-#            --with-webdir=/usr/share/zoneminder \
-#            --with-ffmpeg=/usr \
-#            --with-cgidir=/usr/lib/cgi-bin \
-#            --with-webuser=www-data \
-#            --with-webgroup=www-data \
-#            --enable-mmap=yes
diff --git a/distros/ubuntu1204_cmake/watch b/distros/ubuntu1204_cmake/watch
deleted file mode 100644
index 7ee690edb..000000000
--- a/distros/ubuntu1204_cmake/watch
+++ /dev/null
@@ -1,7 +0,0 @@
-version=3
-
-opts=\
-repacksuffix=+dfsg,\
-dversionmangle=s{\+dfsg\d*}{},\
- https://github.com/ZoneMinder/ZoneMinder/releases \
-  .*/ZoneMinder/archive/v(.*).tar.gz
diff --git a/distros/ubuntu1204_cmake/zoneminder.postinst b/distros/ubuntu1204_cmake/zoneminder.postinst
deleted file mode 100644
index e7810e468..000000000
--- a/distros/ubuntu1204_cmake/zoneminder.postinst
+++ /dev/null
@@ -1,13 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-		chown www-data:root /var/log/zm
-		chown www-data:www-data /var/lib/zm
-		if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
-		fi
-fi
-
-#DEBHELPER#
diff --git a/distros/ubuntu1504_cmake/NEWS b/distros/ubuntu1504/NEWS
similarity index 100%
rename from distros/ubuntu1504_cmake/NEWS
rename to distros/ubuntu1504/NEWS
diff --git a/distros/ubuntu1504/README.Debian b/distros/ubuntu1504/README.Debian
index b8ea413e3..8182e0678 100644
--- a/distros/ubuntu1504/README.Debian
+++ b/distros/ubuntu1504/README.Debian
@@ -1,9 +1,120 @@
-zoneminder for Debian
+Zoneminder for Debian
 ---------------------
 
-There is one manual step to get the web interface working.
-You need to link /etc/zm/apache.conf to /etc/apache2/conf.d/zoneminder.conf,
-then reload the apache config (i.e. /etc/init.d/apache2 reload)
+Initializing database
+---------------------
+
+    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+OR
+    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
+
+    echo 'grant lock tables,alter,create,index,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
+accordingly.
+
+The following command can help to ensure that zoneminder can read its
+configuration file:
+
+    chgrp -c www-data /etc/zm/zm.conf
+
+
+Upgrading database
+------------------
+
+Prior to 1.28.1 database upgrade was performed automatically.
+"zoneminder" service will refuse to start with outdated database.
+
+Assuming that database is on "localhost" then the following command can be
+used to upgrade "zm" database:
+
+    zmupdate.pl
+
+Additional permissions may be required to perform upgrade:
+
+    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
+
+The following command prints the current version of zoneminder database:
+
+    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
+    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
+
+
+Enabling service
+----------------
+
+By default Zoneminder service is not starting automatically and need to be
+manually activated once database is configured:
+
+On systemd:
+
+    sudo systemctl enable zoneminder.service
+
+On SysV:
+
+    sudo update-rc.d zoneminder enable
+
+
+Web server set-up
+-----------------
+
+There are few manual steps to get the web interface working:
+
+## Apache2
+
+Apache can be configured as folder "/zm" using sample .conf:
+
+    sudo a2enconf zoneminder
+
+Alternatively Apache web site configuration template can be used to setup
+zoneminder as "http://zoneminder":
+
+    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
+    sudo a2ensite zoneminder.conf
+
+Common configuration steps for Apache2:
+
+    sudo a2enmod cgi
+    sudo service apache2 reload
+
+
+## nginx / fcgiwrap
+
+Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
+for binary "cgi-bin" applications:
+
+    sudo apt-get install php5-fpm fcgiwrap
+
+To enable a URL alias that makes Zoneminder available from
+
+    http://yourserver/zm
+
+the following line is to be added to "server" section of a web site
+configuration:
+
+    include /usr/share/doc/zoneminder/examples/nginx.conf;
+
+For "default" web site it would be sufficient to include the above
+statement to the file
+
+    /etc/nginx/sites-enabled/default
+
+To avoid problems with feeds from multiple cameras "fcgiwrap" should be
+configured to start at least as many processes as there are cameras.
+It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
+Systemd users may be affected by the following bug:
+
+    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
+
+
+## Note:
+
+When Zoneminder web site is running it may be necessary to set
+Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
+site configuration.
+
 
 Changing the location for images and events
 -------------------------------------------
@@ -33,19 +144,17 @@ These lines in fstab could allow you to bind-mount an alternate location
          /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
          /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
 
-
-
  -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
 
 Access to /dev/video*
 ---------------------
 
-For cameras which require access to /dev/video*, zoneminder may need the 
+For cameras which require access to /dev/video*, zoneminder may need the
 www-data user added to the video group in order to see those cameras:
 
   adduser www-data video
 
-Note that all web applications running on the zoneminder server will then have 
+Note that all web applications running on the zoneminder server will then have
 access to all video devices on the system.
 
  -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu1504_cmake/TODO.Debian b/distros/ubuntu1504/TODO.Debian
similarity index 100%
rename from distros/ubuntu1504_cmake/TODO.Debian
rename to distros/ubuntu1504/TODO.Debian
diff --git a/distros/ubuntu1504/apache.conf b/distros/ubuntu1504/apache.conf
deleted file mode 100644
index 965c67f86..000000000
--- a/distros/ubuntu1504/apache.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-Alias /zm /usr/share/zoneminder/www
-
-<Directory /usr/share/zoneminder/www>
-  php_flag register_globals off
-  Options Indexes FollowSymLinks
-  <IfModule mod_dir.c>
-    DirectoryIndex index.php
-  </IfModule>
-</Directory>
diff --git a/distros/ubuntu1504/changelog b/distros/ubuntu1504/changelog
index 9dea00498..74cf1d0b8 100644
--- a/distros/ubuntu1504/changelog
+++ b/distros/ubuntu1504/changelog
@@ -1,94 +1,573 @@
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015071501) vivid; urgency=medium
+zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
 
-  * fix for issue #586 and #932
-  * fix for db not being upgraded
-  * version upgraded to .100
+  * include api, switch to cmake build
 
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 15 Jul 2015 11:56:28 -0400
+ -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
 
-zoneminder (1.28.1+1-trusty-SNAPSHOT2015030201) trusty; urgency=medium
 
-  * maybe fix for RTSP Basic Auth
-  * Also remove dependency on netpbm
+zoneminder (1.28.1-8) unstable; urgency=medium
 
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 02 Mar 2015 11:25:59 -0500
+  * Patchworks:
+    + New upstream "980-fix-image-size.patch".
+    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
+  * postinst: set "root" as group owner for "/var/log/zm" to silence
+    logrotate warnings.
+  * Minor correction to README.Debian.
 
-zoneminder (1.28.1+1-utopic-SNAPSHOT2015022301) utopic; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
 
-  * Big merge of onvif support and some fixes.
+zoneminder (1.28.1-7) unstable; urgency=medium
 
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 23 Feb 2015 19:45:45 -0500
+  * Build-Depends += "cakephp (<< 3.0.0~)";
+    Zoneminder is not compatible with latest CakePHP.
+  * Handle conffile removal from maintscript.
+  * rules: build man pages reproducibly.
+  * gbp.conf: renamed old style config section [git-dch] to [dch].
+  * README
+    + added instructions to update owner of the "/etc/zm/zm.conf"
+      (Closes: #789327).
+    + zmupdate.pl needs CREATE rights.
+    + added note about required number of "fcgiwrap" workers.
+  * New upstream patch: "zmtrigger-plus.patch".
 
-zoneminder (1.28.0+1-trusty-SNAPSHOT2015021201) trusty; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
 
-  * add mysql-client-5.6 as a dependency instaed of mysql-client.  
+zoneminder (1.28.1-6) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 13 Feb 2015 09:35:13 -0500
+  * New "zoneminder-doc" and "zoneminder-dbg" packages.
 
-zoneminder (1.28.0+1-trusty-SNAPSHOT2015011101) trusty; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
 
-  * small changes
+zoneminder (1.28.1-5) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 12 Dec 2014 16:38:36 -0500
+  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
+    Let dh_installinit do the job. Thanks, Andrew Bauer.
+  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
+  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
+  * Build-Depends:
+    + dh-linktree
+    + cakephp (>= 2.6.3)
+    + libjs-jquery
+    + libjs-mootools
+  * Depends:
+    - libjs-jquery
+    - libjs-mootools
+  * Build-time replace bundled CakePHP with system one using "dh-linktree".
+  * Use "dh-linktree" to handle mootools and jquery symlinks.
 
-zoneminder (1.28.0+1-utopic-SNAPSHOT2014112001) utopic; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
 
-  * Various fixes and developments since 1.28.0.  Includes Digest-Auth for HTTP and better for RTSP
+zoneminder (1.28.1-4) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 20 Nov 2014 10:57:57 -0500
+  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
+  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
+  * New patch to change default date format to region-neutral ISO notation
+    with time zone.
+  * Build sphinx documentation:
+    + Install "zoneminder.1" man page.
+    + Build-Depends += "python-sphinx | python3-sphinx"
+    + Added commented "zoneminder-doc" package.
+    + Added "docs.patch" to unlink distro-specific installation docs.
+  * rules:
+    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
+    + remove mistakengly installed Perl module templates.
+  * Updated startup scripts to create ZM_TMPDIR.
+  * Hurd improvements:
+    + New patch to add PATH_MAX definitions.
+    + Build without MMAP support on Hurd.
+    + libsys-mmap-perl [!hurd-any].
 
-zoneminder (1.28.0-trusty) trusty; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
 
-  * Release
+zoneminder (1.28.1-3) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 17 Oct 2014 09:25:55 -0400
+  * Updated Apache2 and nginx configuration templates to support CGI.
+  * Updated README.Debian to document cgi-bin setup.
+  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
+  * Added "apache2.patch" to correct Apache2 site configuration example.
+  * control: Suggests += "fcgiwrap".
+  * rules: added dh_systemd overrides to prevent automatic service
+    activation and start.
+  * Added note about manual service activation to README.Debian
+    (Closes: #781733).
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014101401) trusty; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
 
-  * Several PR merges in big push for 1.28.0
+zoneminder (1.28.1-2) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Tue, 14 Oct 2014 09:28:29 -0400
+  * Removed word "Linux" from short package description.
+  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
+  * Added run-time Perl Depends:
+     + libdbd-mysql-perl
+     + libimage-info-perl
+     + libmodule-load-conditional-perl
+     + libnet-sftp-foreign-perl
+     + liburi-encode-perl
+  * Prepare for package split: added commented "libzoneminder-perl"
+    and "zoneminder-dbg" packages to "debian/control".
+  * rules: do not install worthless ".packlist" file.
+  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014092601) trusty; urgency=medium
+ -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
 
-  * style updates and db fixes for database logging filters
+zoneminder (1.28.1-1) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Fri, 26 Sep 2014 14:44:45 -0400
+  [ Dmitry Smirnov <onlyjob@debian.org> ]
+  * New upstream release [February 2015].
+  * Upload to unstable.
+  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
+    touch database or do unexpected stuff (Closes: #779254).
+    See README.Debian for details.
+  * Updated installation paths:
+    + /usr/share/zoneminder --> /usr/share/zoneminder/www
+    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
+  * Added logrotate config (Closes: #544826).
+    Thanks, Alberto Reyes.
+  * Native systemd service; "--with systemd" added to dh.
+  * Build with CMake instead of autoconf; rules clean-up.
+  * Build with all hardening.
+  * Build and install "zmupdate.pl.1" man page.
+  * Added nginx/php5-fpm configuration example.
+  * Install upstream "apache.conf" example.
+  * Described setup of Zoneminer web site and database in README.Debian.
+  * Install "/etc/zm/zm.conf" with tighter permissions.
+  * Added TODO.Debian.
+  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
+  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
+  * Standards-Version: 3.9.6; compat/debhelper to version 9.
+  * Vcs links to new git repository at collab-maint.
+  * Build-Depends:
+    + dh-systemd
+    + libgcrypt11-dev --> libgcrypt-dev
+    + libcurl4-gnutls-dev
+    + libvlc-dev
+    + policykit-1 (required by "zmsystemctl.pl")
+    - dh-autoreconf, autoconf, automake
+  * Depends:
+    - apache2
+    - libapache2-mod-php5 (moved to Suggests)
+    - libpcre3 (invalid)
+    - libmodule-load-perl (obsolete; replaced with perl-modules)
+    - libarchive-tar-perl (obsolete; replaced with perl-modules)
+    - mysql-server (moved to Recommends, Closes: #759504).
+    - php5
+    + libav-tools
+    + libjs-jquery  (replaces bundled component)
+    + libjs-mootool (replaces bundled component)
+    + libjson-any-perl (Closes: #690803).
+    + perl-modules (Closes: #745819).
+  * Recommends:
+    + apache2 | httpd
+    + mysql-server | virtual-mysql-server (Closes: #732874).
+  * Suggests:
+    + libapache2-mod-php5 | php5-fpm
+    + logrotate
+  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
+  * Removed "vendor_perl" patch (applied-upstream).
+  * New patches:
+    + cmake-fix-confpath.patch
+    + cmake-gnutls.patch
+    + cmake-nossl.patch
+    + cmake.patch
+    + format-hardening.patch
+    + pod_man_fixes.patch
+    + pod_name_fixes.patch
+    + pod_zmupdate-to-pod2usage.patch
+  * Lintianisation (incomplete):
+    - extra-license-file
+    - init.d-script-missing-lsb-description
+    - init.d-script-does-not-source-init-functions
+    - privacy-breach-generic
+    - package-contains-empty-directory
+    - manpage-has-errors-from-pod2man
+    - manpage-has-bad-whatis-entry
+    - quilt-patch-missing-description
+    - no-dep5-copyright
+  * Lintian-overrides:
+    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
+    + script-not-executable usr/share/zoneminder/www/api/*
+    + script-with-language-extension usr/bin/*.pl
+    + source-is-missing web/tools/mootools/mootools-*-yc.js
+    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
+    + source-contains-prebuilt-javascript-object
+  * Renamed files in "debian".
+  * watch: dfsg repacksuffix and dversionmangle.
+  * "debian/copyright" to Copyright-Format-1.0.
+  * Set myself as new Maintainer (Closes: #760314).
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014090801) trusty; urgency=medium
+  [ Vagrant Cascadian <vagrant@debian.org> ]
+  * Removed obsolete DM-Upload-Allowed flag.
+  * Update debian/watch to use tarballs from github.
+  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
+  * Use canonical alioth Vcs-Hg URL.
+  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
+  * Removed configure flag "--enable-crashtrace=no", which is no longer
+    present upstream.
 
-  * several segfault fixes for local cameras
+ -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
 
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 08 Sep 2014 16:56:57 -0400
+zoneminder (1.26.5-3.1) experimental; urgency=low
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014090701) trusty; urgency=medium
+  * Non-maintainer upload.
+  * Add libav10.patch and compile against libav10 (Closes: #739461)
 
-  * Fix segfaults for local cameras, also now includes the systemd support patch
+ -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
 
- -- Isaac Connor <iconnor@connortechnology.com>  Sun, 07 Sep 2014 17:19:01 -0400
+zoneminder (1.26.5-3) unstable; urgency=low
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014082102) trusty; urgency=medium
 
-  * Fix UI inputs for v4l multibuffer and captures per frame
+  * Previous release still didn't build on PPC - this has been corrected.
+    (Closes: #736516)
 
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 12:03:31 -0400
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
 
-zoneminder (1.27.99+1-trusty-SNAPSHOT2014082101) trusty; urgency=medium
+zoneminder (1.26.5-2) unstable; urgency=low
 
-  * fall back to Config table values for V4l MultiBUffer and Captures Per Frame
-  * add mention of monitor page settings for thse in the config table
+  * Remove dependency on ffmpeg
+    (Closes: #721161)
 
- -- Isaac Connor <iconnor@connortechnology.com>  Thu, 21 Aug 2014 10:04:46 -0400
+  * Builds again on non-x86 target architectures.
 
-zoneminder (1.27.99+1-precise-SNAPSHOT2014080601) precise; urgency=medium
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
 
-  * improve error messages
-  * Make zmupdate re-run the most recent patch so that people running the daily builds get their db updates
+zoneminder (1.26.5-1) unstable; urgency=low
 
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 06 Aug 2014 20:20:20 -0400
+  * New upstream version
+    (Closes: #694131)
+  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
+    (Closes: #731560)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
 
-zoneminder (1.27.0+1-trusty-v4ltomonitor-1) trusty; urgency=high
+zoneminder (1.25.0-4) unstable; urgency=high
 
-  * Snapshot release - 
+  * Add CVE-2013-0232 patch
+    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
+    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
+    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
 
- -- Isaac Connor <iconnor@connortechnology.com>  Wed, 09 Jul 2014 21:35:29 -0400
+ -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
+
+zoneminder (1.25.0-3) unstable; urgency=low
+
+  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
+    hardening build flags are enabled.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
+
+zoneminder (1.25.0-2) unstable; urgency=low
+
+  [ Vagrant Cascadian ]
+  * Add a patch to disable checking for updated versions by default, as
+    upgrades should happen through package management.
+  * Use dpkg-buildflags in debian/rules to set default compiler flags.
+  * Ensure zoneminder is stopped before starting (Closes: #657407).
+
+  [ Peter Howard ]
+  * Fix postinst to add permission for table creation during upgrade
+    (Closes: #657407).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
+
+zoneminder (1.25.0-1.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
+    Brulebois: fix missing <unistd.h> includes.
+    (Closes: #667428)
+
+ -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
+
+zoneminder (1.25.0-1) unstable; urgency=low
+
+  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
+    dropped.
+  * Fail to build if version in postinst doesn't match upstream version.
+  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
+  * debian/rules: Convert to using debhelper overrides.
+  * Set debian/compat to 7.
+  * Simplify debian/watch file.
+  * Refresh debian/patches/use_libjs-mootools.
+  * Refresh debian/patches/libv4l1-videodev.h.
+  * Remove dependencies on php4 and related packages.
+  * Remove build-dependencies on libmysqlclient14-dev and
+    libmysqlclient15-dev.
+  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
+    (Closes: #647114).
+  * Add patch to fix build by testing for C headers rather than C++ headers.
+    Thanks to Ryan Niebur. (Closes: #654230)
+  * Add a patch to fix build problems caused by API changes in libav 0.8.
+    Thanks again to Ryan Niebur. (Closes: #654230)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
+
+zoneminder (1.24.4-1) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Initial release of 1.24.4 (Closes: #634985).
+    - Fix 32/64-bit type declarations (Closes: #614404).
+  * Update patches.
+
+  [ Vagrant Cascadian ]
+  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
+    Thanks to Andreas Metzler for reporting the issue.
+    (Closes: #619813).
+  * Document adding the www-data user to the video group in README.Debian.
+    (Closes: #611324)
+  * Depend on libsys-mmap-perl to enable mapped memory support.
+    (Closes: #607331)
+  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
+  * Depend on javascript-common, to ensure that /javascript is available in
+    the web server.
+  * Set the upstream version in postinst at build time.
+  * Use dh-autoreconf to properly clean up autogenerated files during build.
+  * Add Vcs-HG to debian/control.
+  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
+
+zoneminder (1.24.2-9) unstable; urgency=low
+
+  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
+    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
+  * Update Standards-Version to 3.9.1, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
+
+zoneminder (1.24.2-8) unstable; urgency=medium
+
+  [ Vagrant Cascadian ]
+  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
+    Thanks to piratebab.
+  * Add preinst script which aborts if dangerous symlinks exist.
+    (closes: #608793)
+
+  [ Peter Howard ]
+  * Added to README.Debian with info about images and events directories.
+    (closes: #608793)
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
+
+zoneminder (1.24.2-7) unstable; urgency=medium
+
+  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
+    regression causing upgrades to take inordinately long with large
+    installations (closes: #597040).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
+
+zoneminder (1.24.2-6) unstable; urgency=low
+
+  * Only remove database on purge. This requires only creating the database if
+    it doesn't already exist, and upgrading the database only if the database
+    is an older version (closes: #497107).
+
+  * Do not prompt the user on database upgrades by using the --nointeractive
+    flag when calling zmupdate.pl from postinst (closes: #595902).
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
+
+zoneminder (1.24.2-5) unstable; urgency=low
+
+  [ Peter Howard ]
+  * Add zip dependency
+    (closes: #494261)
+  * Add debian/watch file
+    (closes: #545552)
+  * Use packaged libjs-mootools
+    (closes: #585590)
+  * Miscellaneous cleanups
+
+  [ Vagrant Cascadian ]
+  * Add vagrant@debian.org as uploader
+  * Update Standards-Version to 3.9.0, no changes necessary.
+
+ -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
+
+zoneminder (1.24.2-4.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Fix "package removed, processes still running": apply patch to
+    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
+    mysql-related actions only when mysql is running (closes: #583648).
+
+ -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
+
+zoneminder (1.24.2-4) unstable; urgency=high
+  * Update init.d to list mysql dependency
+    (closes: #583505)
+  * Change depenency from libmime-perl to libmime-tools-perl
+    (closes: #585589)
+  * Problems in changelog format fixed
+    (closes: #585592)
+  * Fix debian-rules-ignores-make-clean-error
+    (closes: #585593)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
+
+zoneminder (1.24.2-3) unstable; urgency=high
+  * Changes symbols to build with libjpeg8
+    (closes: #565326, #568327)
+  * Note: location of all perl files should have been fixed in previous release
+    (closes: #553096)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
+
+zoneminder (1.24.2-2) unstable; urgency=high
+
+  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
+    (closes: #551746, #553092)
+  * Fix GCC4.4 bug
+    (closes: #531717)
+  * Fix potential bug in postinst script
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
+
+zoneminder (1.24.2-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.2
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
+
+zoneminder (1.24.1-1) unstable; urgency=high
+
+  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
+    CVE-2008-3881, CVE-2008-3880
+    (closes: #497640)
+  * Change syslog dependency to rsyslog.
+    (closes: #526918)
+  * Add missing perl depenency.
+  * Restore patch to disable "check for updates" by default.
+  * Removed spurious '$' in init script.
+    (closes: #486064)
+  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
+    (closes: #528252)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
+
+zoneminder (1.23.3-4) unstable; urgency=high
+
+  * update to get it building with latest unstable. Thanks to waldi@debian.org
+    (closes: #517569)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
+
+zoneminder (1.23.3-3) unstable; urgency=high
+
+  * ffmpeg confirmed  working
+    (closes: #475145)
+  * Fix upgrade problem intrudouced in 1.23.3-1
+    (closes: #481637)
+  * Include libmime-lite-perl in dependencies
+    (closes: #486312)
+ -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
+
+zoneminder (1.23.3-2) unstable; urgency=high
+
+  * ffmpeg finally working?
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
+
+zoneminder (1.23.3-1) unstable; urgency=high
+
+  * Initial version for 1.23.3 - security fix.
+    (closes: #479034)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-2) unstable; urgency=low
+
+  * Update to init.d
+    (closes: #468856)
+  * Add dependency on logging daemon
+    (closes: #471277)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
+
+zoneminder (1.23.2-1) unstable; urgency=low
+
+  * Initial version for 1.23.2
+    (closes: #464152)
+  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
+    (closes: #454980)
+  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
+
+zoneminder (1.22.3-10) unstable; urgency=low
+
+  * Fix bug introduced in -9 where perl is put under /usr/local
+    (closes: #457507)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-9) unstable; urgency=low
+
+  * Starting zoneminder via init script now  invokes "zmfix -a"
+    (closes: #481637)
+  * Change apache2-mpm-prefork dependency to apache2
+  * Temp dir for export under /var/cache/zoneminder (but linked back to
+    /usr/share/zoneminder for now)
+  * Redo use of gnutls rather than openssl for md5 hashes
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
+
+zoneminder (1.22.3-8) unstable; urgency=low
+
+  * Build now includes libpcre3
+    (closes: #437533)
+  * "Monitor Presets" patch now applied to package during build.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
+
+zoneminder (1.22.3-7) unstable; urgency=low
+
+  * Turn off debug trace and crash dump on build
+    (closes:#414857,#414891)
+  * Additional perl libraries added in dependencies
+    (closes:#416291)
+  * Change preferred PHP version from 4 to 5
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
+
+zoneminder (1.22.3-6) unstable; urgency=low
+
+  * Removed a similar bash only statement from zmpkg.pl
+    (closes:414882)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
+
+zoneminder (1.22.3-5) unstable; urgency=low
+
+  * Installs with "phone home" feature turned off by default, and permissions
+    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
+    (closes:415349)
+  * Removed "stupid bash-ism" on mysqld check in postinst file.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
+
+zoneminder (1.22.3-4) unstable; urgency=low
+
+  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
+    (closes: #414410)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
+
+zoneminder (1.22.3-3) unstable; urgency=low
+
+  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
+  * Also in postinstall: check and start MySQL if it's not running.
+  * init.d script now checks if zoneminder isn't running and still returns 0
+    (which helps uninstalling)
+  * Addition of php5 dependency options as well as php4.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
+
+zoneminder (1.22.3-2) unstable; urgency=low
+
+  * Added zmuser in the mysql creation; this should fix the install problem
+    for people, but needs to be cleaned up (in -3)
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
+
+zoneminder (1.22.3-1) unstable; urgency=low
+
+  * Initial Version. (closes: #248393)
+  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
+  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
+    various scripts; replaced with GPL.
+
+ -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100
diff --git a/distros/ubuntu1504_cmake/clean b/distros/ubuntu1504/clean
similarity index 100%
rename from distros/ubuntu1504_cmake/clean
rename to distros/ubuntu1504/clean
diff --git a/distros/ubuntu1504_cmake/conf/apache2/zoneminder.conf b/distros/ubuntu1504/conf/apache2/zoneminder.conf
similarity index 100%
rename from distros/ubuntu1504_cmake/conf/apache2/zoneminder.conf
rename to distros/ubuntu1504/conf/apache2/zoneminder.conf
diff --git a/distros/ubuntu1504/control b/distros/ubuntu1504/control
index 8fa3f3596..c1b7d958f 100644
--- a/distros/ubuntu1504/control
+++ b/distros/ubuntu1504/control
@@ -1,45 +1,72 @@
 Source: zoneminder
 Section: net
 Priority: optional
-Maintainer: Isaac Connor <iconnor@connortechnology.com>
-Build-Depends: debhelper (>= 9), dh-systemd (>= 1.5), autoconf, automake, quilt, libtool, dh-autoreconf
-             , libphp-serialization-perl, libgnutls-dev
-             , libmysqlclient-dev | libmariadbclient-dev, libdbd-mysql-perl
-             , libdate-manip-perl, libwww-perl
-             , libjpeg8-dev|libjpeg9-dev|libjpeg62-turbo-dev, libpcre3-dev
-             , libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
-             , libv4l-dev (>= 0.8.3), libbz2-dev
-             , libsys-mmap-perl
-             , libdevice-serialport-perl, libpcre3, libarchive-zip-perl, libmime-lite-perl
-             , libvlccore-dev, libvlc-dev
-             , libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev
-             , libgcrypt11-dev, libpolkit-gobject-1-dev
+Maintainer: Dmitry Smirnov <onlyjob@debian.org>
+Uploaders: Vagrant Cascadian <vagrant@debian.org>
+Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
+              ,cmake
+              ,libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
+              ,libbz2-dev
+              ,libgcrypt-dev
+              ,libcurl4-gnutls-dev
+              ,libgnutls-openssl-dev
+              ,libjpeg-dev
+              ,libmysqlclient-dev
+              ,libpcre3-dev
+              ,libpolkit-gobject-1-dev
+              ,libv4l-dev (>= 0.8.3) [!hurd-any]
+              ,libvlc-dev
+              ,libdate-manip-perl
+              ,libdbd-mysql-perl
+              ,libphp-serialization-perl
+              ,libsys-mmap-perl [!hurd-any]
+              ,libwww-perl
+# Unbundled (dh_linktree):
+        ,libjs-jquery
+        ,libjs-mootools
 Standards-Version: 3.9.6
 Homepage: http://www.zoneminder.com/
+Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
+Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
 
 Package: zoneminder
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}, apache2, libapache2-mod-php5 | libapache2-mod-fcgid, php5, php5-mysql|php5-mysqlnd, libphp-serialization-perl, libdate-manip-perl, libmime-lite-perl, libmime-tools-perl, mariadb-client|mysql-client|mysql-client-5.6, libwww-perl, libarchive-tar-perl, libarchive-zip-perl, libdevice-serialport-perl, libpcre3, ffmpeg, rsyslog | system-log-daemon, libmodule-load-perl, libsys-mmap-perl, libjson-any-perl, libavdevice-ffmpeg56, libjpeg8|libjpeg9|libjpeg62-turbo, zip, libnet-sftp-foreign-perl, libio-pty-perl, libexpect-perl, libvlccore5 | libvlccore7 | libvlccore8, libvlc5, libcurl4-gnutls-dev | libcurl4-nss-dev | libcurl4-openssl-dev, libpolkit-gobject-1-0, liburi-encode-perl, php5-gd
-Recommends: mysql-server|mariadb-server
-Description: Video camera security and surveillance solution
- ZoneMinder is intended for use in single or multi-camera video security 
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-Package: zoneminder-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: Debugging symbols for zoneminder.
- ZoneMinder is a video camera security and surveillance solution.
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
+        ,javascript-common
+        ,libav-tools
+        ,libdate-manip-perl
+        ,libdbd-mysql-perl
+        ,libmime-lite-perl
+        ,libmime-tools-perl
+        ,libphp-serialization-perl
+        ,libmodule-load-conditional-perl
+        ,libnet-sftp-foreign-perl
+          ,libarchive-zip-perl
+          ,libdbd-mysql-perl
+          ,libdevice-serialport-perl
+          ,libimage-info-perl
+          ,libjson-any-perl
+          ,libsys-mmap-perl [!hurd-any]
+          ,liburi-encode-perl
+          ,libwww-perl
+          ,libdata-dump-perl
+          ,libclass-std-fast-perl
+          ,libsoap-wsdl-perl
+          ,libio-socket-multicast-perl
+          ,libdigest-sha-perl
+          ,libsys-cpu-perl, libsys-meminfo-perl
+        ,mysql-client | virtual-mysql-client
+        ,perl-modules
+        ,php5-mysql, php5-gd
+        ,policykit-1
+        ,rsyslog | system-log-daemon
+        ,zip
+Recommends: ${misc:Recommends}
+           ,libapache2-mod-php5 | php5-fpm
+           ,mysql-server | virtual-mysql-server
+           ,zoneminder-doc (>= ${source:Version})
+Suggests: fcgiwrap, logrotate
+Description: video camera security and surveillance solution
  ZoneMinder is intended for use in single or multi-camera video security
  applications, including commercial or home CCTV, theft prevention and child
  or family member or home monitoring and other care scenarios. It
@@ -50,3 +77,70 @@ Description: Debugging symbols for zoneminder.
  video security system and for commercial or professional video security
  and surveillance. It can also be integrated into a home automation system
  via X.10 or other protocols.
+
+#Package: libzoneminder-perl
+#Section: perl
+#Architecture: all
+#Multi-Arch: foreign
+#Depends: ${misc:Depends}, ${perl:Depends}
+#        ,libarchive-zip-perl
+#        ,libdbd-mysql-perl
+#        ,libdevice-serialport-perl
+#        ,libimage-info-perl
+#        ,libjson-any-perl
+#        ,libsys-mmap-perl [!hurd-any]
+#        ,liburi-encode-perl
+#        ,libwww-perl
+#Description: ZoneMinder Perl libraries
+# ZoneMinder is intended for use in single or multi-camera video security
+# applications, including commercial or home CCTV, theft prevention and child
+# or family member or home monitoring and other care scenarios. It
+# supports capture, analysis, recording, and monitoring of video data coming
+# from one or more video or network cameras attached to a Linux system.
+# ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+# cameras using a variety of protocols. It is suitable for use as a home
+# video security system and for commercial or professional video security
+# and surveillance. It can also be integrated into a home automation system
+# via X.10 or other protocols.
+# .
+# This package provides ZoneMinder Perl libraries; it can be used to
+# write custom interfaces as well.
+
+Package: zoneminder-doc
+Section: doc
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
+Suggests: www-browser
+Description: ZoneMinder documentation
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides ZoneMinder documentation in HTML format.
+
+Package: zoneminder-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
+Description: Zoneminder -- debugging symbols
+ ZoneMinder is intended for use in single or multi-camera video security
+ applications, including commercial or home CCTV, theft prevention and child
+ or family member or home monitoring and other care scenarios. It
+ supports capture, analysis, recording, and monitoring of video data coming
+ from one or more video or network cameras attached to a Linux system.
+ ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
+ cameras using a variety of protocols. It is suitable for use as a home
+ video security system and for commercial or professional video security
+ and surveillance. It can also be integrated into a home automation system
+ via X.10 or other protocols.
+ .
+ This package provides debugging symbols
diff --git a/distros/ubuntu1504/copyright b/distros/ubuntu1504/copyright
index a177502a0..c48025a25 100644
--- a/distros/ubuntu1504/copyright
+++ b/distros/ubuntu1504/copyright
@@ -1,22 +1,174 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: ZoneMinder
+Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
+Source: https://github.com/ZoneMinder/ZoneMinder
+Comment:
+ This package was originally debianized by matrix <matrix@cecilia>
+ on Mon,  7 Mar 2005 02:07:57 -0500.
+ It was re-done for submission to the Debian project by Peter Howard
+ <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
+Files-Excluded:
+    web/skins/*/js/jquery-*
+    web/tools/mootools/*-yc.js
+
+Files: *
+Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
+           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
+           2014      Vincent Giovannone
+           2013      Tim Craig <timcraigNO@SPAMsonic.net>
+           2003-2008 Corey DeLasaux
+           2001-2010 Chris Kistner
+License: GPL-2+
+
+Files: distros/*
+Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+           2014      Isaac Connor <iconnor@connortechnology.com>
+           2005      Serg Oskin
+License: GPL-2+
+
+Files: web/skins/*/js/jquery-*
+Copyright: 2010 John Resig
+           2010 The Dojo Foundation
+License: GPL-2 or Expat
+Comment:
+ Dual licensed under the MIT or GPL Version 2 licenses.
+ http://jquery.org/license
+ .
+ Includes Sizzle.js http://sizzlejs.com/
+ Released under the MIT, BSD, and GPL Licenses.
+
+Files: web/tools/mootools/*.js
+Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
+           2006-2010 Valerio Proietti (http://mad4milk.net/)
+License: Expat
+
+Files: web/api/*
+Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
+License: Expat
+
+Files:
+    cmake/Modules/CheckPrototypeDefinition*.cmake
+    cmake/Modules/FindGLIB2.cmake
+    cmake/Modules/FindPolkit.cmake
+    cmake/Modules/GNUInstallDirs.cmake
 Copyright:
+    2005-2011 Kitware, Inc.
+    2010-2011 Andreas Schneider <asn@cryptomilk.org>
+    2009      Dario Freddi <drf@kde.org>
+    2008      Laurent Montel, <montel@kde.org>
+    2011      Nikita Krupen'ko <krnekit@gmail.com>
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions are
+ met:
+ .
+  * Redistributions of source code must retain the above copyright notice,
+    this list of conditions and the following disclaimer.
+ .
+  * Redistributions in binary form must reproduce the above copyright notice,
+    this list of conditions and the following disclaimer in the documentation
+    and/or other materials provided with the distribution.
+ .
+  * The names of Kitware, Inc., the Insight Consortium, or the names of
+    any consortium members, or of any contributors, may not be used to
+    endorse or promote products derived from this software without
+    specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
+ AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+ CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+ OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-Copyright 2002 Philip Coombes <philip.coombes@zoneminder.com>
+Files: cmake/Modules/FindPerlModules.cmake
+Copyright: 2012 Iowa State University
+License: Boost-1.0
+ Boost Software License - Version 1.0 - August 17th, 2003
+ .
+ Permission is hereby granted, free of charge, to any person or organization
+ obtaining a copy of the software and accompanying documentation covered by
+ this license (the "Software") to use, reproduce, display, distribute,
+ execute, and transmit the Software, and to prepare derivative works of the
+ Software, and to permit third-parties to whom the Software is furnished to
+ do so, all subject to the following:
+ .
+ The copyright notices in the Software and this entire statement, including
+ the above license grant, this restriction and the following disclaimer,
+ must be included in all copies of the Software, in whole or in part, and
+ all derivative works of the Software, unless such copies or derivative
+ works are solely in the form of machine-executable object code generated by
+ a source language processor.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
+ SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
+ FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
+ ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ DEALINGS IN THE SOFTWARE.
 
-License:
+Files: debian/*
+Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
+           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
+           2010-2012 Vagrant Cascadian <vagrant@debian.org>
+           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
+License: GPL-2+
 
-This package is free software; you can redistribute it and/or modify it
-under the terms of the GNU General Public License as published by the
-Free Software Foundation; either version 2 of the License, or (at your
-option) any later version.
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+  .
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+  THE SOFTWARE.
 
-This package is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-General Public License for more details.
+License: GPL-2+
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; either version 2 of the License, or (at your
+ option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
 
-You should have received a copy of the GNU General Public
-License along with this package; if not, write to the Free Software
-Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
-
-On Debian GNU/Linux systems, the text of the GPL can be found in
-/usr/share/common-licenses/GPL.
+License: GPL-2
+ This package is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by the
+ Free Software Foundation; version 2 of the License.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public
+ License along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
+ .
+ The complete text of the GNU General Public License version 2
+ can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/distros/ubuntu1504/dirs b/distros/ubuntu1504/dirs
deleted file mode 100644
index 4178482c1..000000000
--- a/distros/ubuntu1504/dirs
+++ /dev/null
@@ -1,6 +0,0 @@
-var/log/zm
-var/lib/zm
-var/cache/zoneminder/events
-var/cache/zoneminder/images
-var/cache/zoneminder/temp
-usr/share/zoneminder/db
diff --git a/distros/ubuntu1504/docs b/distros/ubuntu1504/docs
deleted file mode 100644
index b43bf86b5..000000000
--- a/distros/ubuntu1504/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/distros/ubuntu1504_cmake/examples/nginx.conf b/distros/ubuntu1504/examples/nginx.conf
similarity index 100%
rename from distros/ubuntu1504_cmake/examples/nginx.conf
rename to distros/ubuntu1504/examples/nginx.conf
diff --git a/distros/ubuntu1504_cmake/gbp.conf b/distros/ubuntu1504/gbp.conf
similarity index 100%
rename from distros/ubuntu1504_cmake/gbp.conf
rename to distros/ubuntu1504/gbp.conf
diff --git a/distros/ubuntu1504/install b/distros/ubuntu1504/install
deleted file mode 100644
index 4b0009cea..000000000
--- a/distros/ubuntu1504/install
+++ /dev/null
@@ -1,12 +0,0 @@
-usr/bin
-usr/lib/cgi-bin
-usr/share/man
-usr/share/perl5/ZoneMinder
-usr/share/perl5/ZoneMinder.pm
-usr/share/polkit-1/actions
-usr/share/polkit-1/rules.d
-usr/share/zoneminder
-etc/zm
-db/zm_create.sql usr/share/zoneminder/db
-db/zm_update-*.sql usr/share/zoneminder/db
-debian/apache.conf etc/zm
diff --git a/distros/ubuntu1504_cmake/libzoneminder-perl.install b/distros/ubuntu1504/libzoneminder-perl.install
similarity index 100%
rename from distros/ubuntu1504_cmake/libzoneminder-perl.install
rename to distros/ubuntu1504/libzoneminder-perl.install
diff --git a/distros/ubuntu1504/links b/distros/ubuntu1504/links
deleted file mode 100644
index 2de75e323..000000000
--- a/distros/ubuntu1504/links
+++ /dev/null
@@ -1,4 +0,0 @@
-var/cache/zoneminder/events usr/share/zoneminder/www/events
-var/cache/zoneminder/images usr/share/zoneminder/www/images
-var/cache/zoneminder/temp   usr/share/zoneminder/www/temp
-usr/lib/cgi-bin             usr/lib/zoneminder/cgi-bin
diff --git a/distros/ubuntu1504_cmake/patches/default_cgi-path.patch b/distros/ubuntu1504/patches/default_cgi-path.patch
similarity index 100%
rename from distros/ubuntu1504_cmake/patches/default_cgi-path.patch
rename to distros/ubuntu1504/patches/default_cgi-path.patch
diff --git a/distros/ubuntu1504/patches/series b/distros/ubuntu1504/patches/series
index e69de29bb..fc70f4006 100644
--- a/distros/ubuntu1504/patches/series
+++ b/distros/ubuntu1504/patches/series
@@ -0,0 +1,2 @@
+default_cgi-path.patch
+use_libjs-mootools.patch
diff --git a/distros/ubuntu1504_cmake/patches/use_libjs-mootools.patch b/distros/ubuntu1504/patches/use_libjs-mootools.patch
similarity index 100%
rename from distros/ubuntu1504_cmake/patches/use_libjs-mootools.patch
rename to distros/ubuntu1504/patches/use_libjs-mootools.patch
diff --git a/distros/ubuntu1504/postinst b/distros/ubuntu1504/postinst
deleted file mode 100644
index e009a9799..000000000
--- a/distros/ubuntu1504/postinst
+++ /dev/null
@@ -1,53 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-	if [ -e "/lib/systemd/system/mysql.service" ]; then 
-		#
-		# Get mysql started if it isn't
-		#
-		if ! $(systemctl is-active mysql >/dev/null 2>&1); then
-				systemctl start mysql
-		fi
-		if $(systemctl is-active mysql >/dev/null 2>&1); then
-			mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
-			# test if database if already present...
-			if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
-				cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
-				echo 'grant lock tables, alter,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-			fi
-
-			systemctl stop zoneminder || true  #not sure about "|| true"
-			zmupdate.pl --nointeractive
-
-		else
-			echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
-		fi
-	else 
-		echo 'mysql not found, assuming remote server.'
-	fi
-	chown www-data:www-data /var/log/zm
-	chown www-data:www-data /var/lib/zm/
-	if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
-	fi
-fi
-# Ensure zoneminder is stopped...
-if [ -e "/lib/systemd/system/zoneminder.service" ]; then  #changed from -x to -e, could be wrong
-        if systemctl is-active zoneminder >/dev/null 2>&1 ; then
-                systemctl stop zoneminder || exit $?
-        fi
-fi
-
-if [ "$1" = "configure" ]; then
-	if [ -z "$2" ]; then
-		chown www-data:www-data /var/log/zm
-		chown www-data:www-data /var/lib/zm/
-		chown www-data:www-data -R /var/cache/zoneminder
-    else
-		chown www-data:www-data /var/log/zm
-		zmupdate.pl
-	fi
-fi
-#DEBHELPER#
diff --git a/distros/ubuntu1504/postrm b/distros/ubuntu1504/postrm
deleted file mode 100644
index 28a00a7a0..000000000
--- a/distros/ubuntu1504/postrm
+++ /dev/null
@@ -1,9 +0,0 @@
-#! /bin/sh
-# set -e # to be reinstated later
-
-if [ "$1" = "purge" ]; then
-    echo 'delete from user where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    echo 'delete from db where User="zmuser";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-    mysqladmin --defaults-file=/etc/mysql/debian.cnf -f drop zm
-fi
-#DEBHELPER#
diff --git a/distros/ubuntu1504/preinst b/distros/ubuntu1504/preinst
deleted file mode 100755
index f35723bc0..000000000
--- a/distros/ubuntu1504/preinst
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/sh
-
-set -e
-
-abort=false
-if [ -L /usr/share/zoneminder/www/events ]; then
-    l=$(readlink /usr/share/zoneminder/www/events)
-    if [ "$l" != "/var/cache/zoneminder/events" ]; then
-        abort=true
-    fi
-fi
-if [ -L /usr/share/zoneminder/www/images ]; then
-    l=$(readlink /usr/share/zoneminder/www/images )
-    if [ "$l" != "/var/cache/zoneminder/images" ]; then
-        abort=true
-    fi
-fi
-
-if [ "$abort" = "true" ]; then
-    cat >&2 << EOF 
-Aborting installation of zoneminder due to non-default symlinks in
-/usr/share/zoneminder/www for the images and/or events directory, which could
-result in loss of data. Please move your data in each of these directories to
-/var/cache/zoneminder/www before installing zoneminder from the package.
-EOF
-    exit 1
-
-fi
-
-#DEBHELPER#
-
-exit 0
diff --git a/distros/ubuntu1504/rules b/distros/ubuntu1504/rules
index 9fe5e92d8..bf8012aa8 100755
--- a/distros/ubuntu1504/rules
+++ b/distros/ubuntu1504/rules
@@ -1,67 +1,93 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
-# Sample debian/rules that uses debhelper.
-# This file was originally written by Joey Hess and Craig Small.
-# As a special exception, when this file is copied by dh-make into a
-# dh-make output file, you may use that output file without restriction.
-# This special exception was added by Craig Small in version 0.37 of dh-make.
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
 
-CFLAGS = -Wall -g
-CPPFLAGS = -D__STDC_CONSTANT_MACROS
-CXXFLAGS = -DHAVE_LIBCRYPTO
-
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
+ifeq ($(DEB_BUILD_ARCH_OS),hurd)
+ARGS:= -DZM_NO_MMAP=ON
 endif
 
 %:
-	dh $@ --with quilt,autoreconf,systemd
+	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
+            --with systemd,sphinxdoc,apache2,linktree
 
 override_dh_auto_configure:
-	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CXXFLAGS)" dh_auto_configure -- --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --sysconfdir=/etc/zm --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --with-mysql=/usr --with-mariadb=/usr --with-webdir=/usr/share/zoneminder --with-ffmpeg=/usr --with-cgidir=/usr/lib/cgi-bin --with-webuser=www-data --with-webgroup=www-data --enable-crashtrace=no --enable-mmap=yes
+	dh_auto_configure -- $(ARGS)                  \
+            -DCMAKE_VERBOSE_MAKEFILE=ON                \
+            -DCMAKE_BUILD_TYPE=Release                 \
+            -DZM_CONFIG_DIR="/etc/zm"                  \
+            -DZM_RUNDIR="/var/run/zm"                  \
+            -DZM_SOCKDIR="/var/run/zm"                 \
+            -DZM_TMPDIR="/tmp/zm"                      \
+            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
+            -DZM_CONTENTDIR="/var/cache/zoneminder"
 
 override_dh_clean:
-	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	dh_clean
+	dh_clean $(MANPAGES1)
+	$(RM) -r docs/_build docs/installationguide
 
-override_dh_install:
-	dh_install --fail-missing
-	#
-	# NOTE: This is a short-term kludge; hopefully changes in the next
-	# upstream version will render this unnecessary.
-	rm -rf debian/zoneminder/usr/share/zoneminder/www/events
-	rm -rf debian/zoneminder/usr/share/zoneminder/www/images
-	rm -rf debian/zoneminder/usr/share/zoneminder/temp
-	dh_link var/cache/zoneminder/events usr/share/zoneminder/www/events
-	dh_link var/cache/zoneminder/images usr/share/zoneminder/www/images
-	dh_link var/cache/zoneminder/temp usr/share/zoneminder/www/temp
+build-indep:
+	#$(MAKE) -C docs text
+	$(MAKE) -C docs html
 
-	#
-	# This is a slightly lesser kludge; moving the cgi stuff to
-	# /usr/share/zoneminder/cgi-bin breaks one set of behavior,
-	# having it just in /usr/lib/cgi-bin breaks another bit of
-	# behavior.
-	#
-	dh_link usr/lib/cgi-bin usr/lib/zoneminder/cgi-bin
+MANPAGES1 = dbuild/scripts/zmupdate.pl.1
+$(MANPAGES1):
+	# generate man page(s):
+	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
+
+## reproducible build:
+LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
+BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
+override_dh_installman: $(MANPAGES1)
+	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
+	dh_installman --language=C $(MANPAGES1)
+
+override_dh_auto_install:
+	dh_auto_install --destdir=$(CURDIR)/debian/tmp
+	# remove worthless files:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
+	# remove empty directories:
+	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
+	# remove extra-license-file:
+	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
 
 override_dh_fixperms:
 	dh_fixperms
-	chown root:root debian/zoneminder/etc/zm/zm.conf
+	## 637685
+	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
 
-override_dh_auto_test:
-	# do not run tests...
+override_dh_installinit:
+	dh_installinit --no-start
+
+override_dh_systemd_start:
+	dh_systemd_start --no-start
+
+override_dh_systemd_enable:
+	dh_systemd_enable --no-enable
+
+override_dh_apache2:
+	dh_apache2 --noenable
 
-.PHONY: override_dh_strip
 override_dh_strip:
-		dh_strip --dbg-package=zoneminder-dbg
+	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
+        && dh_strip --dbg-package=zoneminder-dbg \
+        || dh_strip
+
+#%:
+#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
+#
+#override_dh_auto_configure:
+#	dh_auto_configure -- \
+#            --sysconfdir=/etc/zm \
+#            --with-mysql=/usr \
+#            --with-webdir=/usr/share/zoneminder \
+#            --with-ffmpeg=/usr \
+#            --with-cgidir=/usr/lib/cgi-bin \
+#            --with-webuser=www-data \
+#            --with-webgroup=www-data \
+#            --enable-mmap=yes
diff --git a/distros/ubuntu1204_cmake/source/format b/distros/ubuntu1504/source/format
similarity index 100%
rename from distros/ubuntu1204_cmake/source/format
rename to distros/ubuntu1504/source/format
diff --git a/distros/ubuntu1504_cmake/source/lintian-overrides b/distros/ubuntu1504/source/lintian-overrides
similarity index 100%
rename from distros/ubuntu1504_cmake/source/lintian-overrides
rename to distros/ubuntu1504/source/lintian-overrides
diff --git a/distros/ubuntu1504/watch b/distros/ubuntu1504/watch
index 5a8a9c4d7..7ee690edb 100644
--- a/distros/ubuntu1504/watch
+++ b/distros/ubuntu1504/watch
@@ -1,3 +1,7 @@
 version=3
-http://www.zoneminder.com/downloads.html \
-  .*/ZoneMinder-(.*).tar.gz
+
+opts=\
+repacksuffix=+dfsg,\
+dversionmangle=s{\+dfsg\d*}{},\
+ https://github.com/ZoneMinder/ZoneMinder/releases \
+  .*/ZoneMinder/archive/v(.*).tar.gz
diff --git a/distros/ubuntu1504_cmake/zoneminder-doc.doc-base b/distros/ubuntu1504/zoneminder-doc.doc-base
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder-doc.doc-base
rename to distros/ubuntu1504/zoneminder-doc.doc-base
diff --git a/distros/ubuntu1504_cmake/zoneminder-doc.install b/distros/ubuntu1504/zoneminder-doc.install
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder-doc.install
rename to distros/ubuntu1504/zoneminder-doc.install
diff --git a/distros/ubuntu1504_cmake/zoneminder-doc.links b/distros/ubuntu1504/zoneminder-doc.links
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder-doc.links
rename to distros/ubuntu1504/zoneminder-doc.links
diff --git a/distros/ubuntu1504_cmake/zoneminder.apache2 b/distros/ubuntu1504/zoneminder.apache2
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.apache2
rename to distros/ubuntu1504/zoneminder.apache2
diff --git a/distros/ubuntu1504_cmake/zoneminder.bug-presubj b/distros/ubuntu1504/zoneminder.bug-presubj
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.bug-presubj
rename to distros/ubuntu1504/zoneminder.bug-presubj
diff --git a/distros/ubuntu1504_cmake/zoneminder.dirs b/distros/ubuntu1504/zoneminder.dirs
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.dirs
rename to distros/ubuntu1504/zoneminder.dirs
diff --git a/distros/ubuntu1504_cmake/zoneminder.docs b/distros/ubuntu1504/zoneminder.docs
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.docs
rename to distros/ubuntu1504/zoneminder.docs
diff --git a/distros/ubuntu1504_cmake/zoneminder.examples b/distros/ubuntu1504/zoneminder.examples
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.examples
rename to distros/ubuntu1504/zoneminder.examples
diff --git a/distros/ubuntu1504_cmake/zoneminder.init b/distros/ubuntu1504/zoneminder.init
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.init
rename to distros/ubuntu1504/zoneminder.init
diff --git a/distros/ubuntu1504_cmake/zoneminder.install b/distros/ubuntu1504/zoneminder.install
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.install
rename to distros/ubuntu1504/zoneminder.install
diff --git a/distros/ubuntu1504_cmake/zoneminder.links b/distros/ubuntu1504/zoneminder.links
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.links
rename to distros/ubuntu1504/zoneminder.links
diff --git a/distros/ubuntu1504_cmake/zoneminder.linktrees b/distros/ubuntu1504/zoneminder.linktrees
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.linktrees
rename to distros/ubuntu1504/zoneminder.linktrees
diff --git a/distros/ubuntu1504_cmake/zoneminder.lintian-overrides b/distros/ubuntu1504/zoneminder.lintian-overrides
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.lintian-overrides
rename to distros/ubuntu1504/zoneminder.lintian-overrides
diff --git a/distros/ubuntu1504_cmake/zoneminder.logrotate b/distros/ubuntu1504/zoneminder.logrotate
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.logrotate
rename to distros/ubuntu1504/zoneminder.logrotate
diff --git a/distros/ubuntu1504_cmake/zoneminder.maintscript b/distros/ubuntu1504/zoneminder.maintscript
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.maintscript
rename to distros/ubuntu1504/zoneminder.maintscript
diff --git a/distros/ubuntu1504_cmake/zoneminder.manpages b/distros/ubuntu1504/zoneminder.manpages
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.manpages
rename to distros/ubuntu1504/zoneminder.manpages
diff --git a/distros/ubuntu1504/zoneminder.postinst b/distros/ubuntu1504/zoneminder.postinst
new file mode 100644
index 000000000..64699d1ca
--- /dev/null
+++ b/distros/ubuntu1504/zoneminder.postinst
@@ -0,0 +1,59 @@
+#! /bin/sh
+
+set -e
+
+if [ "$1" = "configure" ]; then
+
+    . /etc/zm/zm.conf
+
+    # The logs can contain passwords, etc... so by setting group root, only www-data can read them, not people in the www-data group
+    chown www-data:root /var/log/zm
+    chown www-data:www-data /var/lib/zm
+    if [ -z "$2" ]; then
+        chown www-data:www-data /var/cache/zoneminder /var/cache/zoneminder/*
+    fi
+
+	# Do this every time the package is installed or upgraded
+
+	if [ "$ZM_DB_HOST" = "localhost" ]; then
+
+        if [ -e "/etc/init.d/mysql" ]; then
+
+            #
+            # Get mysql started if it isn't
+            #
+            if ! $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                deb-systemd-invoke start mysql.service || exit $?
+            fi
+
+            if $(/etc/init.d/mysql status >/dev/null 2>&1); then
+                mysqladmin --defaults-file=/etc/mysql/debian.cnf -f reload
+                # test if database if already present...
+                if ! $(echo quit | mysql --defaults-file=/etc/mysql/debian.cnf zm > /dev/null 2> /dev/null) ; then
+                    cat /usr/share/zoneminder/db/zm_create.sql | mysql --defaults-file=/etc/mysql/debian.cnf
+                    # This creates the user.
+                    echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost identified by \"${ZM_DB_PASS}\";" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                else
+                    echo "grant lock tables,alter,select,insert,update,delete,create,index on ${ZM_DB_NAME}.* to '${ZM_DB_USER}'@localhost;" | mysql --defaults-file=/etc/mysql/debian.cnf mysql
+                fi
+
+                # Ensure zoneminder is stopped
+                deb-systemd-invoke stop zoneminder.service || exit $?
+                zmupdate.pl --nointeractive
+                zmupdate.pl --nointeractive -f
+                deb-systemd-invoke start zoneminder.service || exit $?
+
+            else
+                echo 'NOTE: mysql not running, please start mysql and run dpkg-reconfigure zoneminder when it is running.'
+            fi
+        else
+            echo 'mysql not found, assuming remote server.'
+        fi
+
+    else
+		echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
+    fi
+
+fi
+
+#DEBHELPER#
diff --git a/distros/ubuntu1504_cmake/zoneminder.postrm b/distros/ubuntu1504/zoneminder.postrm
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.postrm
rename to distros/ubuntu1504/zoneminder.postrm
diff --git a/distros/ubuntu1504_cmake/zoneminder.preinst b/distros/ubuntu1504/zoneminder.preinst
similarity index 100%
rename from distros/ubuntu1504_cmake/zoneminder.preinst
rename to distros/ubuntu1504/zoneminder.preinst
diff --git a/distros/ubuntu1504/zoneminder.service b/distros/ubuntu1504/zoneminder.service
index 3ce608a49..e3575c039 100644
--- a/distros/ubuntu1504/zoneminder.service
+++ b/distros/ubuntu1504/zoneminder.service
@@ -1,16 +1,20 @@
 # ZoneMinder systemd unit file
- # This file is intended to work with all Linux distributions
- [Unit]
- Description=ZoneMinder CCTV recording and security system
- After=network.target mysql.service apache2.service
- Requires=mysql.service apache2.service
- [Service]
- User=www-data
- Type=forking
- ExecStart=/usr/bin/zmpkg.pl start
- ExecReload=/usr/bin/zmpkg.pl restart
- ExecStop=/usr/bin/zmpkg.pl stop
- PIDFile="/run/zm/zm.pid"
- [Install]
- WantedBy=multi-user.target
+# This file is intended to work with Debian distributions
 
+[Unit]
+Description=ZoneMinder CCTV recording and surveillance system
+After=network.target mysql.service
+# Remarked out so that it will start ZM on machines that don't have mysql installed
+#Requires=mysql.service
+
+[Service]
+#User=www-data
+Type=forking
+ExecStart=/usr/bin/zmpkg.pl start
+ExecReload=/usr/bin/zmpkg.pl restart
+ExecStop=/usr/bin/zmpkg.pl stop
+PIDFile=/var/run/zm/zm.pid
+Restart=on-abnormal
+
+[Install]
+WantedBy=multi-user.target
diff --git a/distros/ubuntu1504/zoneminder.tmpfile b/distros/ubuntu1504/zoneminder.tmpfile
index 036883750..d307c6640 100644
--- a/distros/ubuntu1504/zoneminder.tmpfile
+++ b/distros/ubuntu1504/zoneminder.tmpfile
@@ -1,2 +1,2 @@
 d /var/run/zm 0755 www-data www-data
-
+d /tmp/zm     0755 www-data www-data
diff --git a/distros/ubuntu1504_cmake/README.Debian b/distros/ubuntu1504_cmake/README.Debian
deleted file mode 100644
index 8182e0678..000000000
--- a/distros/ubuntu1504_cmake/README.Debian
+++ /dev/null
@@ -1,160 +0,0 @@
-Zoneminder for Debian
----------------------
-
-Initializing database
----------------------
-
-    pv /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
-OR
-    cat /usr/share/zoneminder/db/zm_create.sql | sudo mysql --defaults-file=/etc/mysql/debian.cnf
-
-    echo 'grant lock tables,alter,create,index,select,insert,update,delete on zm.* to 'zmuser'@localhost identified by "zmpass";'\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-Hint: generate secure password with `pwgen` and update "/etc/zm/zm.conf"
-accordingly.
-
-The following command can help to ensure that zoneminder can read its
-configuration file:
-
-    chgrp -c www-data /etc/zm/zm.conf
-
-
-Upgrading database
-------------------
-
-Prior to 1.28.1 database upgrade was performed automatically.
-"zoneminder" service will refuse to start with outdated database.
-
-Assuming that database is on "localhost" then the following command can be
-used to upgrade "zm" database:
-
-    zmupdate.pl
-
-Additional permissions may be required to perform upgrade:
-
-    echo 'grant lock tables, create, alter on zm.* to 'zmuser'@localhost identified by "zmpass";'\
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf mysql
-
-The following command prints the current version of zoneminder database:
-
-    echo 'select Value from Config where Name = "ZM_DYN_CURR_VERSION";' \
-    | sudo mysql --defaults-file=/etc/mysql/debian.cnf --skip-column-names zm
-
-
-Enabling service
-----------------
-
-By default Zoneminder service is not starting automatically and need to be
-manually activated once database is configured:
-
-On systemd:
-
-    sudo systemctl enable zoneminder.service
-
-On SysV:
-
-    sudo update-rc.d zoneminder enable
-
-
-Web server set-up
------------------
-
-There are few manual steps to get the web interface working:
-
-## Apache2
-
-Apache can be configured as folder "/zm" using sample .conf:
-
-    sudo a2enconf zoneminder
-
-Alternatively Apache web site configuration template can be used to setup
-zoneminder as "http://zoneminder":
-
-    sudo cp -v /usr/share/doc/zoneminder/examples/apache.conf /etc/apache2/sites-available/
-    sudo a2ensite zoneminder.conf
-
-Common configuration steps for Apache2:
-
-    sudo a2enmod cgi
-    sudo service apache2 reload
-
-
-## nginx / fcgiwrap
-
-Nginx needs "php5-fpm" package to support PHP and "fcgiwrap" package
-for binary "cgi-bin" applications:
-
-    sudo apt-get install php5-fpm fcgiwrap
-
-To enable a URL alias that makes Zoneminder available from
-
-    http://yourserver/zm
-
-the following line is to be added to "server" section of a web site
-configuration:
-
-    include /usr/share/doc/zoneminder/examples/nginx.conf;
-
-For "default" web site it would be sufficient to include the above
-statement to the file
-
-    /etc/nginx/sites-enabled/default
-
-To avoid problems with feeds from multiple cameras "fcgiwrap" should be
-configured to start at least as many processes as there are cameras.
-It can be done by adjusting DAEMON_OPTS in "/etc/default/fcgiwrap".
-Systemd users may be affected by the following bug:
-
-    http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=792705
-
-
-## Note:
-
-When Zoneminder web site is running it may be necessary to set
-Options/Paths/PATH_ZMS to "/zm/cgi-bin/nph-zms" or according to chosen web
-site configuration.
-
-
-Changing the location for images and events
--------------------------------------------
-
-Zoneminder, in its upstream form, stores data in /usr/share/zoneminder/.  This
-package modifies that by changing /usr/share/zoneminder/images and
-/usr/share/zoneminder/events to symlinks to directories under
-/var/cache/zoneminder.
-
-There are numerous places these could be put and ways to do it.  But, at the
-moment, if you change this, an upgrade will fail with a warning about these
-locations having changed (the reason for this was that previously, an  upgrade
-would silently revert the changes and cause event loss - refer
-bug #608793).
-
-If you do want to change the location, here are a couple of suggestions.
-(thanks to vagrant@freegeek.org):
-
-These lines in fstab could allow you to bind-mount an alternate location
-
-         /dev/sdX1 /otherdrive ext3 defaults 0 2
-         /otherdrive/zoneminder/images /var/cache/zoneminder/images bind defaults 0 2
-         /otherdrive/zoneminder/events /var/cache/zoneminder/events bind defaults 0 2
-
-        or if you have a separate partition for each:
-
-         /dev/sdX1 /var/cache/zoneminder/images ext3 defaults 0 2
-         /dev/sdX2 /var/cache/zoneminder/events ext3 defaults 0 2
-
- -- Peter Howard <pjh@northern-ridge.com.au>, Sun, 16 Jan 2010 01:35:51 +1100
-
-Access to /dev/video*
----------------------
-
-For cameras which require access to /dev/video*, zoneminder may need the
-www-data user added to the video group in order to see those cameras:
-
-  adduser www-data video
-
-Note that all web applications running on the zoneminder server will then have
-access to all video devices on the system.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 27 Mar 2011 13:06:56 -0700
diff --git a/distros/ubuntu1504_cmake/changelog b/distros/ubuntu1504_cmake/changelog
deleted file mode 100644
index 74cf1d0b8..000000000
--- a/distros/ubuntu1504_cmake/changelog
+++ /dev/null
@@ -1,573 +0,0 @@
-zoneminder (1.28.1+1-vivid-SNAPSHOT2015081701) vivid; urgency=medium
-
-  * include api, switch to cmake build
-
- -- Isaac Connor <iconnor@connortechnology.com>  Mon, 17 Aug 2015 10:29:23 -0400
-
-
-zoneminder (1.28.1-8) unstable; urgency=medium
-
-  * Patchworks:
-    + New upstream "980-fix-image-size.patch".
-    + New "default_cgi-path.patch" to correct default ZM_PATH_ZMS.
-  * postinst: set "root" as group owner for "/var/log/zm" to silence
-    logrotate warnings.
-  * Minor correction to README.Debian.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 16 Aug 2015 19:19:50 +1000
-
-zoneminder (1.28.1-7) unstable; urgency=medium
-
-  * Build-Depends += "cakephp (<< 3.0.0~)";
-    Zoneminder is not compatible with latest CakePHP.
-  * Handle conffile removal from maintscript.
-  * rules: build man pages reproducibly.
-  * gbp.conf: renamed old style config section [git-dch] to [dch].
-  * README
-    + added instructions to update owner of the "/etc/zm/zm.conf"
-      (Closes: #789327).
-    + zmupdate.pl needs CREATE rights.
-    + added note about required number of "fcgiwrap" workers.
-  * New upstream patch: "zmtrigger-plus.patch".
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 20 Jul 2015 16:30:15 +1000
-
-zoneminder (1.28.1-6) unstable; urgency=low
-
-  * New "zoneminder-doc" and "zoneminder-dbg" packages.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 14:50:41 +1000
-
-zoneminder (1.28.1-5) unstable; urgency=low
-
-  * Move handling of "/var/run/zm" and "/tmp/zm" from .service into .tmpfile.
-    Let dh_installinit do the job. Thanks, Andrew Bauer.
-  * Use dh_apache2 to install Apache conf file; remove old conf and symlink.
-  * Promote "libapache2-mod-php5 | php5-fpm" to Recommends.
-  * Build-Depends:
-    + dh-linktree
-    + cakephp (>= 2.6.3)
-    + libjs-jquery
-    + libjs-mootools
-  * Depends:
-    - libjs-jquery
-    - libjs-mootools
-  * Build-time replace bundled CakePHP with system one using "dh-linktree".
-  * Use "dh-linktree" to handle mootools and jquery symlinks.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Sun, 19 Apr 2015 11:45:01 +1000
-
-zoneminder (1.28.1-4) unstable; urgency=low
-
-  * New patch to fix HTML export with USE_DEEP_STORAGE (closes: #723706).
-  * New "783.patch" to describe potential data loss in ZM_USE_DEEP_STORAGE.
-  * New patch to change default date format to region-neutral ISO notation
-    with time zone.
-  * Build sphinx documentation:
-    + Install "zoneminder.1" man page.
-    + Build-Depends += "python-sphinx | python3-sphinx"
-    + Added commented "zoneminder-doc" package.
-    + Added "docs.patch" to unlink distro-specific installation docs.
-  * rules:
-    + set ZM_CONTENTDIR, ZM_SOCKDIR and ZM_TMPDIR.
-    + remove mistakengly installed Perl module templates.
-  * Updated startup scripts to create ZM_TMPDIR.
-  * Hurd improvements:
-    + New patch to add PATH_MAX definitions.
-    + Build without MMAP support on Hurd.
-    + libsys-mmap-perl [!hurd-any].
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Mon, 06 Apr 2015 18:18:55 +1000
-
-zoneminder (1.28.1-3) unstable; urgency=low
-
-  * Updated Apache2 and nginx configuration templates to support CGI.
-  * Updated README.Debian to document cgi-bin setup.
-  * Removed "/usr/share/zoneminder/www/cgi-bin" symlink.
-  * Added "apache2.patch" to correct Apache2 site configuration example.
-  * control: Suggests += "fcgiwrap".
-  * rules: added dh_systemd overrides to prevent automatic service
-    activation and start.
-  * Added note about manual service activation to README.Debian
-    (Closes: #781733).
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 23:20:20 +1100
-
-zoneminder (1.28.1-2) unstable; urgency=low
-
-  * Removed word "Linux" from short package description.
-  * Build-Depends: do not require "libv4l-dev" on Hurd i.e. [!hurd-any].
-  * Added run-time Perl Depends:
-     + libdbd-mysql-perl
-     + libimage-info-perl
-     + libmodule-load-conditional-perl
-     + libnet-sftp-foreign-perl
-     + liburi-encode-perl
-  * Prepare for package split: added commented "libzoneminder-perl"
-    and "zoneminder-dbg" packages to "debian/control".
-  * rules: do not install worthless ".packlist" file.
-  * Updated "libv4l1-videodev.h.patch" to fix v4lv1 detection in CMake.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Thu, 02 Apr 2015 13:25:19 +1100
-
-zoneminder (1.28.1-1) unstable; urgency=low
-
-  [ Dmitry Smirnov <onlyjob@debian.org> ]
-  * New upstream release [February 2015].
-  * Upload to unstable.
-  * Disabled automatic database upgrades: post(inst|rm) scripts no longer
-    touch database or do unexpected stuff (Closes: #779254).
-    See README.Debian for details.
-  * Updated installation paths:
-    + /usr/share/zoneminder --> /usr/share/zoneminder/www
-    + /usr/lib/cgi-bin --> /usr/lib/zoneminder/cgi-bin
-  * Added logrotate config (Closes: #544826).
-    Thanks, Alberto Reyes.
-  * Native systemd service; "--with systemd" added to dh.
-  * Build with CMake instead of autoconf; rules clean-up.
-  * Build with all hardening.
-  * Build and install "zmupdate.pl.1" man page.
-  * Added nginx/php5-fpm configuration example.
-  * Install upstream "apache.conf" example.
-  * Described setup of Zoneminer web site and database in README.Debian.
-  * Install "/etc/zm/zm.conf" with tighter permissions.
-  * Added TODO.Debian.
-  * Added "debian/clean"; "debian/gbp.conf"; bug-presubj.
-  * Remove bundled Cake tests to take ~5 MB off big-usr-share.
-  * Standards-Version: 3.9.6; compat/debhelper to version 9.
-  * Vcs links to new git repository at collab-maint.
-  * Build-Depends:
-    + dh-systemd
-    + libgcrypt11-dev --> libgcrypt-dev
-    + libcurl4-gnutls-dev
-    + libvlc-dev
-    + policykit-1 (required by "zmsystemctl.pl")
-    - dh-autoreconf, autoconf, automake
-  * Depends:
-    - apache2
-    - libapache2-mod-php5 (moved to Suggests)
-    - libpcre3 (invalid)
-    - libmodule-load-perl (obsolete; replaced with perl-modules)
-    - libarchive-tar-perl (obsolete; replaced with perl-modules)
-    - mysql-server (moved to Recommends, Closes: #759504).
-    - php5
-    + libav-tools
-    + libjs-jquery  (replaces bundled component)
-    + libjs-mootool (replaces bundled component)
-    + libjson-any-perl (Closes: #690803).
-    + perl-modules (Closes: #745819).
-  * Recommends:
-    + apache2 | httpd
-    + mysql-server | virtual-mysql-server (Closes: #732874).
-  * Suggests:
-    + libapache2-mod-php5 | php5-fpm
-    + logrotate
-  * Refreshed, renamed and re-ordered patches; added DEP-3 headers.
-  * Removed "vendor_perl" patch (applied-upstream).
-  * New patches:
-    + cmake-fix-confpath.patch
-    + cmake-gnutls.patch
-    + cmake-nossl.patch
-    + cmake.patch
-    + format-hardening.patch
-    + pod_man_fixes.patch
-    + pod_name_fixes.patch
-    + pod_zmupdate-to-pod2usage.patch
-  * Lintianisation (incomplete):
-    - extra-license-file
-    - init.d-script-missing-lsb-description
-    - init.d-script-does-not-source-init-functions
-    - privacy-breach-generic
-    - package-contains-empty-directory
-    - manpage-has-errors-from-pod2man
-    - manpage-has-bad-whatis-entry
-    - quilt-patch-missing-description
-    - no-dep5-copyright
-  * Lintian-overrides:
-    + unusual-interpreter usr/bin/zmsystemctl.pl #!/usr/bin/pkexec
-    + script-not-executable usr/share/zoneminder/www/api/*
-    + script-with-language-extension usr/bin/*.pl
-    + source-is-missing web/tools/mootools/mootools-*-yc.js
-    + source-is-missing web/skins/*/js/jquery-1.4.2.min.js
-    + source-contains-prebuilt-javascript-object
-  * Renamed files in "debian".
-  * watch: dfsg repacksuffix and dversionmangle.
-  * "debian/copyright" to Copyright-Format-1.0.
-  * Set myself as new Maintainer (Closes: #760314).
-
-  [ Vagrant Cascadian <vagrant@debian.org> ]
-  * Removed obsolete DM-Upload-Allowed flag.
-  * Update debian/watch to use tarballs from github.
-  * Add Build-Depends on libgcrypt11-dev (Closes: #745819).
-  * Use canonical alioth Vcs-Hg URL.
-  * debian/control: Add Build-Depends: libpolkit-gobject-1-dev.
-  * Removed configure flag "--enable-crashtrace=no", which is no longer
-    present upstream.
-
- -- Dmitry Smirnov <onlyjob@debian.org>  Tue, 31 Mar 2015 15:11:13 +1100
-
-zoneminder (1.26.5-3.1) experimental; urgency=low
-
-  * Non-maintainer upload.
-  * Add libav10.patch and compile against libav10 (Closes: #739461)
-
- -- Reinhard Tartler <siretart@tauware.de>  Wed, 19 Mar 2014 00:31:22 +0000
-
-zoneminder (1.26.5-3) unstable; urgency=low
-
-
-  * Previous release still didn't build on PPC - this has been corrected.
-    (Closes: #736516)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 4 Feb 2014 02:02:10 +1000
-
-zoneminder (1.26.5-2) unstable; urgency=low
-
-  * Remove dependency on ffmpeg
-    (Closes: #721161)
-
-  * Builds again on non-x86 target architectures.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 23 Jan 2014 01:02:10 +1000
-
-zoneminder (1.26.5-1) unstable; urgency=low
-
-  * New upstream version
-    (Closes: #694131)
-  * Change Build-Depends on libgnutls-dev to libgnutls-openssl-dev
-    (Closes: #731560)
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 17 Dec 2013 01:02:10 +1000
-
-zoneminder (1.25.0-4) unstable; urgency=high
-
-  * Add CVE-2013-0232 patch
-    [SECURITY] CVE-2013-0232: Shell escape commands with untrusted content.
-    Thanks to James McCoy <jamessan@debian.org> (Closes: #698910)
-    Thanks also to Salvatore Bonaccorso <carnil@debian.org>
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Tue, 12 Jun 2013 12:02:10 +1000
-
-zoneminder (1.25.0-3) unstable; urgency=low
-
-  * debian/rules: Export CFLAGS, CPPFLAGS, CXXFLAGS and LDFLAGS, to ensure
-    hardening build flags are enabled.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Tue, 28 Aug 2012 12:10:03 -0700
-
-zoneminder (1.25.0-2) unstable; urgency=low
-
-  [ Vagrant Cascadian ]
-  * Add a patch to disable checking for updated versions by default, as
-    upgrades should happen through package management.
-  * Use dpkg-buildflags in debian/rules to set default compiler flags.
-  * Ensure zoneminder is stopped before starting (Closes: #657407).
-
-  [ Peter Howard ]
-  * Fix postinst to add permission for table creation during upgrade
-    (Closes: #657407).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Thu, 23 Aug 2012 12:40:34 -0700
-
-zoneminder (1.25.0-1.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "ftbfs with GCC-4.7": add patch Fix-FTBFS-with-gcc-4.7 from Cyril
-    Brulebois: fix missing <unistd.h> includes.
-    (Closes: #667428)
-
- -- gregor herrmann <gregoa@debian.org>  Sun, 13 May 2012 17:02:21 +0200
-
-zoneminder (1.25.0-1) unstable; urgency=low
-
-  * Fix typo in libv4l1-videodev.h patch that caused v4l1 support to be
-    dropped.
-  * Fail to build if version in postinst doesn't match upstream version.
-  * Add Build-Depends: libavdevice-dev to fix MPEG streaming (Closes: #515558).
-  * debian/rules: Convert to using debhelper overrides.
-  * Set debian/compat to 7.
-  * Simplify debian/watch file.
-  * Refresh debian/patches/use_libjs-mootools.
-  * Refresh debian/patches/libv4l1-videodev.h.
-  * Remove dependencies on php4 and related packages.
-  * Remove build-dependencies on libmysqlclient14-dev and
-    libmysqlclient15-dev.
-  * Update Build-Depends to use libjpeg-dev instead of libjpeg62-dev
-    (Closes: #647114).
-  * Add patch to fix build by testing for C headers rather than C++ headers.
-    Thanks to Ryan Niebur. (Closes: #654230)
-  * Add a patch to fix build problems caused by API changes in libav 0.8.
-    Thanks again to Ryan Niebur. (Closes: #654230)
-
- -- Vagrant Cascadian <vagrant@debian.org>  Mon, 16 Jan 2012 11:58:05 -0800
-
-zoneminder (1.24.4-1) unstable; urgency=low
-
-  [ Peter Howard ]
-  * Initial release of 1.24.4 (Closes: #634985).
-    - Fix 32/64-bit type declarations (Closes: #614404).
-  * Update patches.
-
-  [ Vagrant Cascadian ]
-  * Add patch to fix FTBFS by using libv4l1-videodev.h from libv4l-dev.
-    Thanks to Andreas Metzler for reporting the issue.
-    (Closes: #619813).
-  * Document adding the www-data user to the video group in README.Debian.
-    (Closes: #611324)
-  * Depend on libsys-mmap-perl to enable mapped memory support.
-    (Closes: #607331)
-  * Update libjs-mootools patch to use -nc variants (Closes: #635075).
-  * Depend on javascript-common, to ensure that /javascript is available in
-    the web server.
-  * Set the upstream version in postinst at build time.
-  * Use dh-autoreconf to properly clean up autogenerated files during build.
-  * Add Vcs-HG to debian/control.
-  * Add Build-Depends: libv4l-dev, libbz2-dev, dh-autoreconf, libsys-mmap-perl.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 24 Jul 2011 16:44:30 +0200
-
-zoneminder (1.24.2-9) unstable; urgency=low
-
-  * Apply patch from Ubuntu to fix FTBFS with ffmpeg 0.6:
-    - Add -D__STDC_CONSTANT_MACROS to CPPFLAGS (closes: 614080).
-  * Update Standards-Version to 3.9.1, no changes necessary.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sun, 20 Feb 2011 23:43:02 -0800
-
-zoneminder (1.24.2-8) unstable; urgency=medium
-
-  [ Vagrant Cascadian ]
-  * Apply patch to fix V4L2 cameras without crop support (closes: #608790).
-    Thanks to piratebab.
-  * Add preinst script which aborts if dangerous symlinks exist.
-    (closes: #608793)
-
-  [ Peter Howard ]
-  * Added to README.Debian with info about images and events directories.
-    (closes: #608793)
-
- -- Vagrant Cascadian <vagrant@debian.org>  Sat, 15 Jan 2011 19:39:26 -0800
-
-zoneminder (1.24.2-7) unstable; urgency=medium
-
-  * Do not set ownership of /var/cache/zoneminder when upgrading, which fixes a
-    regression causing upgrades to take inordinately long with large
-    installations (closes: #597040).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 17 Sep 2010 11:24:41 -0700
-
-zoneminder (1.24.2-6) unstable; urgency=low
-
-  * Only remove database on purge. This requires only creating the database if
-    it doesn't already exist, and upgrading the database only if the database
-    is an older version (closes: #497107).
-
-  * Do not prompt the user on database upgrades by using the --nointeractive
-    flag when calling zmupdate.pl from postinst (closes: #595902).
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 10 Sep 2010 10:06:06 -0700
-
-zoneminder (1.24.2-5) unstable; urgency=low
-
-  [ Peter Howard ]
-  * Add zip dependency
-    (closes: #494261)
-  * Add debian/watch file
-    (closes: #545552)
-  * Use packaged libjs-mootools
-    (closes: #585590)
-  * Miscellaneous cleanups
-
-  [ Vagrant Cascadian ]
-  * Add vagrant@debian.org as uploader
-  * Update Standards-Version to 3.9.0, no changes necessary.
-
- -- Vagrant Cascadian <vagrant@debian.org>  Fri, 23 Jul 2010 18:12:50 -0500
-
-zoneminder (1.24.2-4.1) unstable; urgency=low
-
-  * Non-maintainer upload.
-  * Fix "package removed, processes still running": apply patch to
-    debian/postinst by Vagrant Cascadian: use invoke-rc.d and run
-    mysql-related actions only when mysql is running (closes: #583648).
-
- -- gregor herrmann <gregoa@debian.org>  Thu, 01 Jul 2010 19:47:10 +0200
-
-zoneminder (1.24.2-4) unstable; urgency=high
-  * Update init.d to list mysql dependency
-    (closes: #583505)
-  * Change depenency from libmime-perl to libmime-tools-perl
-    (closes: #585589)
-  * Problems in changelog format fixed
-    (closes: #585592)
-  * Fix debian-rules-ignores-make-clean-error
-    (closes: #585593)
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 14 jun 2010 15:02:10 +1000
-
-zoneminder (1.24.2-3) unstable; urgency=high
-  * Changes symbols to build with libjpeg8
-    (closes: #565326, #568327)
-  * Note: location of all perl files should have been fixed in previous release
-    (closes: #553096)
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 apr 2010 15:02:10 +1000
-
-zoneminder (1.24.2-2) unstable; urgency=high
-
-  * Remove custom perl parth from zmpkg.pl, fix location of manpages.
-    (closes: #551746, #553092)
-  * Fix GCC4.4 bug
-    (closes: #531717)
-  * Fix potential bug in postinst script
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Nov 2009 15:02:10 +1000
-
-zoneminder (1.24.2-1) unstable; urgency=high
-
-  * Initial release of zoneminder 1.24.2
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 11 Sep 2009 07:02:50 +1000
-
-zoneminder (1.24.1-1) unstable; urgency=high
-
-  * Initial release of zoneminder 1.24.1, closing CVE-2008-3882,
-    CVE-2008-3881, CVE-2008-3880
-    (closes: #497640)
-  * Change syslog dependency to rsyslog.
-    (closes: #526918)
-  * Add missing perl depenency.
-  * Restore patch to disable "check for updates" by default.
-  * Removed spurious '$' in init script.
-    (closes: #486064)
-  * Change permission of zm.conf from 0600 to 0400 for CVE-2008-6755
-    (closes: #528252)
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 16 May 2009 07:02:50 +1000
-
-zoneminder (1.23.3-4) unstable; urgency=high
-
-  * update to get it building with latest unstable. Thanks to waldi@debian.org
-    (closes: #517569)
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 16 Apr 2009 01:02:50 +1000
-
-zoneminder (1.23.3-3) unstable; urgency=high
-
-  * ffmpeg confirmed  working
-    (closes: #475145)
-  * Fix upgrade problem intrudouced in 1.23.3-1
-    (closes: #481637)
-  * Include libmime-lite-perl in dependencies
-    (closes: #486312)
- -- Peter Howard <pjh@northern-ridge.com.au>  Thu, 18 Sep 2008 01:02:50 +1000
-
-zoneminder (1.23.3-2) unstable; urgency=high
-
-  * ffmpeg finally working?
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 13 Aug 2008 01:02:50 +1000
-
-zoneminder (1.23.3-1) unstable; urgency=high
-
-  * Initial version for 1.23.3 - security fix.
-    (closes: #479034)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
-
-zoneminder (1.23.2-2) unstable; urgency=low
-
-  * Update to init.d
-    (closes: #468856)
-  * Add dependency on logging daemon
-    (closes: #471277)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed, 19 Mar 2008 01:02:50 +1000
-
-zoneminder (1.23.2-1) unstable; urgency=low
-
-  * Initial version for 1.23.2
-    (closes: #464152)
-  * Zoneminder 1.23.2 upstream includes fix for GCC 4.3
-    (closes: #454980)
-  * Includes ffmpeg patch by Alexander Kushnirenko <kushnir@uni-protvino.ru>
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 01 Mar 2008 16:02:50 +1000
-
-zoneminder (1.22.3-10) unstable; urgency=low
-
-  * Fix bug introduced in -9 where perl is put under /usr/local
-    (closes: #457507)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 24 Dec 2007 16:02:50 +1000
-
-zoneminder (1.22.3-9) unstable; urgency=low
-
-  * Starting zoneminder via init script now  invokes "zmfix -a"
-    (closes: #481637)
-  * Change apache2-mpm-prefork dependency to apache2
-  * Temp dir for export under /var/cache/zoneminder (but linked back to
-    /usr/share/zoneminder for now)
-  * Redo use of gnutls rather than openssl for md5 hashes
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 10 Dec 2007 16:02:50 +1000
-
-zoneminder (1.22.3-8) unstable; urgency=low
-
-  * Build now includes libpcre3
-    (closes: #437533)
-  * "Monitor Presets" patch now applied to package during build.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 18 Aug 2007 14:35:23 +1000
-
-zoneminder (1.22.3-7) unstable; urgency=low
-
-  * Turn off debug trace and crash dump on build
-    (closes:#414857,#414891)
-  * Additional perl libraries added in dependencies
-    (closes:#416291)
-  * Change preferred PHP version from 4 to 5
- -- Peter Howard <pjh@northern-ridge.com.au>  Sun, 29 Jul 2007 15:11:13 +1000
-
-zoneminder (1.22.3-6) unstable; urgency=low
-
-  * Removed a similar bash only statement from zmpkg.pl
-    (closes:414882)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Sat, 14 Apr 2007 11:46:56 +1000
-
-zoneminder (1.22.3-5) unstable; urgency=low
-
-  * Installs with "phone home" feature turned off by default, and permissions
-    on /etc/zm/zm.conf fixed (now the 0600 it s hould be)
-    (closes:415349)
-  * Removed "stupid bash-ism" on mysqld check in postinst file.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri,  6 Apr 2007 15:50:00 +1000
-
-zoneminder (1.22.3-4) unstable; urgency=low
-
-  * Put libmysqlclient-15-dev in front of -14-dev so sbuild works
-    (closes: #414410)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 12 Mar 2007 11:38:56 +1100
-
-zoneminder (1.22.3-3) unstable; urgency=low
-
-  * Clean up of postinstall, postrm ; user "zm" definitely was a mistake
-  * Also in postinstall: check and start MySQL if it's not running.
-  * init.d script now checks if zoneminder isn't running and still returns 0
-    (which helps uninstalling)
-  * Addition of php5 dependency options as well as php4.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Mon, 26 Feb 2007 10:40:52 +1100
-
-zoneminder (1.22.3-2) unstable; urgency=low
-
-  * Added zmuser in the mysql creation; this should fix the install problem
-    for people, but needs to be cleaned up (in -3)
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Fri, 16 Feb 2007 14:16:03 +1100
-
-zoneminder (1.22.3-1) unstable; urgency=low
-
-  * Initial Version. (closes: #248393)
-  * Patched out use of openssl; uses gnutls instead for MD5 hashes.
-  * Removed MakeMaker-inserted Perl licensing (with authors permission) in
-    various scripts; replaced with GPL.
-
- -- Peter Howard <pjh@northern-ridge.com.au>  Wed,  7 Feb 2007 14:09:01 +1100
diff --git a/distros/ubuntu1504_cmake/compat b/distros/ubuntu1504_cmake/compat
deleted file mode 100644
index ec635144f..000000000
--- a/distros/ubuntu1504_cmake/compat
+++ /dev/null
@@ -1 +0,0 @@
-9
diff --git a/distros/ubuntu1504_cmake/control b/distros/ubuntu1504_cmake/control
deleted file mode 100644
index 65e11fac9..000000000
--- a/distros/ubuntu1504_cmake/control
+++ /dev/null
@@ -1,140 +0,0 @@
-Source: zoneminder
-Section: net
-Priority: optional
-Maintainer: Dmitry Smirnov <onlyjob@debian.org>
-Uploaders: Vagrant Cascadian <vagrant@debian.org>
-Build-Depends: debhelper (>= 9), dh-systemd, python-sphinx | python3-sphinx, apache2-dev, dh-linktree
-              ,cmake
-              ,libavcodec-ffmpeg-dev, libavformat-ffmpeg-dev, libswscale-ffmpeg-dev, libavutil-ffmpeg-dev, libavdevice-ffmpeg-dev
-              ,libbz2-dev
-              ,libdate-manip-perl
-              ,libdbd-mysql-perl
-              ,libgcrypt-dev
-              ,libcurl4-gnutls-dev
-              ,libgnutls-openssl-dev
-              ,libjpeg-dev
-              ,libmysqlclient-dev
-              ,libpcre3-dev
-              ,libphp-serialization-perl
-              ,libpolkit-gobject-1-dev
-              ,libsys-mmap-perl [!hurd-any]
-              ,libv4l-dev (>= 0.8.3) [!hurd-any]
-              ,libvlc-dev
-              ,libwww-perl
-# Unbundled (dh_linktree):
-        ,libjs-jquery
-        ,libjs-mootools
-Standards-Version: 3.9.6
-Homepage: http://www.zoneminder.com/
-Vcs-Browser: http://anonscm.debian.org/cgit/collab-maint/zoneminder.git
-Vcs-Git: git://anonscm.debian.org/collab-maint/zoneminder.git
-
-Package: zoneminder
-Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${perl:Depends}
-        ,javascript-common
-        ,libav-tools
-        ,libdate-manip-perl
-        ,libmime-lite-perl
-        ,libmime-tools-perl
-        ,libphp-serialization-perl
-        ,libmodule-load-conditional-perl
-        ,libnet-sftp-foreign-perl
-#       ,libzoneminder-perl (= ${source:Version})
-          ,libarchive-zip-perl
-          ,libdbd-mysql-perl
-          ,libdevice-serialport-perl
-          ,libimage-info-perl
-          ,libjson-any-perl
-          ,libsys-mmap-perl [!hurd-any]
-          ,liburi-encode-perl
-          ,libwww-perl
-        ,mysql-client | virtual-mysql-client
-        ,perl-modules
-        ,php5-mysql
-        ,policykit-1
-        ,rsyslog | system-log-daemon
-        ,zip
-Recommends: ${misc:Recommends}
-           ,libapache2-mod-php5 | php5-fpm
-           ,mysql-server | virtual-mysql-server
-           ,zoneminder-doc (>= ${source:Version})
-Suggests: fcgiwrap, logrotate
-Description: video camera security and surveillance solution
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
-
-#Package: libzoneminder-perl
-#Section: perl
-#Architecture: all
-#Multi-Arch: foreign
-#Depends: ${misc:Depends}, ${perl:Depends}
-#        ,libarchive-zip-perl
-#        ,libdbd-mysql-perl
-#        ,libdevice-serialport-perl
-#        ,libimage-info-perl
-#        ,libjson-any-perl
-#        ,libsys-mmap-perl [!hurd-any]
-#        ,liburi-encode-perl
-#        ,libwww-perl
-#Description: ZoneMinder Perl libraries
-# ZoneMinder is intended for use in single or multi-camera video security
-# applications, including commercial or home CCTV, theft prevention and child
-# or family member or home monitoring and other care scenarios. It
-# supports capture, analysis, recording, and monitoring of video data coming
-# from one or more video or network cameras attached to a Linux system.
-# ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
-# cameras using a variety of protocols. It is suitable for use as a home
-# video security system and for commercial or professional video security
-# and surveillance. It can also be integrated into a home automation system
-# via X.10 or other protocols.
-# .
-# This package provides ZoneMinder Perl libraries; it can be used to
-# write custom interfaces as well.
-
-Package: zoneminder-doc
-Section: doc
-Architecture: all
-Multi-Arch: foreign
-Depends: ${misc:Depends}, ${sphinxdoc:Depends}, python-sphinx-rtd-theme | python3-sphinx-rtd-theme
-Suggests: www-browser
-Description: ZoneMinder documentation
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
- .
- This package provides ZoneMinder documentation in HTML format.
-
-Package: zoneminder-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: zoneminder (= ${binary:Version}), ${misc:Depends}
-Description: Zoneminder -- debugging symbols
- ZoneMinder is intended for use in single or multi-camera video security
- applications, including commercial or home CCTV, theft prevention and child
- or family member or home monitoring and other care scenarios. It
- supports capture, analysis, recording, and monitoring of video data coming
- from one or more video or network cameras attached to a Linux system.
- ZoneMinder also support web and semi-automatic control of Pan/Tilt/Zoom
- cameras using a variety of protocols. It is suitable for use as a home
- video security system and for commercial or professional video security
- and surveillance. It can also be integrated into a home automation system
- via X.10 or other protocols.
- .
- This package provides debugging symbols
diff --git a/distros/ubuntu1504_cmake/copyright b/distros/ubuntu1504_cmake/copyright
deleted file mode 100644
index c48025a25..000000000
--- a/distros/ubuntu1504_cmake/copyright
+++ /dev/null
@@ -1,174 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: ZoneMinder
-Upstream-Contact: Philip Coombes <philip.coombes@zoneminder.com>
-Source: https://github.com/ZoneMinder/ZoneMinder
-Comment:
- This package was originally debianized by matrix <matrix@cecilia>
- on Mon,  7 Mar 2005 02:07:57 -0500.
- It was re-done for submission to the Debian project by Peter Howard
- <pjh@northern-ridge.com.au> on Fri, 8 Dec 2006 10:19:43 +1100
-Files-Excluded:
-    web/skins/*/js/jquery-*
-    web/tools/mootools/*-yc.js
-
-Files: *
-Copyright: 2001-2014 Philip Coombes <philip.coombes@zoneminder.com>
-           2008      Brian Rudy <brudyNO@SPAMpraecogito.com>
-           2014      Vincent Giovannone
-           2013      Tim Craig <timcraigNO@SPAMsonic.net>
-           2003-2008 Corey DeLasaux
-           2001-2010 Chris Kistner
-License: GPL-2+
-
-Files: distros/*
-Copyright: 2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
-           2014      Isaac Connor <iconnor@connortechnology.com>
-           2005      Serg Oskin
-License: GPL-2+
-
-Files: web/skins/*/js/jquery-*
-Copyright: 2010 John Resig
-           2010 The Dojo Foundation
-License: GPL-2 or Expat
-Comment:
- Dual licensed under the MIT or GPL Version 2 licenses.
- http://jquery.org/license
- .
- Includes Sizzle.js http://sizzlejs.com/
- Released under the MIT, BSD, and GPL Licenses.
-
-Files: web/tools/mootools/*.js
-Copyright: 2009      Marcelo Jorge Vieira (metal) <metal@alucinados.com>
-           2006-2010 Valerio Proietti (http://mad4milk.net/)
-License: Expat
-
-Files: web/api/*
-Copyright: 2005-2013 Cake Software Foundation, Inc. (http://cakefoundation.org)
-License: Expat
-
-Files:
-    cmake/Modules/CheckPrototypeDefinition*.cmake
-    cmake/Modules/FindGLIB2.cmake
-    cmake/Modules/FindPolkit.cmake
-    cmake/Modules/GNUInstallDirs.cmake
-Copyright:
-    2005-2011 Kitware, Inc.
-    2010-2011 Andreas Schneider <asn@cryptomilk.org>
-    2009      Dario Freddi <drf@kde.org>
-    2008      Laurent Montel, <montel@kde.org>
-    2011      Nikita Krupen'ko <krnekit@gmail.com>
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions are
- met:
- .
-  * Redistributions of source code must retain the above copyright notice,
-    this list of conditions and the following disclaimer.
- .
-  * Redistributions in binary form must reproduce the above copyright notice,
-    this list of conditions and the following disclaimer in the documentation
-    and/or other materials provided with the distribution.
- .
-  * The names of Kitware, Inc., the Insight Consortium, or the names of
-    any consortium members, or of any contributors, may not be used to
-    endorse or promote products derived from this software without
-    specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDER AND CONTRIBUTORS ``AS IS''
- AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
- SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
- OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
- OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-Files: cmake/Modules/FindPerlModules.cmake
-Copyright: 2012 Iowa State University
-License: Boost-1.0
- Boost Software License - Version 1.0 - August 17th, 2003
- .
- Permission is hereby granted, free of charge, to any person or organization
- obtaining a copy of the software and accompanying documentation covered by
- this license (the "Software") to use, reproduce, display, distribute,
- execute, and transmit the Software, and to prepare derivative works of the
- Software, and to permit third-parties to whom the Software is furnished to
- do so, all subject to the following:
- .
- The copyright notices in the Software and this entire statement, including
- the above license grant, this restriction and the following disclaimer,
- must be included in all copies of the Software, in whole or in part, and
- all derivative works of the Software, unless such copies or derivative
- works are solely in the form of machine-executable object code generated by
- a source language processor.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE, TITLE AND NON-INFRINGEMENT. IN NO EVENT
- SHALL THE COPYRIGHT HOLDERS OR ANYONE DISTRIBUTING THE SOFTWARE BE LIABLE
- FOR ANY DAMAGES OR OTHER LIABILITY, WHETHER IN CONTRACT, TORT OR OTHERWISE,
- ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- DEALINGS IN THE SOFTWARE.
-
-Files: debian/*
-Copyright: 2015      Dmitry Smirnov <onlyjob@debian.org>
-           2007-2014 Peter Howard <pjh@northern-ridge.com.au>
-           2010-2012 Vagrant Cascadian <vagrant@debian.org>
-           2001-2008 Philip Coombes <philip.coombes@zoneminder.com>
-License: GPL-2+
-
-License: Expat
-  Permission is hereby granted, free of charge, to any person obtaining a copy
-  of this software and associated documentation files (the "Software"), to deal
-  in the Software without restriction, including without limitation the rights
-  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-  copies of the Software, and to permit persons to whom the Software is
-  furnished to do so, subject to the following conditions:
-  .
-  The above copyright notice and this permission notice shall be included in
-  all copies or substantial portions of the Software.
-  .
-  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-  THE SOFTWARE.
-
-License: GPL-2+
- This package is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; either version 2 of the License, or (at your
- option) any later version.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
-
-License: GPL-2
- This package is free software; you can redistribute it and/or modify it
- under the terms of the GNU General Public License as published by the
- Free Software Foundation; version 2 of the License.
- .
- This package is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- General Public License for more details.
- .
- You should have received a copy of the GNU General Public
- License along with this package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
- .
- The complete text of the GNU General Public License version 2
- can be found in "/usr/share/common-licenses/GPL-2".
diff --git a/distros/ubuntu1504_cmake/patches/series b/distros/ubuntu1504_cmake/patches/series
deleted file mode 100644
index fc70f4006..000000000
--- a/distros/ubuntu1504_cmake/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-default_cgi-path.patch
-use_libjs-mootools.patch
diff --git a/distros/ubuntu1504_cmake/rules b/distros/ubuntu1504_cmake/rules
deleted file mode 100755
index bf8012aa8..000000000
--- a/distros/ubuntu1504_cmake/rules
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND += -Wl,--as-needed
-
-ifeq ($(DEB_BUILD_ARCH_OS),hurd)
-ARGS:= -DZM_NO_MMAP=ON
-endif
-
-%:
-	dh $@ --parallel --buildsystem=cmake --builddirectory=dbuild \
-            --with systemd,sphinxdoc,apache2,linktree
-
-override_dh_auto_configure:
-	dh_auto_configure -- $(ARGS)                  \
-            -DCMAKE_VERBOSE_MAKEFILE=ON                \
-            -DCMAKE_BUILD_TYPE=Release                 \
-            -DZM_CONFIG_DIR="/etc/zm"                  \
-            -DZM_RUNDIR="/var/run/zm"                  \
-            -DZM_SOCKDIR="/var/run/zm"                 \
-            -DZM_TMPDIR="/tmp/zm"                      \
-            -DZM_CGIDIR="/usr/lib/zoneminder/cgi-bin"  \
-            -DZM_CONTENTDIR="/var/cache/zoneminder"
-
-override_dh_clean:
-	dh_clean $(MANPAGES1)
-	$(RM) -r docs/_build docs/installationguide
-
-build-indep:
-	#$(MAKE) -C docs text
-	$(MAKE) -C docs html
-
-MANPAGES1 = dbuild/scripts/zmupdate.pl.1
-$(MANPAGES1):
-	# generate man page(s):
-	pod2man -s1 --stderr --utf8 $(patsubst %.1, %, $@) $@
-
-## reproducible build:
-LAST_CHANGE=$(shell dpkg-parsechangelog -S Date)
-BUILD_DATE=$(shell LC_ALL=C date -u "+%B %d, %Y" -d "$(LAST_CHANGE)")
-override_dh_installman: $(MANPAGES1)
-	$(MAKE) -C docs man SPHINXOPTS="-D today=\"$(BUILD_DATE)\""
-	dh_installman --language=C $(MANPAGES1)
-
-override_dh_auto_install:
-	dh_auto_install --destdir=$(CURDIR)/debian/tmp
-	# remove worthless files:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*/*/.packlist
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/perl5/*/*.in
-	# remove empty directories:
-	find $(CURDIR)/debian/tmp/usr -type d -empty -delete -printf 'removed %p\n'
-	# remove extra-license-file:
-	$(RM) -v $(CURDIR)/debian/tmp/usr/share/zoneminder/www/api/lib/Cake/LICENSE.txt
-
-override_dh_fixperms:
-	dh_fixperms
-	## 637685
-	chmod -c o-r $(CURDIR)/debian/zoneminder/etc/zm/zm.conf
-
-override_dh_installinit:
-	dh_installinit --no-start
-
-override_dh_systemd_start:
-	dh_systemd_start --no-start
-
-override_dh_systemd_enable:
-	dh_systemd_enable --no-enable
-
-override_dh_apache2:
-	dh_apache2 --noenable
-
-override_dh_strip:
-	[ -d "$(CURDIR)/debian/zoneminder-dbg" ] \
-        && dh_strip --dbg-package=zoneminder-dbg \
-        || dh_strip
-
-#%:
-#	dh $@ --parallel --buildsystem=autoconf --with autoreconf
-#
-#override_dh_auto_configure:
-#	dh_auto_configure -- \
-#            --sysconfdir=/etc/zm \
-#            --with-mysql=/usr \
-#            --with-webdir=/usr/share/zoneminder \
-#            --with-ffmpeg=/usr \
-#            --with-cgidir=/usr/lib/cgi-bin \
-#            --with-webuser=www-data \
-#            --with-webgroup=www-data \
-#            --enable-mmap=yes
diff --git a/distros/ubuntu1504_cmake/source/format b/distros/ubuntu1504_cmake/source/format
deleted file mode 100644
index 89ae9db8f..000000000
--- a/distros/ubuntu1504_cmake/source/format
+++ /dev/null
@@ -1 +0,0 @@
-3.0 (native)
diff --git a/distros/ubuntu1504_cmake/watch b/distros/ubuntu1504_cmake/watch
deleted file mode 100644
index 7ee690edb..000000000
--- a/distros/ubuntu1504_cmake/watch
+++ /dev/null
@@ -1,7 +0,0 @@
-version=3
-
-opts=\
-repacksuffix=+dfsg,\
-dversionmangle=s{\+dfsg\d*}{},\
- https://github.com/ZoneMinder/ZoneMinder/releases \
-  .*/ZoneMinder/archive/v(.*).tar.gz
diff --git a/distros/ubuntu1504_cmake/zoneminder.postinst b/distros/ubuntu1504_cmake/zoneminder.postinst
deleted file mode 100644
index 82b256e6b..000000000
--- a/distros/ubuntu1504_cmake/zoneminder.postinst
+++ /dev/null
@@ -1,30 +0,0 @@
-#! /bin/sh
-
-set -e
-
-. /etc/zm/zm.conf
-
-if [ "$1" = "configure" ]; then
-		chown www-data:root /var/log/zm
-		chown www-data:www-data /var/lib/zm
-		if [ -z "$2" ]; then
-			chown www-data:www-data -R /var/cache/zoneminder
-		fi
-
-	# Do this every time the package is installed or upgraded
-	# Test for database presence to avoid failure of zmupdate.pl
-
-    # Ensure zoneminder is stopped
-    deb-systemd-invoke stop zoneminder.service || exit $?
-
-	if [ "$ZM_DB_HOST" = "localhost" ]; then
-		echo 'grant lock tables, create, index, alter on zm.* to 'zmuser'@localhost identified by "zmpass";' | mysql --defaults-file=/etc/mysql/debian.cnf mysql
-		# Run the ZoneMinder update tool
-		zmupdate.pl --nointeractive
-	else
-		echo "Not doing database upgrade due to remote db server ($ZM_DB_HOST)"
- 	fi;
-
-fi
-
-#DEBHELPER#
diff --git a/distros/ubuntu1504_cmake/zoneminder.service b/distros/ubuntu1504_cmake/zoneminder.service
deleted file mode 100644
index e3575c039..000000000
--- a/distros/ubuntu1504_cmake/zoneminder.service
+++ /dev/null
@@ -1,20 +0,0 @@
-# ZoneMinder systemd unit file
-# This file is intended to work with Debian distributions
-
-[Unit]
-Description=ZoneMinder CCTV recording and surveillance system
-After=network.target mysql.service
-# Remarked out so that it will start ZM on machines that don't have mysql installed
-#Requires=mysql.service
-
-[Service]
-#User=www-data
-Type=forking
-ExecStart=/usr/bin/zmpkg.pl start
-ExecReload=/usr/bin/zmpkg.pl restart
-ExecStop=/usr/bin/zmpkg.pl stop
-PIDFile=/var/run/zm/zm.pid
-Restart=on-abnormal
-
-[Install]
-WantedBy=multi-user.target
diff --git a/distros/ubuntu1504_cmake/zoneminder.tmpfile b/distros/ubuntu1504_cmake/zoneminder.tmpfile
deleted file mode 100644
index d307c6640..000000000
--- a/distros/ubuntu1504_cmake/zoneminder.tmpfile
+++ /dev/null
@@ -1,2 +0,0 @@
-d /var/run/zm 0755 www-data www-data
-d /tmp/zm     0755 www-data www-data
diff --git a/distros/ubuntu1504_cmake_split_packages/control b/distros/ubuntu1504_cmake_split_packages/control
index 4a152c46b..5f313897f 100644
--- a/distros/ubuntu1504_cmake_split_packages/control
+++ b/distros/ubuntu1504_cmake_split_packages/control
@@ -28,9 +28,7 @@ Depends: ${misc:Depends},
  zoneminder-database (>= ${source:Version}),
  zoneminder-core (>= ${binary:Version}),
  zoneminder-ui-base (>= ${source:Version}),
- zoneminder-ui-classic (>= ${source:Version}),
- zoneminder-ui-mobile (>= ${source:Version}),
- zoneminder-ui-xml (>= ${source:Version})
+ zoneminder-ui-classic (>= ${source:Version})
 Description: Video camera security and surveillance solution (metapackage)
  ZoneMinder is intended for use in single or multi-camera video security
  applications, including commercial or home CCTV, theft prevention and child
@@ -78,6 +76,8 @@ Depends: libzoneminder-perl (= ${source:Version}),
  libmime-tools-perl, libnet-sftp-foreign-perl, libphp-serialization-perl,
  debconf, ffmpeg | libav-tools, rsyslog | system-log-daemon, zip,
  policykit-1, apache2, libmp4v2-2, libpcre++0
+, libsys-cpu-perl, libsys-meminfo-perl
+, libdata-dump-perl, libclass-std-fast-perl, libsoap-wsdl-perl, libio-socket-multicast-perl, libdigest-sha-perl
 Description: Core binaries and perl scripts for ZoneMinder
  ZoneMinder is a video camera security and surveillance solution.
  .
@@ -117,25 +117,6 @@ Description: Classic web user interface for ZoneMinder
  .
  This package provides the classic web user interface.
 
-Package: zoneminder-ui-mobile
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: Mobile web user interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides the web user interface for mobile devices.
-
-Package: zoneminder-ui-xml
-Section: web
-Architecture: all
-Depends: zoneminder-ui-base (>= ${source:Version}), ${misc:Depends}
-Description: XML interface for ZoneMinder
- ZoneMinder is a video camera security and surveillance solution.
- .
- This package provides a XML interface mainly intended for use with the eyeZm
- iPhone Application, but can be used with any other custom programs as well.
-
 Package: zoneminder-ui-api
 Section: web
 Architecture: all
diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install b/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install
deleted file mode 100644
index 464bb74eb..000000000
--- a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-mobile.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/mobile
diff --git a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install b/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install
deleted file mode 100644
index 6617707f8..000000000
--- a/distros/ubuntu1504_cmake_split_packages/zoneminder-ui-xml.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/zoneminder/skins/xml
diff --git a/docs/faq.rst b/docs/faq.rst
index 5aa736ee8..1c5c36d09 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -514,6 +514,8 @@ You do not need to rebuild ZM for X10 support. You will need to install the perl
 
 Extending Zoneminder
 ------------------------
+.. _runstate_cron_example:
+
 How can I get ZM to do different things at different times of day or week?
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
diff --git a/docs/installationguide/centos.rst b/docs/installationguide/centos.rst
deleted file mode 100644
index 606aaffd5..000000000
--- a/docs/installationguide/centos.rst
+++ /dev/null
@@ -1,5 +0,0 @@
-Centos
-======
-
-
-
diff --git a/docs/installationguide/fedora.rst b/docs/installationguide/fedora.rst
deleted file mode 100644
index 09ffe4297..000000000
--- a/docs/installationguide/fedora.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Fedora
-======
-
-
diff --git a/docs/installationguide/index.rst b/docs/installationguide/index.rst
index be0df2c06..e030ed7cf 100644
--- a/docs/installationguide/index.rst
+++ b/docs/installationguide/index.rst
@@ -8,6 +8,5 @@ Contents:
 
    ubuntu
    debian
-   fedora
-   centos
+   redhat
    multiserver
diff --git a/docs/installationguide/redhat.rst b/docs/installationguide/redhat.rst
new file mode 100644
index 000000000..e15d58aa7
--- /dev/null
+++ b/docs/installationguide/redhat.rst
@@ -0,0 +1,203 @@
+Redhat
+======
+
+.. contents::
+
+These instructions apply to all Redhat distros and their clones, including but not limited to: Fedora, RHEL, CentOS, Scientific Linux, and others. While the installation instructions are the same for each distro, the reason why one might use one distro over the other is different. A short description follows, which is intended to help you chose what distro best fits your needs.
+
+Background: RHEL, CentOS, and Clones
+------------------------------------
+
+These distributions are classified as enterprise operating systems and have a long operating lifetime of many years. By design, they will not have the latest and greatest versions of any package. Instead, stable packages are the emphasis.
+
+Replacing any core package in these distributions with a newer package from a third party is expressly verboten. The ZoneMinder development team will not do this, and neither should you. If you have the perception that you've got to have a newer version of mysql, gnome, apache, etc. then, rather than upgrade these packages, you should instead consider using a different distribution such as Fedora.
+
+The ZoneMinder team will not provide support for systems which have had any core package replaced with a package from a third party.
+
+Background: Fedora
+------------------------------------
+
+One can think of Fedora as RHEL or CentOS Beta. This is, in fact, what it is. Fedora is primarily geared towards development and testing of newer, sometimes bleeding edge, packages. The ZoneMinder team uses this distro to determine the interoperability of ZoneMinder with the latest and greatest versions of packages like mysql, apache, systemd, and others. If a problem is detected, it will be addressed long before it makes it way into RHEL.
+
+Fedora has a short life-cycle of just 6 months. However, Fedora, and consequently ZoneMinder, is available on armv7 architecture. Rejoice, Raspberry Pi users!
+
+If you desire newer packages than what is available in RHEL or CentOS, you should consider using Fedora.
+
+Zmrepo – A ZoneMinder RPM Repository
+------------------------------------
+
+Zmrepo is a turn key solution. It will install all of ZoneMinder's dependencies for you. This is the easiest and the recommended way to install ZoneMinder on any system running a Redhat based distribution. 
+
+Zmrepo supports the two most recent, major releases of each Redhat based distro.
+
+The following notes are based on real problems which have occurred:
+
+- Zmrepo assumes you have installed the underlying distrubution **using the official installation media for that distro**. Third party "Spins" are not supported and may not work correctly.
+
+- ZoneMinder is intended to be installed in an environment dedicated to ZoneMinder. While ZoneMinder will play well with many applications, some invariably will not. Asterisk is one such example.
+
+- Be advised that you need to start with a clean system before using zmrepo.
+
+- If you have previously installed ZoneMinder from-source, then your system is **NOT** clean. You must manually search for and delete all ZoneMinder related files before using zmrepo (look under /usr/local). Make uninstall helps, but it will not do this for you correctly. You **WILL** have problems if you ignore this step.
+
+- It is not necessary, and not recommended, to install a LAMP stack ahead of time.
+
+- Disable other third party repos and uninstall any of ZoneMinder's third party dependencies, which might already be on the system, especially ffmpeg and vlc. Attempting to install dependencies yourself often causes problems.
+
+- Each ZoneMinder rpm includes a README file under /usr/share/doc. You must follow the all steps in this README file, precisely, each and every time ZoneMinder is installed or upgraded. **Failure to do so is guaranteed to result in a non-functional system.**
+
+To begin the installation of ZoneMinder on your Redhat based distro, please navigate to: http://zmrepo.zoneminder.com
+
+How to Build a (Custom) ZoneMinder Package
+------------------------------------------
+
+If you are looking to do development or the packages in zmrepo just don't suit you, then you should follow these steps to learn how to build your own ZoneMinder RPM.
+
+Background
+**********
+The following method documents how to build ZoneMinder into an RPM package, compatible with Fedora, Redhat, CentOS, and other compatible clones. This is exactly how the RPMS in zmrepo are built.
+
+The method documented below was chosen because:
+
+- All of ZoneMinder's dependencies are downloaded and installed automatically
+
+- Cross platform capable. The build host does not have to be the same distro or release version as the target.
+
+- Once your build environment is set up, few steps are required to run the build again in the future.
+
+- Troubleshooting becomes easier if we are all building ZoneMinder the same way.
+
+The build instructions below make use of a custom script called "buildzm.sh". Advanced users are encouraged to view the contents of this script. Notice that the script doesn't really do a whole lot. The goal of the script is to simply make the process a little easier for the first time user. Once you become familar with the build process, you can issue the mock commands found in the buildzm.sh script yourself if you so desire.
+
+***IMPORTANT***
+Certain commands in these instructions require root privileges while other commands do not. Pay close attention to this. If the instructions below state to issue a command without a “sudo” prefix, then you should *not* be root while issuing the command. Getting this incorrect will result in a failed build.
+
+Set Up Your Environment
+***********************
+Before you begin, set up an rpmbuild environment by following `this guide <http://wiki.centos.org/HowTos/SetupRpmBuildEnvironment>`_ by the CentOS developers.
+
+Next, navigate to `Zmrepo <http://zmrepo.zoneminder.com/>`_, and follow the instructions to enable zmrepo on your system.  
+
+With zmrepo enabled, issue the following command:
+
+::
+
+    sudo yum install zmrepo-mock-configs mock
+
+
+Add your user account to the group mock:
+
+::
+
+    sudo gpasswd -a {your account name} mock
+
+
+Your build environment is now set up.  
+
+Build from SRPM
+***************
+To continue, you need a ZoneMinder SRPM.  For starters, let's use one of the SRPMS from zmrepo.  Go browse the `Zmrepo <http://zmrepo.zoneminder.com/>`_ site and choose an appropriate SRPM and place it into the ~/rpmbuild/SRPMS folder.  
+
+For CentOS 7, I have chosen the following SRPM:
+
+::
+
+    wget -P ~/rpmbuild/SRPMS http://zmrepo.zoneminder.com/el/7/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+
+
+Now comes the fun part. To build ZoneMinder, issue the following command:
+
+::
+
+    buildzm.sh zmrepo-el7-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+
+
+Want to build ZoneMinder for Fedora, instead of CentOS, from the same host?  Once you download the Fedora SRPM, issue the following:
+
+::
+
+    buildzm.sh zmrepo-f21-x86_64 ~/rpmbuild/SRPMS/zoneminder-1.28.1-1.fc21.src.rpm
+
+Notice that the buildzm.sh tool requires the following parameters:
+
+::
+
+    buildzm.sh MOCKCONFIG ZONEMINDER_SRPM
+
+The list of available Mock config files are available here:
+
+::
+
+    ls /etc/mock/zmrepo*.cfg
+
+
+You choose the config file based on the desired distro (e.g. el6, el7, f20, f21) and basearch (e.g. x86, x86_64, arhmhfp). Notice that, when specifying the Mock config as a commandline parameter, you should leave off the ".cfg" filename extension.
+
+Installation
+************
+Once the build completes, you will be presented with a folder containing the RPM's that were built.  Copy the newly built ZoneMinder RPM to the desired system, enable zmrepo per the instruction on the `Zmrepo <http://zmrepo.zoneminder.com/>`_
+website, and then install the rpm by issuing the appropriate yum install command. Finish the installation by following the zoneminder setup instructions in the distro specific readme file, named README.{distroname}, which will be installed into the /usr/share/doc/zoneminder* folder. 
+
+Finally, you may want to consider editing the zmrepo repo file under /etc/yum.repos.d and placing an “exclude=zoneminder*” line into the config file.  This will prevent your system from overwriting your manually built RPM with the ZoneMinder RPM found in the repo.
+
+How to Modify the Source Prior to Build
+***************************************
+Before attempting this part of the instructions, make sure and follow the previous instructions for building one of the unmodified SRPMS from zmrepo. Knowing this part works will assist in troubleshooting should something go wrong.
+
+These instructions may vary depending on what exactly you want to do.  The following example assumes you want to build a development snapshot from the master branch.
+
+From the previous instructions, we downloaded a CentOS 7 ZoneMinder SRPM and placed it into ~/rpmbuild/SRPMS. For this example, install it onto your system:
+
+::
+
+    rpm -ivh ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm
+
+
+IMPORTANT: This operation must be done with your normal user account. Do *not* perform this command as root.
+
+Make sure you have git installed:
+
+::
+
+    sudo yum install git
+
+
+Now clone the ZoneMinder git repository:
+
+::
+
+    cd
+    git clone https://github.com/ZoneMinder/ZoneMinder
+    cd ZoneMinder
+    git submodule init
+    git submodule update
+
+This will create a sub-folder called ZoneMinder, which will contain the latest development.
+
+We want to turn this into a tarball, but first we need to figure out what to name it. Look here:
+
+::
+
+    ls ~/rpmbuild/SOURCES
+
+The tarball from the previsouly installed SRPM should be there. This is the name we will use.  For this example, the name is ZoneMinder-1.28.1.tar.gz.  From one folder above the local ZoneMinder git repository, execute the following:
+
+::
+
+    mv ZoneMinder ZoneMinder-1.28.1
+    tar -cvzf ~/rpmbuild/SOURCES/ZoneMinder-1.28.1.tar.gz ZoneMinder-1.28.1/*
+
+The trailing "/\*" leaves off the hidden dot "." file and folders from the git repo, which is what we want.
+Note that we are overwriting the original tarball. If you wish to keep the original tarball then create a copy prior to creating the new tarball.
+
+Now build a new src.rpm:
+
+::
+
+    rpmbuild -bs --nodeps ~/rpmbuild/SPECS/zoneminder.el7.spec
+
+This step will overwrite the SRPM you originally downloaded, so you may want to back it up prior to completing this step. Note that the name of the specfile will vary slightly depending on the target distro.
+
+You should now have a new SRPM under ~/rpmbuild/SRPMS. In our example, the SRPM is called zoneminder-1.28.1-2.el7.centos.src.rpm. Now follow the previous instructions that describe how to use the buildzm script, using ~/rpmbuild/SRPMS/zoneminder-1.28.1-2.el7.centos.src.rpm as the path to your SRPM.
+
+
diff --git a/docs/installationguide/ubuntu.rst b/docs/installationguide/ubuntu.rst
index bad2b651d..80cb27552 100644
--- a/docs/installationguide/ubuntu.rst
+++ b/docs/installationguide/ubuntu.rst
@@ -181,7 +181,7 @@ Easy Way: Install ZoneMinder from a package (Ubuntu 14.x)
 
 **Step 4:**:Some tweaks that will be needed:
 
-Edit /etc/init.d/zoneminder:
+Edit ``/etc/init.d/zoneminder``:
 
 add a ``sleep 10`` right after line 25 that reads ``echo -n "Starting $prog:"``
 (The reason we need this sleep is to make sure ZM starts after mysqld starts)
@@ -198,7 +198,7 @@ As of Oct 3 2015, zm.conf is not readable by ZM. This is likely a bug and will g
 
 If you changed the  DB password **after** installing ZM, the APIs will not be able to connect to the DB.
 
-If you have, go to zoneminder/www/api/app/Config & Edit ``database.php``
+If you have, go to ``/usr/share/zoneminder/www/api/app/Config`` & Edit ``database.php``
 
 There is a class there called ``DATABASE_CONFIG`` - change the ``$default`` array to reflect your new details. Example:
 
@@ -224,7 +224,7 @@ We also need to install php5-gd (as of 1.28.107, this is not installed)
 
 **Step 6**: Edit Timezone in PHP
 
-vi /etc/php5/apache2/php.ini
+``sudo vi /etc/php5/apache2/php.ini``
 Look for [Date] and inside it you will see a date.timezone
 that is commented. remove the comment and specific your timezone.
 Please make sure the timezone is valid (see [this](http://php.net/manual/en/timezones.php))
@@ -247,7 +247,7 @@ restart:
 ::
 
 	sudo service apache2 restart
-	/etc/init.d/zoneminder restart
+	sudo service zoneminder restart
 
 **Step 8**: Making sure ZM and APIs work: (optional - only if you need APIs)
 
diff --git a/docs/userguide/components.rst b/docs/userguide/components.rst
index ebedc8c7e..48aff0be4 100644
--- a/docs/userguide/components.rst
+++ b/docs/userguide/components.rst
@@ -26,16 +26,13 @@ Binaries
 
 PHP
 ---
-As well as this there are the web PHP files in the web directory. Currently these consist of 4 possible skins.
+As well as this there are the web PHP files in the web directory. Currently these consist of a single skin with Classic and Flat styles.
 
 **Classic**
   Original ZoneMinder skin
 **Flat**
-  An updated version of classic skin, retaining the same layout with a more modern style
-**XML**
-  Displays certain views as XML. Used by eyeZM as an interfacing skin (Note that eyeZM no longer seems to work with later versions of Zoneminder). New developers of 3rd party clients should use the API instead (:doc:`../api`)
-**Mobile**
-  A skin that displays views in a more condensed and single page format, likely suitable for smaller mobile devices, should one choose to access the ZoneMinder console using such devices. Note that there are also third party mobile clients one could use (:doc:`mobile`)
+  An updated version of Classic skin, retaining the same layout with a more modern style. Originally a skin this is now just a CSS style.
+
 
 Perl
 ----
diff --git a/docs/userguide/gettingstarted.rst b/docs/userguide/gettingstarted.rst
index 73f6e2783..b2e92f63f 100644
--- a/docs/userguide/gettingstarted.rst
+++ b/docs/userguide/gettingstarted.rst
@@ -67,8 +67,14 @@ own empty screen.
 * **D**: This is the core of ZoneMinder - recording events. It gives you a count of how many events were recorded over the hour, day, week, month.
 * **E**: These are the "Zones". Zones are areas within the camera that you mark as 'hotspots' for motion detection. Simply put, when you first configure your monitors (cameras), by default Zoneminder uses the entire field of view of the camera to detect motion. You may not want this. You may want to create "zones" specifically for detecting motion and ignore others. For example, lets consider a room with a fan that spins. You surely don't want to consider the fan moving continuously a reason for triggering a record? Probably not - in that case, you'd leave the fan out while making your zones.
 * **F**: This is the "source" column that tells you the type of the camera - if its an IP camera, a USB camera or more. In this example, they are all IP cameras. Note the color red on item F ? Well that means there is something wrong with that camera. No wonder the log also shows red. Good indication for you to tap on logs and investigate
-* **G**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Nodect = Don't record till an externa entity via zmtrigger tells Zoneminder to (this is advanced usage).
+* **G**: This defines how Zoneminder will record events. There are various modes. In brief Modect == record if a motion is detected,Record = always record 24x7, Mocord = always record PLUS detect motion,  Monitor = just provide a live view but don't record anytime, Nodect = Don't record till an external entity via zmtrigger tells Zoneminder to (this is advanced usage).
 * **H**: If you click on these links you can view a "Montage" of all your configured monitors or cycle through each one
+* **I**: One of the most often missed features is the ability of ZoneMinder to maintain "run states". If you click on the "Running" text, ZoneMinder brings up a popup that allows you to define additional "states" (referred to as runstates). A runstate is essentially a snapshot that records the state of each monitor and you can switch between states easily. For example, you might have a run state defined that switches all monitors to "monitor" mode in which they are not recording anything while another state that sets some of the monitors to "modect". Why would you want this? A great example is to disable recording when you are at home and enable when you are away, based on time of day or other triggers. You can switch states by selecting an appropriate state manually, or do it automatically via cron jobs, for example. An example of using cron to automatically  switch is provided in the :ref:`FAQ <runstate_cron_example>`.  More esoteric examples of switching run states based on phone location can be found `here <https://forums.zoneminder.com/viewtopic.php?f=9&t=23026>`__.
+
+Here is an example of multiple run states that I've defined. Each one of these runstates changes the mode of specific monitors depending on time of day and other conditions. Use your imagination to decide which conditions require state changes.
+
+.. image:: images/runstates.png
+
 
 
 Adding Monitors
diff --git a/docs/userguide/images/getting-started-understand-console.png b/docs/userguide/images/getting-started-understand-console.png
index 805917f23..f332b4977 100644
Binary files a/docs/userguide/images/getting-started-understand-console.png and b/docs/userguide/images/getting-started-understand-console.png differ
diff --git a/docs/userguide/images/runstates.png b/docs/userguide/images/runstates.png
new file mode 100644
index 000000000..ced74cb55
Binary files /dev/null and b/docs/userguide/images/runstates.png differ
diff --git a/docs/userguide/options.rst b/docs/userguide/options.rst
index 4a0b357f6..8186d8b6a 100644
--- a/docs/userguide/options.rst
+++ b/docs/userguide/options.rst
@@ -19,6 +19,4 @@ If you have changed the value of an option you should then ‘save’ it. A numb
    options/options_upload
    options/options_x10
    options/options_bw
-   options/options_phonebw
-   options/options_eyezm
    options/options_users
diff --git a/docs/userguide/options/options_eyezm.rst b/docs/userguide/options/options_eyezm.rst
deleted file mode 100644
index 21c780bc0..000000000
--- a/docs/userguide/options/options_eyezm.rst
+++ /dev/null
@@ -1,26 +0,0 @@
-Options - eyeZM
----------------
-
-.. NOTE:: 
-	eyeZM does not seem to be actively maintained by the developers and does not work with later versions of ZoneMinder.
-
-
-.. image:: images/Options_eyezm.png
-
-EYEZM_DEBUG - Enable or Disable extra debugging from the eyeZm Plugin. Extra debugging information will be displayed in it's own file (EYEZM_LOG_TO_FILE is set), or your Apache error log
-
-EYEZM_LOG_TO_FILE - When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output generated from the eyeZm Plugin will go to it's own file. Otherwise it will go to the apache error log.
-
-EYEZM_LOG_FILE - Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled. This file will contain it's own output from the eyeZm Plugin when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled.
-
-EYEZM_EVENT_VCODEC - The eyeZm Plugin calls FFMPEG externally to encode the captured images. If your FFMPEG is not built with support for H264, change this to MPEG-4. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+).
-
-EYEZM_FEED_VCODEC - Determines whether the live stream is generated using native MJPEG streaming with ZoneMinder, or H264 using FFMPEG and HTML-5 streaming. If using H264, please check http://www.eyezm.com for H264 requirements and that your eyeZm version supports H264 (v1.2+). This is just a default parameter, and can be overridden with eyeZm.
-
-EYEZM_H264_DEFAULT_BR - Default bit-rate to use with FFMPEG for H264 streaming. When using the eyeZm Plugin to stream H264 data, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.
-
-EYEZM_H264_DEFAULT_EVBR - Default bit-rate to use with FFMPEG for H264 event viewing. When using the eyeZm Plugin to view events in H264, FFMPEG requires a bitrate to control the quality and bandwidth of the video. This should be specified in a format acceptable to FFMPEG. The default value is sufficient for most installations. This is just a default parameter, and can be overridden with eyeZm.
-
-EYEZM_H264_TIMEOUT - Timeout (sec) to wait for H264 stream to start before terminating. The eyeZm Plugin will attempt to spawn an H264 stream when requested, and require that it complete within the timeout specified. If you have a slow system or find through the logs that the H264 stream is not starting because the timeout is expiring, even though FFMPEG is running, try increasing this value. If you have a fast system, decreasing this value can improve the responsiveness when there are issues starting H264 streams.
-
-EYEZM_SEG_DURATION - Segment duration used for streaming using HTTP-5 Streaming protocol. The HTTP-5 Live Streaming Protocol segments the input video stream into small chunks of a duration specified by this parameter. Increasing the segment duration will help with choppy connections on the other end, but will increase the latency in starting a stream.
diff --git a/docs/userguide/options/options_phonebw.rst b/docs/userguide/options/options_phonebw.rst
deleted file mode 100644
index e2389bccf..000000000
--- a/docs/userguide/options/options_phonebw.rst
+++ /dev/null
@@ -1,20 +0,0 @@
-Options - Phone Bandwidth
--------------------------
-
-.. image:: images/Options_BW_Phone.png
-
-WEB_P_CAN_STREAM - Override the automatic detection of browser streaming capability. If you know that your browser can handle image streams of the type 'multipart/x-mixed-replace' but ZoneMinder does not detect this correctly you can set this option to ensure that the stream is delivered with or without the use of the Cambozola plugin. Selecting 'yes' will tell ZoneMinder that your browser can handle the streams natively, 'no' means that it can't and so the plugin will be used while 'auto' lets ZoneMinder decide.
-
-WEB_P_STREAM_METHOD - ZoneMinder can be configured to use either mpeg encoded video or a series or still jpeg images when sending video streams. This option defines which is used. If you choose mpeg you should ensure that you have the appropriate plugins available on your browser whereas choosing jpeg will work natively on Mozilla and related browsers and with a Java applet on Internet Explorer"
-
-WEB_P_DEFAULT_SCALE - Normally ZoneMinder will display 'live' or 'event' streams in their native size. However if you have monitors with large dimensions or a slow link you may prefer to reduce this size, alternatively for small monitors you can enlarge it. This options lets you specify what the default scaling factor will be. It is expressed as a percentage so 100 is normal size, 200 is double size etc.
-
-WEB_P_DEFAULT_RATE - Normally ZoneMinder will display 'event' streams at their native rate, i.e. as close to real-time as possible. However if you have long events it is often convenient to replay them at a faster rate for review. This option lets you specify what the default replay rate will be. It is expressed as a percentage so 100 is normal rate, 200 is double speed etc.
-
-WEB_P_VIDEO_BITRATE - When encoding real video via the ffmpeg library a bit rate can be specified which roughly corresponds to the available bandwidth used for the stream. This setting effectively corresponds to a 'quality' setting for the video. A low value will result in a blocky image whereas a high value will produce a clearer view. Note that this setting does not control the frame rate of the video however the quality of the video produced is affected both by this setting and the frame rate that the video is produced at. A higher frame rate at a particular bit rate result in individual frames being at a lower quality.
-
-WEB_P_VIDEO_MAXFPS - When using streamed video the main control is the bitrate which determines how much data can be transmitted. However a lower bitrate at high frame rates results in a lower quality image. This option allows you to limit the maximum frame rate to ensure that video quality is maintained. An additional advantage is that encoding video at high frame rates is a processor intensive task when for the most part a very high frame rate offers little perceptible improvement over one that has a more manageable resource requirement. Note, this option is implemented as a cap beyond which binary reduction takes place. So if you have a device capturing at 15fps and set this option to 10fps then the video is not produced at 10fps, but rather at 7.5fps (15 divided by 2) as the final frame rate must be the original divided by a power of 2.
-
-WEB_P_SCALE_THUMBS - If unset, this option sends the whole image to the browser which resizes it in the window. If set the image is scaled down on the server before sending a reduced size image to the browser to conserve bandwidth at the cost of cpu on the server. Note that ZM can only perform the resizing if the appropriate PHP graphics functionality is installed. This is usually available in the php-gd package.
-
-WEB_P_AJAX_TIMEOUT - The newer versions of the live feed and event views use Ajax to request information from the server and populate the views dynamically. This option allows you to specify a timeout if required after which requests are abandoned. A timeout may be necessary if requests would overwise hang such as on a slow connection. This would tend to consume a lot of browser memory and make the interface unresponsive. Ordinarily no requests should timeout so this setting should be set to a value greater than the slowest expected response. This value is in milliseconds but if set to zero then no timeout will be used.
\ No newline at end of file
diff --git a/m4/ac_check_sendfile.m4 b/m4/ac_check_sendfile.m4
deleted file mode 100644
index 12605d588..000000000
--- a/m4/ac_check_sendfile.m4
+++ /dev/null
@@ -1,63 +0,0 @@
-AC_DEFUN([AC_CHECK_SENDFILE],[
-AC_MSG_CHECKING([whether sendfile() is supported and what prototype it has])
-
-saved_CFLAGS="$CFLAGS"
-CFLAGS="$CFLAGS -Werror-implicit-function-declaration"
-ac_sendfile_supported=no
-AC_TRY_LINK([#include <sys/sendfile.h>
-               #include <stdio.h>],
-       [sendfile(1, 1, NULL, 0);],
-       [
-               AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
-                       [Define this if Linux/Solaris sendfile() is supported])
-               AC_MSG_RESULT([Linux sendfile()])
-               ac_sendfile_supported=yes
-       ], [])
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we need libsendfile
-       dnl Presumably on Solaris
-       AC_CHECK_LIB(sendfile, sendfile,
-               [
-                       AC_DEFINE(HAVE_SENDFILE4_SUPPORT, 1,
-                               [Define this if Linux/Solaris sendfile() is supported])
-                       SENDFILE_LIBS="-lsendfile"
-                       AC_SUBST(SENDFILE_LIBS)
-                       AC_MSG_RESULT([Solaris sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we have FreeBSD-like sendfile() support.
-       AC_TRY_LINK([#include <sys/socket.h>
-                       #include <stdio.h>],
-               [sendfile(1, 1, 0, 0, NULL, NULL, 0);],
-               [
-                       AC_DEFINE(HAVE_SENDFILE7_SUPPORT, 1,
-                               [Define this if FreeBSD sendfile() is supported])
-                       AC_MSG_RESULT([FreeBSD sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-if test x$ac_sendfile_supported = xno; then
-       dnl Checking wether we have MacOS-like sendfile() support.
-       AC_TRY_LINK([#include <sys/socket.h>
-                       #include <stdio.h>
-                       #include <sys/uio.h>],
-               [sendfile(1, 1, 0, NULL, NULL, 0);],
-               [
-                       AC_DEFINE(HAVE_SENDFILE6_SUPPORT, 1,
-                               [Define this if MacOS sendfile() is supported])
-                       AC_MSG_RESULT([MacOS sendfile()])
-                       ac_sendfile_supported=yes
-               ], [])
-fi
-
-CFLAGS="$saved_CFLAGS"
-
-if test x$ac_sendfile_supported = xno; then
-       AC_MSG_RESULT([no sendfile() support, using read/send])
-fi
-])
diff --git a/misc/Makefile.am b/misc/Makefile.am
deleted file mode 100644
index 5578e4373..000000000
--- a/misc/Makefile.am
+++ /dev/null
@@ -1,17 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-EXTRA_DIST = \
-	apache.conf.in \
-	logrotate.conf.in \
-	syslog.conf.in \
-	zoneminder-tmpfiles.conf.in \
-	zoneminder.service.in \
-        com.zoneminder.systemctl.policy.in \
-        com.zoneminder.systemctl.rules.in
-
-polkit_actiondir = @POLKIT_PREFIX@/share/polkit-1/actions
-dist_polkit_action_DATA = com.zoneminder.systemctl.policy
-
-polkit_rulesdir = @POLKIT_PREFIX@/share/polkit-1/rules.d
-dist_polkit_rules_DATA = com.zoneminder.systemctl.rules
-
diff --git a/misc/logcheck b/misc/logcheck
new file mode 100644
index 000000000..28940a6cc
--- /dev/null
+++ b/misc/logcheck
@@ -0,0 +1,29 @@
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Capturing at [.[:digit:]]+ fps\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Processing at [.[:digit:]]+ fps\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: INF \[Got signal 15 \(Terminated\), exiting\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: INF \[Starting Capture\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: ERR \[(Connection dropped by remote end|Unable to read (sub)?header|Unable to get response(, disconnecting)?|Select error: Interrupted system call|Can't connect to remote camera: Interrupted system call|Unable to connect to (the remote )?camera(, aborting)?)\]$
+zmc_m[[:digit:]]+\[[[:digit:]]+\]: WAR \[(Unable to capture image, retrying|Select timed out)\]$
+zmaudit\[[[:digit:]]+\]: INF \[Deleted [[:digit:]]+ log table entries by time\]$
+zmdc\[[[:digit:]]+\]: INF \[Starting pending process, [. [:alnum:]-]+\]$
+zmdc\[[[:digit:]]+\]: INF \['[. [:alnum:]-]+' start(ed|ing) at [/: [:digit:]]+(, pid = [[:digit:]]+)?\]$
+zmwatch\[[[:digit:]]+\]: INF \[Watchdog starting\]$
+zmwatch\[[[:digit:]]+\]: INF \[Watchdog pausing for 30 seconds\]$
+zmc_m3\[[[:digit:]]+\]: ERR \[Can't connect to remote camera: (No route to host|Connection refused)\]$
+zmdc\[[[:digit:]]+\]: ERR \['zmc -m 3' exited abnormally, exit status 255\]$
+zmc_m1\[[[:digit:]]+\]: ERR-zm_remote_camera_rtsp.cpp/302 \[Error while decoding frame 0\]$
+zmc_m1\[[[:digit:]]+\]: ERR-zm_remote_camera_rtsp.cpp/303 \[256: [ [:xdigit:]]+\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Gone into alarm state\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Opening new event [[:digit:]]+, alarm start\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Gone into alert state\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: WAR \[Waiting for capture daemon\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Gone back into alarm state\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Left alarm state \([[:digit:]]+\) - [[:digit:]]+\([[:digit:]]+\) images\]$
+zma_m[[:digit:]]+\[[[:digit:]]+\]: INF \[[[:alnum:]]+: [[:digit:]]+ - Closing event [[:digit:]]+, alarm end\]$
+zmaudit\[[[:digit:]]+\]: INF \[Filesystem event '[[:digit:]]+/[[:digit:]]+' does not exist in database\]$
+zmaudit\[[[:digit:]]+\]: INF \[deleting\]$
+zmaudit\[[[:digit:]]+\]: INF \[Found orphaned frame records for event '[[:digit:]]+'\]$
+zmfilter\[[[:digit:]]+\]: INF \[Deleting event [[:digit:]]+\]$
+zmtelemetry\[[[:digit:]]+\]: INF \[Telemetry data uploaded successfully.\]$
+zmtelemetry\[[[:digit:]]+\]: INF \[Sending data to ZoneMinder Telemetry server.\]$
+zmtelemetry\[[[:digit:]]+\]: INF \[Collec?ting data to send to ZoneMinder Telemetry server.\]$
diff --git a/onvif/Makefile.am b/onvif/Makefile.am
deleted file mode 100644
index 8cc9d700a..000000000
--- a/onvif/Makefile.am
+++ /dev/null
@@ -1,26 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# Ack! Nasty hack to get modules Makefile regenerated if wiped with make clean
-all-local: proxy/Makefile modules/Makefile
-
-proxy/Makefile: proxy/Makefile.PL
-	( cd proxy; perl Makefile.PL )
-
-modules/Makefile: modules/Makefile.PL
-	( cd modules; perl Makefile.PL )
-
-SUBDIRS = \
- 	. \
-  proxy \
-  modules \
-  scripts 
-   
-   
-EXTRA_DIST = \
-  proxy/Makefile.PL \
-  proxy/lib \
-  modules/Makefile.PL \
-  modules/lib \
-  wsdl \
-  doc \
-  patches
diff --git a/onvif/modules/CMakeLists.txt b/onvif/modules/CMakeLists.txt
index 9e46ef9f7..d7ddbf466 100644
--- a/onvif/modules/CMakeLists.txt
+++ b/onvif/modules/CMakeLists.txt
@@ -9,7 +9,7 @@ endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
+add_custom_target(zmonvifmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/onvif/modules/lib/ONVIF/Serializer/Base.pm b/onvif/modules/lib/ONVIF/Serializer/Base.pm
index 7bab331cf..adbb173c6 100644
--- a/onvif/modules/lib/ONVIF/Serializer/Base.pm
+++ b/onvif/modules/lib/ONVIF/Serializer/Base.pm
@@ -97,8 +97,11 @@ sub serialize {
 
     my $soap_prefix = $opt->{ namespace }->{ $SOAP_NS };
 
-    # envelope start with namespaces
-    my $xml = "<$soap_prefix\:Envelope ";
+    # XML starts with header
+    my $xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n";
+    
+    # envelope starts with namespaces
+    $xml .= "<$soap_prefix\:Envelope ";
 
     while (my ($uri, $prefix) = each %{ $opt->{ namespace } })
     {
diff --git a/onvif/proxy/CMakeLists.txt b/onvif/proxy/CMakeLists.txt
index 0051bf2b1..1a40c0ffb 100644
--- a/onvif/proxy/CMakeLists.txt
+++ b/onvif/proxy/CMakeLists.txt
@@ -9,7 +9,7 @@ endif(NOT (CMAKE_BINARY_DIR STREQUAL CMAKE_SOURCE_DIR))
 # MAKEMAKER_NOECHO_COMMAND previously defined in /scripts/zoneminder/CMakeLists.txt
 
 # Add build target for the perl modules
-add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
+add_custom_target(zmonvifproxy ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl ONVIF proxy module")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm
new file mode 100644
index 000000000..32ec1b360
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/actor.pm
@@ -0,0 +1,54 @@
+
+package ONVIF::Analytics::Attributes::actor;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('actor');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::actor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+actor from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::actor->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm
new file mode 100644
index 000000000..7efcde9bc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/contentType.pm
@@ -0,0 +1,64 @@
+
+package ONVIF::Analytics::Attributes::contentType;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' }
+
+__PACKAGE__->__set_name('contentType');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::contentType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+contentType from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::contentType->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm
new file mode 100644
index 000000000..7f16b80d3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/encodingStyle.pm
@@ -0,0 +1,54 @@
+
+package ONVIF::Analytics::Attributes::encodingStyle;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('encodingStyle');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    ONVIF::Analytics::Types::encodingStyle
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::encodingStyle
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+encodingStyle from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::encodingStyle->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm
new file mode 100644
index 000000000..cfcb44a2d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/expectedContentTypes.pm
@@ -0,0 +1,54 @@
+
+package ONVIF::Analytics::Attributes::expectedContentTypes;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' }
+
+__PACKAGE__->__set_name('expectedContentTypes');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::expectedContentTypes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+expectedContentTypes from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::expectedContentTypes->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm b/onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm
new file mode 100644
index 000000000..363cec963
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Attributes/mustUnderstand.pm
@@ -0,0 +1,64 @@
+
+package ONVIF::Analytics::Attributes::mustUnderstand;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('mustUnderstand');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Attributes::mustUnderstand
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+mustUnderstand from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Attributes::mustUnderstand->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm
new file mode 100644
index 000000000..d0fc89bd0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioDecoderConfiguration.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::AudioDecoderConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioDecoderConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioDecoderConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioDecoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioDecoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioDecoderConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm
new file mode 100644
index 000000000..6c0db80d6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioEncoderConfiguration.pm
@@ -0,0 +1,72 @@
+
+package ONVIF::Analytics::Elements::AudioEncoderConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioEncoderConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioEncoderConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioEncoderConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+   Encoding => $some_value, # AudioEncoding
+   Bitrate =>  $some_value, # int
+   SampleRate =>  $some_value, # int
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm
new file mode 100644
index 000000000..f7c0f7b32
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioOutputConfiguration.pm
@@ -0,0 +1,61 @@
+
+package ONVIF::Analytics::Elements::AudioOutputConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioOutputConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioOutputConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioOutputConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioOutputConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioOutputConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutputConfiguration
+   OutputToken => $some_value, # ReferenceToken
+   SendPrimacy =>  $some_value, # anyURI
+   OutputLevel =>  $some_value, # int
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm
new file mode 100644
index 000000000..d1cb63ff7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/AudioSourceConfiguration.pm
@@ -0,0 +1,59 @@
+
+package ONVIF::Analytics::Elements::AudioSourceConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('AudioSourceConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::AudioSourceConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::AudioSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+AudioSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::AudioSourceConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm
new file mode 100644
index 000000000..41611b087
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Body.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Body;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Body');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Body
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Body
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Body from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Body->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Body
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm
new file mode 100644
index 000000000..7c134f381
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Capabilities.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Capabilities;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('Capabilities');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Capabilities
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Capabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Capabilities from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Capabilities->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Capabilities
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm
new file mode 100644
index 000000000..a0f19cb3b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::CreateAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        AnalyticsModule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'AnalyticsModule' => \%AnalyticsModule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'AnalyticsModule' => 'AnalyticsModule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * AnalyticsModule
+
+ $element->set_AnalyticsModule($data);
+ $element->get_AnalyticsModule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..c23ffecc0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateAnalyticsModulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm
new file mode 100644
index 000000000..d149b29dc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::CreateRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %Rule_of :ATTR(:get<Rule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        Rule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'Rule' => \%Rule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'Rule' => 'Rule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * Rule
+
+ $element->set_Rule($data);
+ $element->get_Rule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm
new file mode 100644
index 000000000..3c28a2165
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/CreateRulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::CreateRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('CreateRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::CreateRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreateRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::CreateRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm
new file mode 100644
index 000000000..6f977ae23
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModules.pm
@@ -0,0 +1,135 @@
+
+package ONVIF::Analytics::Elements::DeleteAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %AnalyticsModuleName_of :ATTR(:get<AnalyticsModuleName>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        AnalyticsModuleName
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'AnalyticsModuleName' => \%AnalyticsModuleName_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AnalyticsModuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'AnalyticsModuleName' => 'AnalyticsModuleName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * AnalyticsModuleName
+
+ $element->set_AnalyticsModuleName($data);
+ $element->get_AnalyticsModuleName();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   AnalyticsModuleName =>  $some_value, # string
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..f723a7331
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteAnalyticsModulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm
new file mode 100644
index 000000000..cc007d5f5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRules.pm
@@ -0,0 +1,135 @@
+
+package ONVIF::Analytics::Elements::DeleteRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %RuleName_of :ATTR(:get<RuleName>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        RuleName
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'RuleName' => \%RuleName_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'RuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'RuleName' => 'RuleName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * RuleName
+
+ $element->set_RuleName($data);
+ $element->get_RuleName();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   RuleName =>  $some_value, # string
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm
new file mode 100644
index 000000000..d8b7d5969
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/DeleteRulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::DeleteRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('DeleteRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::DeleteRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DeleteRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::DeleteRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm
new file mode 100644
index 000000000..65b60aeb4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Envelope.pm
@@ -0,0 +1,62 @@
+
+package ONVIF::Analytics::Elements::Envelope;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Envelope');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Envelope
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Envelope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Envelope from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Envelope->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Envelope
+   Header =>  { # ONVIF::Analytics::Types::Header
+   },
+   Body =>  { # ONVIF::Analytics::Types::Body
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm
new file mode 100644
index 000000000..d8903ea39
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Fault.pm
@@ -0,0 +1,63 @@
+
+package ONVIF::Analytics::Elements::Fault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Fault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Fault
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Fault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Fault from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Fault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Fault
+   faultcode =>  $some_value, # QName
+   faultstring =>  $some_value, # string
+   faultactor =>  $some_value, # anyURI
+   detail =>  { # ONVIF::Analytics::Types::detail
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm
new file mode 100644
index 000000000..23039ed5d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..01509ac6b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetAnalyticsModulesResponse.pm
@@ -0,0 +1,129 @@
+
+package ONVIF::Analytics::Elements::GetAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsModule
+
+    ) ],
+    {
+        'AnalyticsModule' => \%AnalyticsModule_of,
+    },
+    {
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'AnalyticsModule' => 'AnalyticsModule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsModule
+
+ $element->set_AnalyticsModule($data);
+ $element->get_AnalyticsModule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm
new file mode 100644
index 000000000..7d96f0a1c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm
new file mode 100644
index 000000000..510591322
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetRulesResponse.pm
@@ -0,0 +1,129 @@
+
+package ONVIF::Analytics::Elements::GetRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rule_of :ATTR(:get<Rule>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rule
+
+    ) ],
+    {
+        'Rule' => \%Rule_of,
+    },
+    {
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'Rule' => 'Rule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rule
+
+ $element->set_Rule($data);
+ $element->get_Rule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm
new file mode 100644
index 000000000..dd8589e07
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilities.pm
@@ -0,0 +1,107 @@
+
+package ONVIF::Analytics::Elements::GetServiceCapabilities;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetServiceCapabilities');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetServiceCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetServiceCapabilities from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetServiceCapabilities->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm
new file mode 100644
index 000000000..3361117af
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetServiceCapabilitiesResponse.pm
@@ -0,0 +1,122 @@
+
+package ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetServiceCapabilitiesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Capabilities_of :ATTR(:get<Capabilities>);
+
+__PACKAGE__->_factory(
+    [ qw(        Capabilities
+
+    ) ],
+    {
+        'Capabilities' => \%Capabilities_of,
+    },
+    {
+        'Capabilities' => 'ONVIF::Analytics::Types::Capabilities',
+    },
+    {
+
+        'Capabilities' => 'Capabilities',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetServiceCapabilitiesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Capabilities
+
+ $element->set_Capabilities($data);
+ $element->get_Capabilities();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Capabilities =>  { # ONVIF::Analytics::Types::Capabilities
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm
new file mode 100644
index 000000000..d2f6fc924
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetSupportedAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..9962a617c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedAnalyticsModulesResponse.pm
@@ -0,0 +1,138 @@
+
+package ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SupportedAnalyticsModules_of :ATTR(:get<SupportedAnalyticsModules>);
+
+__PACKAGE__->_factory(
+    [ qw(        SupportedAnalyticsModules
+
+    ) ],
+    {
+        'SupportedAnalyticsModules' => \%SupportedAnalyticsModules_of,
+    },
+    {
+        'SupportedAnalyticsModules' => 'ONVIF::Analytics::Types::SupportedAnalyticsModules',
+    },
+    {
+
+        'SupportedAnalyticsModules' => 'SupportedAnalyticsModules',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SupportedAnalyticsModules
+
+ $element->set_SupportedAnalyticsModules($data);
+ $element->get_SupportedAnalyticsModules();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   SupportedAnalyticsModules =>  { # ONVIF::Analytics::Types::SupportedAnalyticsModules
+     AnalyticsModuleContentSchemaLocation =>  $some_value, # anyURI
+     AnalyticsModuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+       Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+         SimpleItemDescription => ,
+         ElementItemDescription => ,
+         Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+         },
+       },
+       Messages =>  {
+         ParentTopic =>  $some_value, # string
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm
new file mode 100644
index 000000000..7dfd0aa7d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRules.pm
@@ -0,0 +1,121 @@
+
+package ONVIF::Analytics::Elements::GetSupportedRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm
new file mode 100644
index 000000000..c23b26b6b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/GetSupportedRulesResponse.pm
@@ -0,0 +1,138 @@
+
+package ONVIF::Analytics::Elements::GetSupportedRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('GetSupportedRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SupportedRules_of :ATTR(:get<SupportedRules>);
+
+__PACKAGE__->_factory(
+    [ qw(        SupportedRules
+
+    ) ],
+    {
+        'SupportedRules' => \%SupportedRules_of,
+    },
+    {
+        'SupportedRules' => 'ONVIF::Analytics::Types::SupportedRules',
+    },
+    {
+
+        'SupportedRules' => 'SupportedRules',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::GetSupportedRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetSupportedRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SupportedRules
+
+ $element->set_SupportedRules($data);
+ $element->get_SupportedRules();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::GetSupportedRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   SupportedRules =>  { # ONVIF::Analytics::Types::SupportedRules
+     RuleContentSchemaLocation =>  $some_value, # anyURI
+     RuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+       Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+         SimpleItemDescription => ,
+         ElementItemDescription => ,
+         Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+         },
+       },
+       Messages =>  {
+         ParentTopic =>  $some_value, # string
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::SupportedRulesExtension
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm
new file mode 100644
index 000000000..4f64e72ba
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Header.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Header;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' }
+
+__PACKAGE__->__set_name('Header');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Header
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Header
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Header from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Header->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Header
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm
new file mode 100644
index 000000000..9db022058
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Include.pm
@@ -0,0 +1,58 @@
+
+package ONVIF::Analytics::Elements::Include;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2004/08/xop/include' }
+
+__PACKAGE__->__set_name('Include');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Include
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Include
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Include from the namespace http://www.w3.org/2004/08/xop/include.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Include->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Include
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm
new file mode 100644
index 000000000..d71b8e03c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Message.pm
@@ -0,0 +1,207 @@
+
+package ONVIF::Analytics::Elements::Message;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('Message');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Elements::Message::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Key_of :ATTR(:get<Key>);
+my %Data_of :ATTR(:get<Data>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Key
+        Data
+        Extension
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Key' => \%Key_of,
+        'Data' => \%Data_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::ItemList',
+        'Key' => 'ONVIF::Analytics::Types::ItemList',
+        'Data' => 'ONVIF::Analytics::Types::ItemList',
+        'Extension' => 'ONVIF::Analytics::Types::MessageExtension',
+    },
+    {
+
+        'Source' => 'Source',
+        'Key' => 'Key',
+        'Data' => 'Data',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Elements::Message::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %UtcTime_of :ATTR(:get<UtcTime>);
+my %PropertyOperation_of :ATTR(:get<PropertyOperation>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        UtcTime
+        PropertyOperation
+    ) ],
+    {
+
+        UtcTime => \%UtcTime_of,
+
+        PropertyOperation => \%PropertyOperation_of,
+    },
+    {
+        UtcTime => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        PropertyOperation => 'ONVIF::Analytics::Types::PropertyOperation',
+    }
+);
+
+} # end BLOCK
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Message
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Message from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Source
+
+ $element->set_Source($data);
+ $element->get_Source();
+
+
+
+
+=item * Key
+
+ $element->set_Key($data);
+ $element->get_Key();
+
+
+
+
+=item * Data
+
+ $element->set_Data($data);
+ $element->get_Data();
+
+
+
+
+=item * Extension
+
+ $element->set_Extension($data);
+ $element->get_Extension();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Message->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Source =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+   Key =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+   Data =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MessageExtension
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm
new file mode 100644
index 000000000..24662efd0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataConfiguration.pm
@@ -0,0 +1,89 @@
+
+package ONVIF::Analytics::Elements::MetadataConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('MetadataConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::MetadataConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::MetadataConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MetadataConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::MetadataConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfiguration
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZFilter
+     Status =>  $some_value, # boolean
+     Position =>  $some_value, # boolean
+   },
+   Analytics =>  $some_value, # boolean
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm
new file mode 100644
index 000000000..eb0831001
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/MetadataStream.pm
@@ -0,0 +1,192 @@
+
+package ONVIF::Analytics::Elements::MetadataStream;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('MetadataStream');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::MetadataStream
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::MetadataStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MetadataStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::MetadataStream->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   VideoAnalytics =>    { # ONVIF::Analytics::Types::VideoAnalyticsStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     Frame =>  { # ONVIF::Analytics::Types::Frame
+       PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+         Position =>  { # ONVIF::Analytics::Types::PTZVector
+           PanTilt => ,
+           Zoom => ,
+         },
+         MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+           PanTilt => $some_value, # MoveStatus
+           Zoom => $some_value, # MoveStatus
+         },
+         Error =>  $some_value, # string
+         UtcTime =>  $some_value, # dateTime
+       },
+       Transformation =>  { # ONVIF::Analytics::Types::Transformation
+         Translate => ,
+         Scale => ,
+         Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+         },
+       },
+       Object =>  { # ONVIF::Analytics::Types::Object
+         Appearance =>  { # ONVIF::Analytics::Types::Appearance
+           Transformation =>  { # ONVIF::Analytics::Types::Transformation
+             Translate => ,
+             Scale => ,
+             Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+             },
+           },
+           Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+             BoundingBox => ,
+             CenterOfGravity => ,
+             Polygon =>  { # ONVIF::Analytics::Types::Polygon
+               Point => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+             },
+           },
+           Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+             ColorCluster =>  {
+               Color => ,
+               Weight =>  $some_value, # float
+               Covariance => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+             },
+           },
+           Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+             ClassCandidate =>  {
+               Type => $some_value, # ClassType
+               Likelihood =>  $some_value, # float
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+               OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+                 Type =>  $some_value, # string
+                 Likelihood =>  $some_value, # float
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+           },
+         },
+         Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+           Removed =>  {
+           },
+           Idle =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+         },
+       },
+       ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+         Rename =>  { # ONVIF::Analytics::Types::Rename
+           from => ,
+           to => ,
+         },
+         Split =>  { # ONVIF::Analytics::Types::Split
+           from => ,
+           to => ,
+         },
+         Merge =>  { # ONVIF::Analytics::Types::Merge
+           from => ,
+           to => ,
+         },
+         Delete => ,
+         Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+         MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+         },
+         Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+     },
+   },
+   PTZ =>    { # ONVIF::Analytics::Types::PTZStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+       Position =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+         PanTilt => $some_value, # MoveStatus
+         Zoom => $some_value, # MoveStatus
+       },
+       Error =>  $some_value, # string
+       UtcTime =>  $some_value, # dateTime
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZStreamExtension
+     },
+   },
+   Event =>  $some_value, # anyType
+   Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension
+     AudioAnalyticsStream =>  { # ONVIF::Analytics::Types::AudioAnalyticsStream
+       AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension2
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm
new file mode 100644
index 000000000..b1115dbe6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::ModifyAnalyticsModules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyAnalyticsModules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        AnalyticsModule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'AnalyticsModule' => \%AnalyticsModule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'AnalyticsModule' => 'AnalyticsModule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyAnalyticsModules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * AnalyticsModule
+
+ $element->set_AnalyticsModule($data);
+ $element->get_AnalyticsModule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyAnalyticsModules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm
new file mode 100644
index 000000000..50d373978
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyAnalyticsModulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyAnalyticsModulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyAnalyticsModulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm
new file mode 100644
index 000000000..cda8c66d6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRules.pm
@@ -0,0 +1,143 @@
+
+package ONVIF::Analytics::Elements::ModifyRules;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyRules');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConfigurationToken_of :ATTR(:get<ConfigurationToken>);
+my %Rule_of :ATTR(:get<Rule>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConfigurationToken
+        Rule
+
+    ) ],
+    {
+        'ConfigurationToken' => \%ConfigurationToken_of,
+        'Rule' => \%Rule_of,
+    },
+    {
+        'ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+    },
+    {
+
+        'ConfigurationToken' => 'ConfigurationToken',
+        'Rule' => 'Rule',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyRules from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConfigurationToken
+
+ $element->set_ConfigurationToken($data);
+ $element->get_ConfigurationToken();
+
+
+
+
+=item * Rule
+
+ $element->set_Rule($data);
+ $element->get_Rule();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyRules->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConfigurationToken => $some_value, # ReferenceToken
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm
new file mode 100644
index 000000000..0efce26d5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/ModifyRulesResponse.pm
@@ -0,0 +1,90 @@
+
+package ONVIF::Analytics::Elements::ModifyRulesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' }
+
+__PACKAGE__->__set_name('ModifyRulesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::ModifyRulesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ModifyRulesResponse from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::ModifyRulesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm
new file mode 100644
index 000000000..40870ad10
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/PTZConfiguration.pm
@@ -0,0 +1,106 @@
+
+package ONVIF::Analytics::Elements::PTZConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('PTZConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::PTZConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::PTZConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PTZConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::PTZConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfiguration
+   NodeToken => $some_value, # ReferenceToken
+   DefaultAbsolutePantTiltPositionSpace =>  $some_value, # anyURI
+   DefaultAbsoluteZoomPositionSpace =>  $some_value, # anyURI
+   DefaultRelativePanTiltTranslationSpace =>  $some_value, # anyURI
+   DefaultRelativeZoomTranslationSpace =>  $some_value, # anyURI
+   DefaultContinuousPanTiltVelocitySpace =>  $some_value, # anyURI
+   DefaultContinuousZoomVelocitySpace =>  $some_value, # anyURI
+   DefaultPTZSpeed =>  { # ONVIF::Analytics::Types::PTZSpeed
+     PanTilt => ,
+     Zoom => ,
+   },
+   DefaultPTZTimeout =>  $some_value, # duration
+   PanTiltLimits =>  { # ONVIF::Analytics::Types::PanTiltLimits
+     Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   ZoomLimits =>  { # ONVIF::Analytics::Types::ZoomLimits
+     Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension
+     PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+       EFlip =>  { # ONVIF::Analytics::Types::EFlip
+         Mode => $some_value, # EFlipMode
+       },
+       Reverse =>  { # ONVIF::Analytics::Types::Reverse
+         Mode => $some_value, # ReverseMode
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm
new file mode 100644
index 000000000..4d4ff9f05
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polygon.pm
@@ -0,0 +1,59 @@
+
+package ONVIF::Analytics::Elements::Polygon;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('Polygon');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Polygon
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Polygon
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Polygon from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Polygon->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polygon
+   Point => ,
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm
new file mode 100644
index 000000000..9948d4835
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/Polyline.pm
@@ -0,0 +1,59 @@
+
+package ONVIF::Analytics::Elements::Polyline;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('Polyline');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::Polyline
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::Polyline
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Polyline from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::Polyline->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polyline
+   Point => ,
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm
new file mode 100644
index 000000000..147929963
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoAnalyticsConfiguration.pm
@@ -0,0 +1,84 @@
+
+package ONVIF::Analytics::Elements::VideoAnalyticsConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('VideoAnalyticsConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::VideoAnalyticsConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+VideoAnalyticsConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::VideoAnalyticsConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+     Rule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm
new file mode 100644
index 000000000..7b0759d9c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoEncoderConfiguration.pm
@@ -0,0 +1,88 @@
+
+package ONVIF::Analytics::Elements::VideoEncoderConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('VideoEncoderConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::VideoEncoderConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::VideoEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+VideoEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::VideoEncoderConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+   Encoding => $some_value, # VideoEncoding
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   Quality =>  $some_value, # float
+   RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+     FrameRateLimit =>  $some_value, # int
+     EncodingInterval =>  $some_value, # int
+     BitrateLimit =>  $some_value, # int
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+     GovLength =>  $some_value, # int
+     Mpeg4Profile => $some_value, # Mpeg4Profile
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+     GovLength =>  $some_value, # int
+     H264Profile => $some_value, # H264Profile
+   },
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm
new file mode 100644
index 000000000..50fe94f88
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Elements/VideoSourceConfiguration.pm
@@ -0,0 +1,70 @@
+
+package ONVIF::Analytics::Elements::VideoSourceConfiguration;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' }
+
+__PACKAGE__->__set_name('VideoSourceConfiguration');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    ONVIF::Analytics::Types::VideoSourceConfiguration
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Elements::VideoSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+VideoSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = ONVIF::Analytics::Elements::VideoSourceConfiguration->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+   Bounds => ,
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+     Rotate =>  { # ONVIF::Analytics::Types::Rotate
+       Mode => $some_value, # RotateMode
+       Degree =>  $some_value, # int
+       Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm
new file mode 100644
index 000000000..481d254ce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/AnalyticsEnginePort.pm
@@ -0,0 +1,338 @@
+package ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require ONVIF::Analytics::Typemaps::Analytics
+    if not ONVIF::Analytics::Typemaps::Analytics->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://www.examples.com/Analytics/') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('ONVIF::Analytics::Typemaps::Analytics')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub GetServiceCapabilities {
+    my ($self, $body, $header) = @_;
+    die "GetServiceCapabilities must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetServiceCapabilities',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetServiceCapabilities',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetServiceCapabilities )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetSupportedAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "GetSupportedAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetSupportedAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetSupportedAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetSupportedAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub CreateAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "CreateAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'CreateAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/CreateAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::CreateAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub DeleteAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "DeleteAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'DeleteAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/DeleteAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::DeleteAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "GetAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub ModifyAnalyticsModules {
+    my ($self, $body, $header) = @_;
+    die "ModifyAnalyticsModules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'ModifyAnalyticsModules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/ModifyAnalyticsModules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::ModifyAnalyticsModules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort - SOAP Interface for the Analytics Web Service
+
+=head1 SYNOPSIS
+
+ use ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort;
+ my $interface = ONVIF::Analytics::Interfaces::Analytics::AnalyticsEnginePort->new();
+
+ my $response;
+ $response = $interface->GetServiceCapabilities();
+ $response = $interface->GetSupportedAnalyticsModules();
+ $response = $interface->CreateAnalyticsModules();
+ $response = $interface->DeleteAnalyticsModules();
+ $response = $interface->GetAnalyticsModules();
+ $response = $interface->ModifyAnalyticsModules();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the Analytics web service
+located at http://www.examples.com/Analytics/.
+
+=head1 SERVICE Analytics
+
+
+
+=head2 Port AnalyticsEnginePort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 GetServiceCapabilities
+
+Returns the capabilities of the analytics service. The result is returned in a typed answer.
+
+Returns a L<ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse|ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse> object.
+
+ $response = $interface->GetServiceCapabilities( {
+  },,
+ );
+
+=head3 GetSupportedAnalyticsModules
+
+List all analytics modules that are supported by the given VideoAnalyticsConfiguration. The result of this method may depend on the overall Video analytics configuration of the device, which is available via the current set of profiles. 
+
+Returns a L<ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse|ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse> object.
+
+ $response = $interface->GetSupportedAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 CreateAnalyticsModules
+
+The device shall ensure that a corresponding analytics engine starts operation when a client subscribes directly or indirectly for events produced by the analytics or rule engine or when a client requests the corresponding scene description stream. An analytics module must be attached to a Video source using the media profiles before it can be used. In case differing analytics configurations are attached to the same profile it is undefined which of the analytics module configuration becomes active if no stream is activated or multiple streams with different profiles are activated at the same time. 
+
+Returns a L<ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse|ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse> object.
+
+ $response = $interface->CreateAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+=head3 DeleteAnalyticsModules
+
+ 
+
+Returns a L<ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse|ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse> object.
+
+ $response = $interface->DeleteAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    AnalyticsModuleName =>  $some_value, # string
+  },,
+ );
+
+=head3 GetAnalyticsModules
+
+List the currently assigned set of analytics modules of a VideoAnalyticsConfiguration. 
+
+Returns a L<ONVIF::Analytics::Elements::GetAnalyticsModulesResponse|ONVIF::Analytics::Elements::GetAnalyticsModulesResponse> object.
+
+ $response = $interface->GetAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 ModifyAnalyticsModules
+
+Modify the settings of one or more analytics modules of a VideoAnalyticsConfiguration. The modules are referenced by their names. It is allowed to pass only a subset to be modified. 
+
+Returns a L<ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse|ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse> object.
+
+ $response = $interface->ModifyAnalyticsModules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Tue Jul 15 19:19:50 2014
+
+=cut
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm
new file mode 100644
index 000000000..835e119ff
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Interfaces/Analytics/RuleEnginePort.pm
@@ -0,0 +1,301 @@
+package ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require ONVIF::Analytics::Typemaps::Analytics
+    if not ONVIF::Analytics::Typemaps::Analytics->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://www.examples.com/Analytics/') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('ONVIF::Analytics::Typemaps::Analytics')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub GetSupportedRules {
+    my ($self, $body, $header) = @_;
+    die "GetSupportedRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetSupportedRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetSupportedRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetSupportedRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub CreateRules {
+    my ($self, $body, $header) = @_;
+    die "CreateRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'CreateRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/CreateRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::CreateRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub DeleteRules {
+    my ($self, $body, $header) = @_;
+    die "DeleteRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'DeleteRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/DeleteRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::DeleteRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetRules {
+    my ($self, $body, $header) = @_;
+    die "GetRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/GetRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::GetRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub ModifyRules {
+    my ($self, $body, $header) = @_;
+    die "ModifyRules must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'ModifyRules',
+        soap_action => 'http://www.onvif.org/ver20/analytics/wsdl/ModifyRules',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( ONVIF::Analytics::Elements::ModifyRules )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort - SOAP Interface for the Analytics Web Service
+
+=head1 SYNOPSIS
+
+ use ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort;
+ my $interface = ONVIF::Analytics::Interfaces::Analytics::RuleEnginePort->new();
+
+ my $response;
+ $response = $interface->GetSupportedRules();
+ $response = $interface->CreateRules();
+ $response = $interface->DeleteRules();
+ $response = $interface->GetRules();
+ $response = $interface->ModifyRules();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the Analytics web service
+located at http://www.examples.com/Analytics/.
+
+=head1 SERVICE Analytics
+
+
+
+=head2 Port RuleEnginePort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 GetSupportedRules
+
+List all rules that are supported by the given VideoAnalyticsConfiguration. The result of this method may depend on the overall Video analytics configuration of the device, which is available via the current set of profiles. 
+
+Returns a L<ONVIF::Analytics::Elements::GetSupportedRulesResponse|ONVIF::Analytics::Elements::GetSupportedRulesResponse> object.
+
+ $response = $interface->GetSupportedRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 CreateRules
+
+GetCompatibleVideoAnalyticsConfigurations. 
+
+Returns a L<ONVIF::Analytics::Elements::CreateRulesResponse|ONVIF::Analytics::Elements::CreateRulesResponse> object.
+
+ $response = $interface->CreateRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    Rule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+=head3 DeleteRules
+
+Remove one or more rules from a VideoAnalyticsConfiguration. 
+
+Returns a L<ONVIF::Analytics::Elements::DeleteRulesResponse|ONVIF::Analytics::Elements::DeleteRulesResponse> object.
+
+ $response = $interface->DeleteRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    RuleName =>  $some_value, # string
+  },,
+ );
+
+=head3 GetRules
+
+List the currently assigned set of rules of a VideoAnalyticsConfiguration. 
+
+Returns a L<ONVIF::Analytics::Elements::GetRulesResponse|ONVIF::Analytics::Elements::GetRulesResponse> object.
+
+ $response = $interface->GetRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+  },,
+ );
+
+=head3 ModifyRules
+
+Modify one or more rules of a VideoAnalyticsConfiguration. The rules are referenced by their names. 
+
+Returns a L<ONVIF::Analytics::Elements::ModifyRulesResponse|ONVIF::Analytics::Elements::ModifyRulesResponse> object.
+
+ $response = $interface->ModifyRules( {
+    ConfigurationToken => $some_value, # ReferenceToken
+    Rule =>  { # ONVIF::Analytics::Types::Config
+      Parameters =>  { # ONVIF::Analytics::Types::ItemList
+        SimpleItem => ,
+        ElementItem =>  {
+        },
+        Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+        },
+      },
+    },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Tue Jul 15 19:19:50 2014
+
+=cut
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm b/onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm
new file mode 100644
index 000000000..7b2dfb989
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Typemaps/Analytics.pm
@@ -0,0 +1,154 @@
+
+package ONVIF::Analytics::Typemaps::Analytics;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'ModifyAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Extension' => 'ONVIF::Analytics::Types::ConfigDescriptionExtension',
+               'ModifyRules/Rule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'DeleteRules/RuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'CreateAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'ModifyAnalyticsModules/AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+               'GetSupportedRulesResponse/SupportedRules/Extension' => 'ONVIF::Analytics::Types::SupportedRulesExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/ParentTopic' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'CreateRules/Rule' => 'ONVIF::Analytics::Types::Config',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'CreateRules/Rule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetAnalyticsModulesResponse/AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+               'GetServiceCapabilitiesResponse/Capabilities' => 'ONVIF::Analytics::Types::Capabilities',
+               'ModifyRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetRulesResponse/Rule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'ModifyAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::ModifyAnalyticsModulesResponse',
+               'GetRulesResponse/Rule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetSupportedAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::GetSupportedAnalyticsModulesResponse',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'CreateRules/Rule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'GetSupportedAnalyticsModules' => 'ONVIF::Analytics::Elements::GetSupportedAnalyticsModules',
+               'DeleteAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'DeleteAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::DeleteAnalyticsModulesResponse',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'ModifyRules/Rule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'CreateRules' => 'ONVIF::Analytics::Elements::CreateRules',
+               'ModifyRules/Rule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'CreateRulesResponse' => 'ONVIF::Analytics::Elements::CreateRulesResponse',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Extension' => 'ONVIF::Analytics::Types::ConfigDescriptionExtension',
+               'GetAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'DeleteRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages' => 'ONVIF::Analytics::Types::ConfigDescription::_Messages',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'DeleteAnalyticsModules/AnalyticsModuleName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'DeleteAnalyticsModules' => 'ONVIF::Analytics::Elements::DeleteAnalyticsModules',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/Extension' => 'ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/ParentTopic' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules' => 'ONVIF::Analytics::Types::SupportedAnalyticsModules',
+               'GetSupportedAnalyticsModules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+               'GetSupportedRulesResponse/SupportedRules' => 'ONVIF::Analytics::Types::SupportedRules',
+               'GetSupportedRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Data/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetServiceCapabilities' => 'ONVIF::Analytics::Elements::GetServiceCapabilities',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::GetAnalyticsModulesResponse',
+               'GetRulesResponse/Rule/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+               'ModifyRules' => 'ONVIF::Analytics::Elements::ModifyRules',
+               'GetRulesResponse/Rule' => 'ONVIF::Analytics::Types::Config',
+               'CreateRules/Rule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'GetRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'CreateRules/Rule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetRulesResponse' => 'ONVIF::Analytics::Elements::GetRulesResponse',
+               'GetSupportedRules' => 'ONVIF::Analytics::Elements::GetSupportedRules',
+               'GetRulesResponse/Rule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'ModifyRulesResponse' => 'ONVIF::Analytics::Elements::ModifyRulesResponse',
+               'GetAnalyticsModules' => 'ONVIF::Analytics::Elements::GetAnalyticsModules',
+               'ModifyRules/Rule' => 'ONVIF::Analytics::Types::Config',
+               'DeleteRulesResponse' => 'ONVIF::Analytics::Elements::DeleteRulesResponse',
+               'GetServiceCapabilitiesResponse' => 'ONVIF::Analytics::Elements::GetServiceCapabilitiesResponse',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Data/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'DeleteRules' => 'ONVIF::Analytics::Elements::DeleteRules',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages' => 'ONVIF::Analytics::Types::ConfigDescription::_Messages',
+               'ModifyAnalyticsModules' => 'ONVIF::Analytics::Elements::ModifyAnalyticsModules',
+               'GetSupportedRulesResponse' => 'ONVIF::Analytics::Elements::GetSupportedRulesResponse',
+               'CreateAnalyticsModules/AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source/SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+               'ModifyAnalyticsModules/AnalyticsModule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'GetAnalyticsModulesResponse/AnalyticsModule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Parameters/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'CreateAnalyticsModulesResponse' => 'ONVIF::Analytics::Elements::CreateAnalyticsModulesResponse',
+               'CreateRules/ConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Source/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters' => 'ONVIF::Analytics::Types::ItemList',
+               'CreateAnalyticsModules' => 'ONVIF::Analytics::Elements::CreateAnalyticsModules',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Source/Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+               'GetSupportedAnalyticsModulesResponse/SupportedAnalyticsModules/AnalyticsModuleDescription/Messages/Key/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'CreateAnalyticsModules/AnalyticsModule/Parameters/SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+               'ModifyRules/Rule/Parameters/ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Parameters/ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+               'GetRules' => 'ONVIF::Analytics::Elements::GetRules',
+               'GetSupportedRulesResponse/SupportedRules/RuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'GetSupportedRulesResponse/SupportedRules/RuleDescription/Messages/Key' => 'ONVIF::Analytics::Types::ItemListDescription'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Typemaps::Analytics - typemap for Analytics
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm
new file mode 100644
index 000000000..376a03c4e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AACDecOptions.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::AACDecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRateRange_of :ATTR(:get<SampleRateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        SampleRateRange
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'SampleRateRange' => \%SampleRateRange_of,
+    },
+    {
+        'Bitrate' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateRange' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'SampleRateRange' => 'SampleRateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AACDecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AACDecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * SampleRateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AACDecOptions
+   Bitrate =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm
new file mode 100644
index 000000000..652d075ed
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::AbsoluteFocus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        Speed
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Position' => 'Position',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AbsoluteFocus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AbsoluteFocus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AbsoluteFocus
+   Position =>  $some_value, # float
+   Speed =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm
new file mode 100644
index 000000000..4479d0524
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AbsoluteFocusOptions.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::AbsoluteFocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        Speed
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Position' => 'ONVIF::Analytics::Types::FloatRange',
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Position' => 'Position',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AbsoluteFocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AbsoluteFocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AbsoluteFocusOptions
+   Position =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm
new file mode 100644
index 000000000..d696c2e9e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayload.pm
@@ -0,0 +1,147 @@
+package ONVIF::Analytics::Types::ActionEngineEventPayload;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RequestInfo_of :ATTR(:get<RequestInfo>);
+my %ResponseInfo_of :ATTR(:get<ResponseInfo>);
+my %Fault_of :ATTR(:get<Fault>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RequestInfo
+        ResponseInfo
+        Fault
+        Extension
+
+    ) ],
+    {
+        'RequestInfo' => \%RequestInfo_of,
+        'ResponseInfo' => \%ResponseInfo_of,
+        'Fault' => \%Fault_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RequestInfo' => 'ONVIF::Analytics::Types::Envelope',
+        'ResponseInfo' => 'ONVIF::Analytics::Types::Envelope',
+        'Fault' => 'ONVIF::Analytics::Types::Fault',
+        'Extension' => 'ONVIF::Analytics::Types::ActionEngineEventPayloadExtension',
+    },
+    {
+
+        'RequestInfo' => 'RequestInfo',
+        'ResponseInfo' => 'ResponseInfo',
+        'Fault' => 'Fault',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ActionEngineEventPayload
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ActionEngineEventPayload from the namespace http://www.onvif.org/ver10/schema.
+
+Action Engine Event Payload data structure contains the information about the ONVIF command invocations. Since this event could be generated by other or proprietary actions, the command invocation specific fields are defined as optional and additional extension mechanism is provided for future or additional action definitions.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RequestInfo
+
+
+=item * ResponseInfo
+
+
+=item * Fault
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ActionEngineEventPayload
+   RequestInfo =>  { # ONVIF::Analytics::Types::Envelope
+     Header =>  { # ONVIF::Analytics::Types::Header
+     },
+     Body =>  { # ONVIF::Analytics::Types::Body
+     },
+   },
+   ResponseInfo =>  { # ONVIF::Analytics::Types::Envelope
+     Header =>  { # ONVIF::Analytics::Types::Header
+     },
+     Body =>  { # ONVIF::Analytics::Types::Body
+     },
+   },
+   Fault =>  { # ONVIF::Analytics::Types::Fault
+     faultcode =>  $some_value, # QName
+     faultstring =>  $some_value, # string
+     faultactor =>  $some_value, # anyURI
+     detail =>  { # ONVIF::Analytics::Types::detail
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ActionEngineEventPayloadExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm
new file mode 100644
index 000000000..0c6260802
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ActionEngineEventPayloadExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ActionEngineEventPayloadExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ActionEngineEventPayloadExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ActionEngineEventPayloadExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ActionEngineEventPayloadExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm
new file mode 100644
index 000000000..ce9cf9183
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsCapabilities.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AnalyticsCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %RuleSupport_of :ATTR(:get<RuleSupport>);
+my %AnalyticsModuleSupport_of :ATTR(:get<AnalyticsModuleSupport>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        RuleSupport
+        AnalyticsModuleSupport
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'RuleSupport' => \%RuleSupport_of,
+        'AnalyticsModuleSupport' => \%AnalyticsModuleSupport_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RuleSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AnalyticsModuleSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'RuleSupport' => 'RuleSupport',
+        'AnalyticsModuleSupport' => 'AnalyticsModuleSupport',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * RuleSupport
+
+
+=item * AnalyticsModuleSupport
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsCapabilities
+   XAddr =>  $some_value, # anyURI
+   RuleSupport =>  $some_value, # boolean
+   AnalyticsModuleSupport =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm
new file mode 100644
index 000000000..c4165e3eb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceCapabilities.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %RuleSupport_of :ATTR(:get<RuleSupport>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        RuleSupport
+        Extension
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'RuleSupport' => \%RuleSupport_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RuleSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsDeviceExtension',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'RuleSupport' => 'RuleSupport',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * RuleSupport
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceCapabilities
+   XAddr =>  $some_value, # anyURI
+   RuleSupport =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm
new file mode 100644
index 000000000..5bff395ea
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfiguration.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EngineConfiguration_of :ATTR(:get<EngineConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        EngineConfiguration
+        Extension
+
+    ) ],
+    {
+        'EngineConfiguration' => \%EngineConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'EngineConfiguration' => 'ONVIF::Analytics::Types::EngineConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension',
+    },
+    {
+
+        'EngineConfiguration' => 'EngineConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceEngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EngineConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration
+   EngineConfiguration =>  { # ONVIF::Analytics::Types::EngineConfiguration
+     VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+       AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+         AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+           Parameters =>  { # ONVIF::Analytics::Types::ItemList
+             SimpleItem => ,
+             ElementItem =>  {
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+         },
+       },
+       RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+         Rule =>  { # ONVIF::Analytics::Types::Config
+           Parameters =>  { # ONVIF::Analytics::Types::ItemList
+             SimpleItem => ,
+             ElementItem =>  {
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+         },
+       },
+     },
+     AnalyticsEngineInputInfo =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+       InputInfo =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm
new file mode 100644
index 000000000..24cb0cff3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceEngineConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceEngineConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm
new file mode 100644
index 000000000..b3c2756f9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsDeviceExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsDeviceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsDeviceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsDeviceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsDeviceExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm
new file mode 100644
index 000000000..b2d7e8682
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngine.pm
@@ -0,0 +1,162 @@
+package ONVIF::Analytics::Types::AnalyticsEngine;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %AnalyticsEngineConfiguration_of :ATTR(:get<AnalyticsEngineConfiguration>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        AnalyticsEngineConfiguration
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'AnalyticsEngineConfiguration' => \%AnalyticsEngineConfiguration_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AnalyticsEngineConfiguration' => 'ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'AnalyticsEngineConfiguration' => 'AnalyticsEngineConfiguration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngine
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngine from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsEngineConfiguration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngine
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfiguration
+     EngineConfiguration =>  { # ONVIF::Analytics::Types::EngineConfiguration
+       VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+         AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+           AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+             Parameters =>  { # ONVIF::Analytics::Types::ItemList
+               SimpleItem => ,
+               ElementItem =>  {
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+           },
+         },
+         RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+           Rule =>  { # ONVIF::Analytics::Types::Config
+             Parameters =>  { # ONVIF::Analytics::Types::ItemList
+               SimpleItem => ,
+               ElementItem =>  {
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+           },
+         },
+       },
+       AnalyticsEngineInputInfo =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+         InputInfo =>  { # ONVIF::Analytics::Types::Config
+           Parameters =>  { # ONVIF::Analytics::Types::ItemList
+             SimpleItem => ,
+             ElementItem =>  {
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceEngineConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm
new file mode 100644
index 000000000..487e999e5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfiguration.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AnalyticsEngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsModule_of :ATTR(:get<AnalyticsModule>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsModule
+        Extension
+
+    ) ],
+    {
+        'AnalyticsModule' => \%AnalyticsModule_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AnalyticsModule' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension',
+    },
+    {
+
+        'AnalyticsModule' => 'AnalyticsModule',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsModule
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+   AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm
new file mode 100644
index 000000000..314131958
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm
new file mode 100644
index 000000000..b67097ceb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineControl.pm
@@ -0,0 +1,187 @@
+package ONVIF::Analytics::Types::AnalyticsEngineControl;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %EngineToken_of :ATTR(:get<EngineToken>);
+my %EngineConfigToken_of :ATTR(:get<EngineConfigToken>);
+my %InputToken_of :ATTR(:get<InputToken>);
+my %ReceiverToken_of :ATTR(:get<ReceiverToken>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %Subscription_of :ATTR(:get<Subscription>);
+my %Mode_of :ATTR(:get<Mode>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        EngineToken
+        EngineConfigToken
+        InputToken
+        ReceiverToken
+        Multicast
+        Subscription
+        Mode
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'EngineToken' => \%EngineToken_of,
+        'EngineConfigToken' => \%EngineConfigToken_of,
+        'InputToken' => \%InputToken_of,
+        'ReceiverToken' => \%ReceiverToken_of,
+        'Multicast' => \%Multicast_of,
+        'Subscription' => \%Subscription_of,
+        'Mode' => \%Mode_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'EngineToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'EngineConfigToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'InputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'ReceiverToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'Subscription' => 'ONVIF::Analytics::Types::Config',
+        'Mode' => 'ONVIF::Analytics::Types::ModeOfOperation',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'EngineToken' => 'EngineToken',
+        'EngineConfigToken' => 'EngineConfigToken',
+        'InputToken' => 'InputToken',
+        'ReceiverToken' => 'ReceiverToken',
+        'Multicast' => 'Multicast',
+        'Subscription' => 'Subscription',
+        'Mode' => 'Mode',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineControl
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineControl from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EngineToken
+
+
+=item * EngineConfigToken
+
+
+=item * InputToken
+
+
+=item * ReceiverToken
+
+
+=item * Multicast
+
+
+=item * Subscription
+
+
+=item * Mode
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineControl
+   EngineToken => $some_value, # ReferenceToken
+   EngineConfigToken => $some_value, # ReferenceToken
+   InputToken => $some_value, # ReferenceToken
+   ReceiverToken => $some_value, # ReferenceToken
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   Subscription =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Mode => $some_value, # ModeOfOperation
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm
new file mode 100644
index 000000000..2fb5b214f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInput.pm
@@ -0,0 +1,182 @@
+package ONVIF::Analytics::Types::AnalyticsEngineInput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %SourceIdentification_of :ATTR(:get<SourceIdentification>);
+my %VideoInput_of :ATTR(:get<VideoInput>);
+my %MetadataInput_of :ATTR(:get<MetadataInput>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        SourceIdentification
+        VideoInput
+        MetadataInput
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'SourceIdentification' => \%SourceIdentification_of,
+        'VideoInput' => \%VideoInput_of,
+        'MetadataInput' => \%MetadataInput_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SourceIdentification' => 'ONVIF::Analytics::Types::SourceIdentification',
+        'VideoInput' => 'ONVIF::Analytics::Types::VideoEncoderConfiguration',
+        'MetadataInput' => 'ONVIF::Analytics::Types::MetadataInput',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'SourceIdentification' => 'SourceIdentification',
+        'VideoInput' => 'VideoInput',
+        'MetadataInput' => 'MetadataInput',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineInput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineInput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceIdentification
+
+
+=item * VideoInput
+
+
+=item * MetadataInput
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineInput
+   SourceIdentification =>  { # ONVIF::Analytics::Types::SourceIdentification
+     Name =>  $some_value, # string
+     Token => $some_value, # ReferenceToken
+     Extension =>  { # ONVIF::Analytics::Types::SourceIdentificationExtension
+     },
+   },
+   VideoInput =>  { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+     Encoding => $some_value, # VideoEncoding
+     Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     Quality =>  $some_value, # float
+     RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+       FrameRateLimit =>  $some_value, # int
+       EncodingInterval =>  $some_value, # int
+       BitrateLimit =>  $some_value, # int
+     },
+     MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+       GovLength =>  $some_value, # int
+       Mpeg4Profile => $some_value, # Mpeg4Profile
+     },
+     H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+       GovLength =>  $some_value, # int
+       H264Profile => $some_value, # H264Profile
+     },
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   MetadataInput =>  { # ONVIF::Analytics::Types::MetadataInput
+     MetadataConfig =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataInputExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm
new file mode 100644
index 000000000..440a44bab
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfo.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AnalyticsEngineInputInfo;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InputInfo_of :ATTR(:get<InputInfo>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InputInfo
+        Extension
+
+    ) ],
+    {
+        'InputInfo' => \%InputInfo_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InputInfo' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension',
+    },
+    {
+
+        'InputInfo' => 'InputInfo',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineInputInfo from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InputInfo
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+   InputInfo =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm
new file mode 100644
index 000000000..81e5e7049
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsEngineInputInfoExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsEngineInputInfoExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm
new file mode 100644
index 000000000..738e47eef
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsState.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::AnalyticsState;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Error_of :ATTR(:get<Error>);
+my %State_of :ATTR(:get<State>);
+
+__PACKAGE__->_factory(
+    [ qw(        Error
+        State
+
+    ) ],
+    {
+        'Error' => \%Error_of,
+        'State' => \%State_of,
+    },
+    {
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'State' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Error' => 'Error',
+        'State' => 'State',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsState
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Error
+
+
+=item * State
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsState
+   Error =>  $some_value, # string
+   State =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm
new file mode 100644
index 000000000..6f2694cee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnalyticsStateInformation.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::AnalyticsStateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsEngineControlToken_of :ATTR(:get<AnalyticsEngineControlToken>);
+my %State_of :ATTR(:get<State>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsEngineControlToken
+        State
+
+    ) ],
+    {
+        'AnalyticsEngineControlToken' => \%AnalyticsEngineControlToken_of,
+        'State' => \%State_of,
+    },
+    {
+        'AnalyticsEngineControlToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'State' => 'ONVIF::Analytics::Types::AnalyticsState',
+    },
+    {
+
+        'AnalyticsEngineControlToken' => 'AnalyticsEngineControlToken',
+        'State' => 'State',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnalyticsStateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnalyticsStateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsEngineControlToken
+
+
+=item * State
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnalyticsStateInformation
+   AnalyticsEngineControlToken => $some_value, # ReferenceToken
+   State =>  { # ONVIF::Analytics::Types::AnalyticsState
+     Error =>  $some_value, # string
+     State =>  $some_value, # string
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm
new file mode 100644
index 000000000..3094a2b53
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AnyHolder.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AnyHolder;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AnyHolder
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AnyHolder from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AnyHolder
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm
new file mode 100644
index 000000000..f115839da
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Appearance.pm
@@ -0,0 +1,174 @@
+package ONVIF::Analytics::Types::Appearance;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Transformation_of :ATTR(:get<Transformation>);
+my %Shape_of :ATTR(:get<Shape>);
+my %Color_of :ATTR(:get<Color>);
+my %Class_of :ATTR(:get<Class>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Transformation
+        Shape
+        Color
+        Class
+        Extension
+
+    ) ],
+    {
+        'Transformation' => \%Transformation_of,
+        'Shape' => \%Shape_of,
+        'Color' => \%Color_of,
+        'Class' => \%Class_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Transformation' => 'ONVIF::Analytics::Types::Transformation',
+        'Shape' => 'ONVIF::Analytics::Types::ShapeDescriptor',
+        'Color' => 'ONVIF::Analytics::Types::ColorDescriptor',
+        'Class' => 'ONVIF::Analytics::Types::ClassDescriptor',
+        'Extension' => 'ONVIF::Analytics::Types::AppearanceExtension',
+    },
+    {
+
+        'Transformation' => 'Transformation',
+        'Shape' => 'Shape',
+        'Color' => 'Color',
+        'Class' => 'Class',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Appearance
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Appearance from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Transformation
+
+
+=item * Shape
+
+
+=item * Color
+
+
+=item * Class
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Appearance
+   Transformation =>  { # ONVIF::Analytics::Types::Transformation
+     Translate => ,
+     Scale => ,
+     Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+     },
+   },
+   Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+     BoundingBox => ,
+     CenterOfGravity => ,
+     Polygon =>  { # ONVIF::Analytics::Types::Polygon
+       Point => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+     },
+   },
+   Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+     ColorCluster =>  {
+       Color => ,
+       Weight =>  $some_value, # float
+       Covariance => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+     },
+   },
+   Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+     ClassCandidate =>  {
+       Type => $some_value, # ClassType
+       Likelihood =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+       OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+         Type =>  $some_value, # string
+         Likelihood =>  $some_value, # float
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm
new file mode 100644
index 000000000..100aab4aa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AppearanceExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AppearanceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AppearanceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AppearanceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AppearanceExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm
new file mode 100644
index 000000000..f6af419d8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AttachmentData.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::AttachmentData;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::AttachmentData::_AttachmentData::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Include_of :ATTR(:get<Include>);
+
+__PACKAGE__->_factory(
+    [ qw(        Include
+
+    ) ],
+    {
+        'Include' => \%Include_of,
+    },
+    {
+        'Include' => 'ONVIF::Analytics::Elements::Include',
+
+    },
+    {
+
+        'Include' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::AttachmentData::_AttachmentData::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AttachmentData
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttachmentData from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Include
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AttachmentData
+   Include =>  { # ONVIF::Analytics::Types::Include
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::AttachmentData::_AttachmentData::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm
new file mode 100644
index 000000000..2c408028c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStream.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::AudioAnalyticsStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioDescriptor_of :ATTR(:get<AudioDescriptor>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioDescriptor
+        Extension
+
+    ) ],
+    {
+        'AudioDescriptor' => \%AudioDescriptor_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AudioDescriptor' => 'ONVIF::Analytics::Types::AudioDescriptor',
+        'Extension' => 'ONVIF::Analytics::Types::AudioAnalyticsStreamExtension',
+    },
+    {
+
+        'AudioDescriptor' => 'AudioDescriptor',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioAnalyticsStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioAnalyticsStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioDescriptor
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioAnalyticsStream
+   AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm
new file mode 100644
index 000000000..45999e2f4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAnalyticsStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioAnalyticsStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioAnalyticsStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm
new file mode 100644
index 000000000..a10502dea
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioAttributes.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::AudioAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Samplerate_of :ATTR(:get<Samplerate>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        Encoding
+        Samplerate
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'Encoding' => \%Encoding_of,
+        'Samplerate' => \%Samplerate_of,
+    },
+    {
+        'Bitrate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::AudioEncoding',
+        'Samplerate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'Encoding' => 'Encoding',
+        'Samplerate' => 'Samplerate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * Encoding
+
+
+=item * Samplerate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioAttributes
+   Bitrate =>  $some_value, # int
+   Encoding => $some_value, # AudioEncoding
+   Samplerate =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm
new file mode 100644
index 000000000..995ae3393
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassCandidate.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::AudioClassCandidate;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Likelihood_of :ATTR(:get<Likelihood>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Likelihood
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Likelihood' => \%Likelihood_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::AudioClassType',
+        'Likelihood' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Type' => 'Type',
+        'Likelihood' => 'Likelihood',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioClassCandidate
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioClassCandidate from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Likelihood
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioClassCandidate
+   Type => $some_value, # AudioClassType
+   Likelihood =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm
new file mode 100644
index 000000000..df1dddd75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptor.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::AudioClassDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ClassCandidate_of :ATTR(:get<ClassCandidate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ClassCandidate
+        Extension
+
+    ) ],
+    {
+        'ClassCandidate' => \%ClassCandidate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ClassCandidate' => 'ONVIF::Analytics::Types::AudioClassCandidate',
+        'Extension' => 'ONVIF::Analytics::Types::AudioClassDescriptorExtension',
+    },
+    {
+
+        'ClassCandidate' => 'ClassCandidate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioClassDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioClassDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ClassCandidate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioClassDescriptor
+   ClassCandidate =>  { # ONVIF::Analytics::Types::AudioClassCandidate
+     Type => $some_value, # AudioClassType
+     Likelihood =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AudioClassDescriptorExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm
new file mode 100644
index 000000000..8e3b28511
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassDescriptorExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioClassDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioClassDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioClassDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioClassDescriptorExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm
new file mode 100644
index 000000000..628031103
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioClassType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AudioClassType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AudioClassType from the namespace http://www.onvif.org/ver10/schema.
+
+AudioClassType acceptable values are; gun_shot, scream, glass_breaking, tire_screech 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm
new file mode 100644
index 000000000..d9c4599ad
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfiguration.pm
@@ -0,0 +1,107 @@
+package ONVIF::Analytics::Types::AudioDecoderConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDecoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDecoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+The Audio Decoder Configuration does not contain any that parameter to configure the decoding .A decoder shall decode every data it receives (according to its capabilities).
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm
new file mode 100644
index 000000000..700aa1dfa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptions.pm
@@ -0,0 +1,152 @@
+package ONVIF::Analytics::Types::AudioDecoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AACDecOptions_of :ATTR(:get<AACDecOptions>);
+my %G711DecOptions_of :ATTR(:get<G711DecOptions>);
+my %G726DecOptions_of :ATTR(:get<G726DecOptions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AACDecOptions
+        G711DecOptions
+        G726DecOptions
+        Extension
+
+    ) ],
+    {
+        'AACDecOptions' => \%AACDecOptions_of,
+        'G711DecOptions' => \%G711DecOptions_of,
+        'G726DecOptions' => \%G726DecOptions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AACDecOptions' => 'ONVIF::Analytics::Types::AACDecOptions',
+        'G711DecOptions' => 'ONVIF::Analytics::Types::G711DecOptions',
+        'G726DecOptions' => 'ONVIF::Analytics::Types::G726DecOptions',
+        'Extension' => 'ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension',
+    },
+    {
+
+        'AACDecOptions' => 'AACDecOptions',
+        'G711DecOptions' => 'G711DecOptions',
+        'G726DecOptions' => 'G726DecOptions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDecoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDecoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AACDecOptions
+
+
+=item * G711DecOptions
+
+
+=item * G726DecOptions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptions
+   AACDecOptions =>  { # ONVIF::Analytics::Types::AACDecOptions
+     Bitrate =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+   G711DecOptions =>  { # ONVIF::Analytics::Types::G711DecOptions
+     Bitrate =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+   G726DecOptions =>  { # ONVIF::Analytics::Types::G726DecOptions
+     Bitrate =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..399d1b374
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDecoderConfigurationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDecoderConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm
new file mode 100644
index 000000000..3f886044a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioDescriptor.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::AudioDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::AudioDescriptor::_AudioDescriptor::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::AudioDescriptor::_AudioDescriptor::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %UtcTime_of :ATTR(:get<UtcTime>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        UtcTime
+    ) ],
+    {
+
+        UtcTime => \%UtcTime_of,
+    },
+    {
+        UtcTime => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioDescriptor
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::AudioDescriptor::_AudioDescriptor::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * UtcTime
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::dateTime|SOAP::WSDL::XSD::Typelib::Builtin::dateTime>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm
new file mode 100644
index 000000000..a869c1700
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfiguration.pm
@@ -0,0 +1,161 @@
+package ONVIF::Analytics::Types::AudioEncoderConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRate_of :ATTR(:get<SampleRate>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        Encoding
+        Bitrate
+        SampleRate
+        Multicast
+        SessionTimeout
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'Encoding' => \%Encoding_of,
+        'Bitrate' => \%Bitrate_of,
+        'SampleRate' => \%SampleRate_of,
+        'Multicast' => \%Multicast_of,
+        'SessionTimeout' => \%SessionTimeout_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::AudioEncoding',
+        'Bitrate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SampleRate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'Encoding' => 'Encoding',
+        'Bitrate' => 'Bitrate',
+        'SampleRate' => 'SampleRate',
+        'Multicast' => 'Multicast',
+        'SessionTimeout' => 'SessionTimeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Encoding
+
+
+=item * Bitrate
+
+
+=item * SampleRate
+
+
+=item * Multicast
+
+
+=item * SessionTimeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+   Encoding => $some_value, # AudioEncoding
+   Bitrate =>  $some_value, # int
+   SampleRate =>  $some_value, # int
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm
new file mode 100644
index 000000000..57a8e6de1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOption.pm
@@ -0,0 +1,125 @@
+package ONVIF::Analytics::Types::AudioEncoderConfigurationOption;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Encoding_of :ATTR(:get<Encoding>);
+my %BitrateList_of :ATTR(:get<BitrateList>);
+my %SampleRateList_of :ATTR(:get<SampleRateList>);
+
+__PACKAGE__->_factory(
+    [ qw(        Encoding
+        BitrateList
+        SampleRateList
+
+    ) ],
+    {
+        'Encoding' => \%Encoding_of,
+        'BitrateList' => \%BitrateList_of,
+        'SampleRateList' => \%SampleRateList_of,
+    },
+    {
+        'Encoding' => 'ONVIF::Analytics::Types::AudioEncoding',
+        'BitrateList' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateList' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Encoding' => 'Encoding',
+        'BitrateList' => 'BitrateList',
+        'SampleRateList' => 'SampleRateList',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioEncoderConfigurationOption from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Encoding
+
+
+=item * BitrateList
+
+
+=item * SampleRateList
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+   Encoding => $some_value, # AudioEncoding
+   BitrateList =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateList =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm
new file mode 100644
index 000000000..a044596dd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoderConfigurationOptions.pm
@@ -0,0 +1,111 @@
+package ONVIF::Analytics::Types::AudioEncoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Options_of :ATTR(:get<Options>);
+
+__PACKAGE__->_factory(
+    [ qw(        Options
+
+    ) ],
+    {
+        'Options' => \%Options_of,
+    },
+    {
+        'Options' => 'ONVIF::Analytics::Types::AudioEncoderConfigurationOption',
+    },
+    {
+
+        'Options' => 'Options',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioEncoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioEncoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Options
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioEncoderConfigurationOptions
+   Options =>  { # ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+     Encoding => $some_value, # AudioEncoding
+     BitrateList =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     SampleRateList =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm
new file mode 100644
index 000000000..ed5275839
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioEncoding.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AudioEncoding;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AudioEncoding from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm
new file mode 100644
index 000000000..6f6203580
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutput.pm
@@ -0,0 +1,97 @@
+package ONVIF::Analytics::Types::AudioOutput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioOutput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioOutput from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical audio outputs.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutput
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm
new file mode 100644
index 000000000..7be3bab34
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfiguration.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::AudioOutputConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %OutputToken_of :ATTR(:get<OutputToken>);
+my %SendPrimacy_of :ATTR(:get<SendPrimacy>);
+my %OutputLevel_of :ATTR(:get<OutputLevel>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        OutputToken
+        SendPrimacy
+        OutputLevel
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'OutputToken' => \%OutputToken_of,
+        'SendPrimacy' => \%SendPrimacy_of,
+        'OutputLevel' => \%OutputLevel_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'OutputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'SendPrimacy' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'OutputLevel' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'OutputToken' => 'OutputToken',
+        'SendPrimacy' => 'SendPrimacy',
+        'OutputLevel' => 'OutputLevel',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioOutputConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioOutputConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OutputToken
+
+
+=item * SendPrimacy
+
+
+=item * OutputLevel
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutputConfiguration
+   OutputToken => $some_value, # ReferenceToken
+   SendPrimacy =>  $some_value, # anyURI
+   OutputLevel =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm
new file mode 100644
index 000000000..3baa764f4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioOutputConfigurationOptions.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::AudioOutputConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %OutputTokensAvailable_of :ATTR(:get<OutputTokensAvailable>);
+my %SendPrimacyOptions_of :ATTR(:get<SendPrimacyOptions>);
+my %OutputLevelRange_of :ATTR(:get<OutputLevelRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        OutputTokensAvailable
+        SendPrimacyOptions
+        OutputLevelRange
+
+    ) ],
+    {
+        'OutputTokensAvailable' => \%OutputTokensAvailable_of,
+        'SendPrimacyOptions' => \%SendPrimacyOptions_of,
+        'OutputLevelRange' => \%OutputLevelRange_of,
+    },
+    {
+        'OutputTokensAvailable' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'SendPrimacyOptions' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'OutputLevelRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'OutputTokensAvailable' => 'OutputTokensAvailable',
+        'SendPrimacyOptions' => 'SendPrimacyOptions',
+        'OutputLevelRange' => 'OutputLevelRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioOutputConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioOutputConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OutputTokensAvailable
+
+
+=item * SendPrimacyOptions
+
+
+=item * OutputLevelRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioOutputConfigurationOptions
+   OutputTokensAvailable => $some_value, # ReferenceToken
+   SendPrimacyOptions =>  $some_value, # anyURI
+   OutputLevelRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm
new file mode 100644
index 000000000..e2c7aa095
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSource.pm
@@ -0,0 +1,106 @@
+package ONVIF::Analytics::Types::AudioSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Channels_of :ATTR(:get<Channels>);
+
+__PACKAGE__->_factory(
+    [ qw(        Channels
+
+    ) ],
+    {
+        'Channels' => \%Channels_of,
+    },
+    {
+        'Channels' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Channels' => 'Channels',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSource from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical audio input.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Channels
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSource
+   Channels =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm
new file mode 100644
index 000000000..e33e7f563
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfiguration.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::AudioSourceConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %SourceToken_of :ATTR(:get<SourceToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        SourceToken
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'SourceToken' => \%SourceToken_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SourceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'SourceToken' => 'SourceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm
new file mode 100644
index 000000000..362255479
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceConfigurationOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::AudioSourceConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InputTokensAvailable_of :ATTR(:get<InputTokensAvailable>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InputTokensAvailable
+        Extension
+
+    ) ],
+    {
+        'InputTokensAvailable' => \%InputTokensAvailable_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InputTokensAvailable' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::AudioSourceOptionsExtension',
+    },
+    {
+
+        'InputTokensAvailable' => 'InputTokensAvailable',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSourceConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSourceConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InputTokensAvailable
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceConfigurationOptions
+   InputTokensAvailable => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::AudioSourceOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm
new file mode 100644
index 000000000..deaaa172e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AudioSourceOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::AudioSourceOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::AudioSourceOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AudioSourceOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::AudioSourceOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm
new file mode 100644
index 000000000..6020bd018
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AutoFocusMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AutoFocusMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AutoFocusMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm
new file mode 100644
index 000000000..4b794ad4b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/AuxiliaryData.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::AuxiliaryData;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AuxiliaryData from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm
new file mode 100644
index 000000000..2765f7939
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::BacklightCompensation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::BacklightCompensationMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensation
+   Mode => $some_value, # BacklightCompensationMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm
new file mode 100644
index 000000000..825f37321
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensation20.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::BacklightCompensation20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::BacklightCompensationMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensation20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensation20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing whether BLC mode is enabled or disabled (on/off).
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensation20
+   Mode => $some_value, # BacklightCompensationMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm
new file mode 100644
index 000000000..42b10ff10
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::BacklightCompensationMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+BacklightCompensationMode from the namespace http://www.onvif.org/ver10/schema.
+
+Enumeration describing the available backlight compenstation modes.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm
new file mode 100644
index 000000000..bdbdd60e6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::BacklightCompensationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensationOptions
+   Mode => $some_value, # WideDynamicMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm
new file mode 100644
index 000000000..1be4624ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BacklightCompensationOptions20.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::BacklightCompensationOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::BacklightCompensationMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BacklightCompensationOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BacklightCompensationOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BacklightCompensationOptions20
+   Mode => $some_value, # BacklightCompensationMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm
new file mode 100644
index 000000000..b935fc38e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BackupFile.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::BackupFile;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Data_of :ATTR(:get<Data>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Data
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Data' => \%Data_of,
+    },
+    {
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Data' => 'ONVIF::Analytics::Types::AttachmentData',
+    },
+    {
+
+        'Name' => 'Name',
+        'Data' => 'Data',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BackupFile
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BackupFile from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Data
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BackupFile
+   Name =>  $some_value, # string
+   Data =>  { # ONVIF::Analytics::Types::AttachmentData
+     Include =>  { # ONVIF::Analytics::Types::Include
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm
new file mode 100644
index 000000000..3bc6bddbe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Behaviour.pm
@@ -0,0 +1,212 @@
+package ONVIF::Analytics::Types::Behaviour;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Removed_of :ATTR(:get<Removed>);
+my %Idle_of :ATTR(:get<Idle>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Removed
+        Idle
+        Extension
+
+    ) ],
+    {
+        'Removed' => \%Removed_of,
+        'Idle' => \%Idle_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'Removed' => 'ONVIF::Analytics::Types::Behaviour::_Removed',
+
+        'Idle' => 'ONVIF::Analytics::Types::Behaviour::_Idle',
+        'Extension' => 'ONVIF::Analytics::Types::BehaviourExtension',
+    },
+    {
+
+        'Removed' => 'Removed',
+        'Idle' => 'Idle',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Behaviour::_Idle;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::Behaviour::_Removed;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Behaviour
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Behaviour from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Removed
+
+
+=item * Idle
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Behaviour
+   Removed =>  {
+   },
+   Idle =>  {
+   },
+   Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm
new file mode 100644
index 000000000..c9645a1b7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BehaviourExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::BehaviourExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BehaviourExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BehaviourExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BehaviourExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm
new file mode 100644
index 000000000..c6e84177b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/BinaryData.pm
@@ -0,0 +1,147 @@
+package ONVIF::Analytics::Types::BinaryData;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::BinaryData::_BinaryData::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Data_of :ATTR(:get<Data>);
+
+__PACKAGE__->_factory(
+    [ qw(        Data
+
+    ) ],
+    {
+        'Data' => \%Data_of,
+    },
+    {
+        'Data' => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary',
+    },
+    {
+
+        'Data' => 'Data',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::BinaryData::_BinaryData::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::BinaryData
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BinaryData from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Data
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::BinaryData
+   Data =>  $some_value, # base64Binary
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::BinaryData::_BinaryData::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm
new file mode 100644
index 000000000..61a44e3de
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Body.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Body;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Body
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Body from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+Prose in the spec does not specify that attributes are allowed on the Body element 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Body
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm
new file mode 100644
index 000000000..38a852a23
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Capabilities.pm
@@ -0,0 +1,167 @@
+package ONVIF::Analytics::Types::Capabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver20/analytics/wsdl' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Capabilities::_Capabilities::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Capabilities::_Capabilities::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %RuleSupport_of :ATTR(:get<RuleSupport>);
+my %AnalyticsModuleSupport_of :ATTR(:get<AnalyticsModuleSupport>);
+my %CellBasedSceneDescriptionSupported_of :ATTR(:get<CellBasedSceneDescriptionSupported>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        RuleSupport
+        AnalyticsModuleSupport
+        CellBasedSceneDescriptionSupported
+    ) ],
+    {
+
+        RuleSupport => \%RuleSupport_of,
+
+        AnalyticsModuleSupport => \%AnalyticsModuleSupport_of,
+
+        CellBasedSceneDescriptionSupported => \%CellBasedSceneDescriptionSupported_of,
+    },
+    {
+        RuleSupport => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        AnalyticsModuleSupport => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        CellBasedSceneDescriptionSupported => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Capabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Capabilities from the namespace http://www.onvif.org/ver20/analytics/wsdl.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Capabilities
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Capabilities::_Capabilities::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * RuleSupport
+
+ Indication that the device supports the rules interface and the rules syntax.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+=item * AnalyticsModuleSupport
+
+ Indication that the device supports the scene analytics module interface.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+=item * CellBasedSceneDescriptionSupported
+
+ Indication that the device produces the cell based scene description
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm
new file mode 100644
index 000000000..c753a1282
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension.pm
@@ -0,0 +1,201 @@
+package ONVIF::Analytics::Types::CapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DeviceIO_of :ATTR(:get<DeviceIO>);
+my %Display_of :ATTR(:get<Display>);
+my %Recording_of :ATTR(:get<Recording>);
+my %Search_of :ATTR(:get<Search>);
+my %Replay_of :ATTR(:get<Replay>);
+my %Receiver_of :ATTR(:get<Receiver>);
+my %AnalyticsDevice_of :ATTR(:get<AnalyticsDevice>);
+my %Extensions_of :ATTR(:get<Extensions>);
+
+__PACKAGE__->_factory(
+    [ qw(        DeviceIO
+        Display
+        Recording
+        Search
+        Replay
+        Receiver
+        AnalyticsDevice
+        Extensions
+
+    ) ],
+    {
+        'DeviceIO' => \%DeviceIO_of,
+        'Display' => \%Display_of,
+        'Recording' => \%Recording_of,
+        'Search' => \%Search_of,
+        'Replay' => \%Replay_of,
+        'Receiver' => \%Receiver_of,
+        'AnalyticsDevice' => \%AnalyticsDevice_of,
+        'Extensions' => \%Extensions_of,
+    },
+    {
+        'DeviceIO' => 'ONVIF::Analytics::Types::DeviceIOCapabilities',
+        'Display' => 'ONVIF::Analytics::Types::DisplayCapabilities',
+        'Recording' => 'ONVIF::Analytics::Types::RecordingCapabilities',
+        'Search' => 'ONVIF::Analytics::Types::SearchCapabilities',
+        'Replay' => 'ONVIF::Analytics::Types::ReplayCapabilities',
+        'Receiver' => 'ONVIF::Analytics::Types::ReceiverCapabilities',
+        'AnalyticsDevice' => 'ONVIF::Analytics::Types::AnalyticsDeviceCapabilities',
+        'Extensions' => 'ONVIF::Analytics::Types::CapabilitiesExtension2',
+    },
+    {
+
+        'DeviceIO' => 'DeviceIO',
+        'Display' => 'Display',
+        'Recording' => 'Recording',
+        'Search' => 'Search',
+        'Replay' => 'Replay',
+        'Receiver' => 'Receiver',
+        'AnalyticsDevice' => 'AnalyticsDevice',
+        'Extensions' => 'Extensions',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DeviceIO
+
+
+=item * Display
+
+
+=item * Recording
+
+
+=item * Search
+
+
+=item * Replay
+
+
+=item * Receiver
+
+
+=item * AnalyticsDevice
+
+
+=item * Extensions
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CapabilitiesExtension
+   DeviceIO =>  { # ONVIF::Analytics::Types::DeviceIOCapabilities
+     XAddr =>  $some_value, # anyURI
+     VideoSources =>  $some_value, # int
+     VideoOutputs =>  $some_value, # int
+     AudioSources =>  $some_value, # int
+     AudioOutputs =>  $some_value, # int
+     RelayOutputs =>  $some_value, # int
+   },
+   Display =>  { # ONVIF::Analytics::Types::DisplayCapabilities
+     XAddr =>  $some_value, # anyURI
+     FixedLayout =>  $some_value, # boolean
+   },
+   Recording =>  { # ONVIF::Analytics::Types::RecordingCapabilities
+     XAddr =>  $some_value, # anyURI
+     ReceiverSource =>  $some_value, # boolean
+     MediaProfileSource =>  $some_value, # boolean
+     DynamicRecordings =>  $some_value, # boolean
+     DynamicTracks =>  $some_value, # boolean
+     MaxStringLength =>  $some_value, # int
+   },
+   Search =>  { # ONVIF::Analytics::Types::SearchCapabilities
+     XAddr =>  $some_value, # anyURI
+     MetadataSearch =>  $some_value, # boolean
+   },
+   Replay =>  { # ONVIF::Analytics::Types::ReplayCapabilities
+     XAddr =>  $some_value, # anyURI
+   },
+   Receiver =>  { # ONVIF::Analytics::Types::ReceiverCapabilities
+     XAddr =>  $some_value, # anyURI
+     RTP_Multicast =>  $some_value, # boolean
+     RTP_TCP =>  $some_value, # boolean
+     RTP_RTSP_TCP =>  $some_value, # boolean
+     SupportedReceivers =>  $some_value, # int
+     MaximumRTSPURILength =>  $some_value, # int
+   },
+   AnalyticsDevice =>  { # ONVIF::Analytics::Types::AnalyticsDeviceCapabilities
+     XAddr =>  $some_value, # anyURI
+     RuleSupport =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsDeviceExtension
+     },
+   },
+   Extensions =>  { # ONVIF::Analytics::Types::CapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm
new file mode 100644
index 000000000..787bc5652
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::CapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm
new file mode 100644
index 000000000..50c163db1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CapabilityCategory.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::CapabilityCategory;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+CapabilityCategory from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm
new file mode 100644
index 000000000..818617d5d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CellLayout.pm
@@ -0,0 +1,168 @@
+package ONVIF::Analytics::Types::CellLayout;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::CellLayout::_CellLayout::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Transformation_of :ATTR(:get<Transformation>);
+
+__PACKAGE__->_factory(
+    [ qw(        Transformation
+
+    ) ],
+    {
+        'Transformation' => \%Transformation_of,
+    },
+    {
+        'Transformation' => 'ONVIF::Analytics::Types::Transformation',
+    },
+    {
+
+        'Transformation' => 'Transformation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::CellLayout::_CellLayout::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Columns_of :ATTR(:get<Columns>);
+my %Rows_of :ATTR(:get<Rows>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Columns
+        Rows
+    ) ],
+    {
+
+        Columns => \%Columns_of,
+
+        Rows => \%Rows_of,
+    },
+    {
+        Columns => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+        Rows => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CellLayout
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CellLayout from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Transformation
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CellLayout
+   Transformation =>  { # ONVIF::Analytics::Types::Transformation
+     Translate => ,
+     Scale => ,
+     Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::CellLayout::_CellLayout::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Columns
+
+ Number of columns of the cell grid (x dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+=item * Rows
+
+ Number of rows of the cell grid (y dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm
new file mode 100644
index 000000000..afe0724de
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Certificate.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::Certificate;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Certificate_of :ATTR(:get<Certificate>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Certificate
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Certificate' => \%Certificate_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Certificate' => 'ONVIF::Analytics::Types::BinaryData',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Certificate' => 'Certificate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Certificate
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Certificate from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Certificate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Certificate
+   CertificateID =>  $some_value, # token
+   Certificate =>  { # ONVIF::Analytics::Types::BinaryData
+     Data =>  $some_value, # base64Binary
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm
new file mode 100644
index 000000000..c59489646
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParameters.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::CertificateGenerationParameters;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Subject_of :ATTR(:get<Subject>);
+my %ValidNotBefore_of :ATTR(:get<ValidNotBefore>);
+my %ValidNotAfter_of :ATTR(:get<ValidNotAfter>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Subject
+        ValidNotBefore
+        ValidNotAfter
+        Extension
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Subject' => \%Subject_of,
+        'ValidNotBefore' => \%ValidNotBefore_of,
+        'ValidNotAfter' => \%ValidNotAfter_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Subject' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'ValidNotBefore' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'ValidNotAfter' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Extension' => 'ONVIF::Analytics::Types::CertificateGenerationParametersExtension',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Subject' => 'Subject',
+        'ValidNotBefore' => 'ValidNotBefore',
+        'ValidNotAfter' => 'ValidNotAfter',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateGenerationParameters
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateGenerationParameters from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Subject
+
+
+=item * ValidNotBefore
+
+
+=item * ValidNotAfter
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateGenerationParameters
+   CertificateID =>  $some_value, # token
+   Subject =>  $some_value, # string
+   ValidNotBefore =>  $some_value, # token
+   ValidNotAfter =>  $some_value, # token
+   Extension =>  { # ONVIF::Analytics::Types::CertificateGenerationParametersExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm
new file mode 100644
index 000000000..028bc727b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateGenerationParametersExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::CertificateGenerationParametersExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateGenerationParametersExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateGenerationParametersExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateGenerationParametersExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm
new file mode 100644
index 000000000..406e406e7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformation.pm
@@ -0,0 +1,197 @@
+package ONVIF::Analytics::Types::CertificateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %IssuerDN_of :ATTR(:get<IssuerDN>);
+my %SubjectDN_of :ATTR(:get<SubjectDN>);
+my %KeyUsage_of :ATTR(:get<KeyUsage>);
+my %ExtendedKeyUsage_of :ATTR(:get<ExtendedKeyUsage>);
+my %KeyLength_of :ATTR(:get<KeyLength>);
+my %Version_of :ATTR(:get<Version>);
+my %SerialNum_of :ATTR(:get<SerialNum>);
+my %SignatureAlgorithm_of :ATTR(:get<SignatureAlgorithm>);
+my %Validity_of :ATTR(:get<Validity>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        IssuerDN
+        SubjectDN
+        KeyUsage
+        ExtendedKeyUsage
+        KeyLength
+        Version
+        SerialNum
+        SignatureAlgorithm
+        Validity
+        Extension
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'IssuerDN' => \%IssuerDN_of,
+        'SubjectDN' => \%SubjectDN_of,
+        'KeyUsage' => \%KeyUsage_of,
+        'ExtendedKeyUsage' => \%ExtendedKeyUsage_of,
+        'KeyLength' => \%KeyLength_of,
+        'Version' => \%Version_of,
+        'SerialNum' => \%SerialNum_of,
+        'SignatureAlgorithm' => \%SignatureAlgorithm_of,
+        'Validity' => \%Validity_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'IssuerDN' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'SubjectDN' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'KeyUsage' => 'ONVIF::Analytics::Types::CertificateUsage',
+        'ExtendedKeyUsage' => 'ONVIF::Analytics::Types::CertificateUsage',
+        'KeyLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Version' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'SerialNum' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'SignatureAlgorithm' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Validity' => 'ONVIF::Analytics::Types::DateTimeRange',
+        'Extension' => 'ONVIF::Analytics::Types::CertificateInformationExtension',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'IssuerDN' => 'IssuerDN',
+        'SubjectDN' => 'SubjectDN',
+        'KeyUsage' => 'KeyUsage',
+        'ExtendedKeyUsage' => 'ExtendedKeyUsage',
+        'KeyLength' => 'KeyLength',
+        'Version' => 'Version',
+        'SerialNum' => 'SerialNum',
+        'SignatureAlgorithm' => 'SignatureAlgorithm',
+        'Validity' => 'Validity',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * IssuerDN
+
+
+=item * SubjectDN
+
+
+=item * KeyUsage
+
+
+=item * ExtendedKeyUsage
+
+
+=item * KeyLength
+
+
+=item * Version
+
+
+=item * SerialNum
+
+
+=item * SignatureAlgorithm
+
+
+=item * Validity
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateInformation
+   CertificateID =>  $some_value, # token
+   IssuerDN =>  $some_value, # string
+   SubjectDN =>  $some_value, # string
+   KeyUsage =>  { value => $some_value },
+   ExtendedKeyUsage =>  { value => $some_value },
+   KeyLength =>  $some_value, # int
+   Version =>  $some_value, # string
+   SerialNum =>  $some_value, # string
+   SignatureAlgorithm =>  $some_value, # string
+   Validity =>  { # ONVIF::Analytics::Types::DateTimeRange
+     From =>  $some_value, # dateTime
+     Until =>  $some_value, # dateTime
+   },
+   Extension =>  { # ONVIF::Analytics::Types::CertificateInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm
new file mode 100644
index 000000000..e900a9c76
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::CertificateInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm
new file mode 100644
index 000000000..64b2a41e3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateStatus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::CertificateStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Status_of :ATTR(:get<Status>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Status
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Status' => \%Status_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Status' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Status' => 'Status',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Status
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateStatus
+   CertificateID =>  $some_value, # token
+   Status =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm
new file mode 100644
index 000000000..7ba79b94e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateUsage.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::CertificateUsage;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::CertificateUsage::_CertificateUsage::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package ONVIF::Analytics::Types::CertificateUsage::_CertificateUsage::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Critical_of :ATTR(:get<Critical>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Critical
+    ) ],
+    {
+
+        Critical => \%Critical_of,
+    },
+    {
+        Critical => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateUsage
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateUsage from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::CertificateUsage::_CertificateUsage::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Critical
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm
new file mode 100644
index 000000000..17a7f8b97
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CertificateWithPrivateKey.pm
@@ -0,0 +1,125 @@
+package ONVIF::Analytics::Types::CertificateWithPrivateKey;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+my %Certificate_of :ATTR(:get<Certificate>);
+my %PrivateKey_of :ATTR(:get<PrivateKey>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+        Certificate
+        PrivateKey
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+        'Certificate' => \%Certificate_of,
+        'PrivateKey' => \%PrivateKey_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Certificate' => 'ONVIF::Analytics::Types::BinaryData',
+        'PrivateKey' => 'ONVIF::Analytics::Types::BinaryData',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+        'Certificate' => 'Certificate',
+        'PrivateKey' => 'PrivateKey',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CertificateWithPrivateKey
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CertificateWithPrivateKey from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+=item * Certificate
+
+
+=item * PrivateKey
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CertificateWithPrivateKey
+   CertificateID =>  $some_value, # token
+   Certificate =>  { # ONVIF::Analytics::Types::BinaryData
+     Data =>  $some_value, # base64Binary
+   },
+   PrivateKey =>  { # ONVIF::Analytics::Types::BinaryData
+     Data =>  $some_value, # base64Binary
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm
new file mode 100644
index 000000000..e7bf8d651
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptor.pm
@@ -0,0 +1,176 @@
+package ONVIF::Analytics::Types::ClassDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ClassCandidate_of :ATTR(:get<ClassCandidate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ClassCandidate
+        Extension
+
+    ) ],
+    {
+        'ClassCandidate' => \%ClassCandidate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'ClassCandidate' => 'ONVIF::Analytics::Types::ClassDescriptor::_ClassCandidate',
+        'Extension' => 'ONVIF::Analytics::Types::ClassDescriptorExtension',
+    },
+    {
+
+        'ClassCandidate' => 'ClassCandidate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ClassDescriptor::_ClassCandidate;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Likelihood_of :ATTR(:get<Likelihood>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Likelihood
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Likelihood' => \%Likelihood_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::ClassType',
+        'Likelihood' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Type' => 'Type',
+        'Likelihood' => 'Likelihood',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ClassDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ClassDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ClassCandidate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ClassDescriptor
+   ClassCandidate =>  {
+     Type => $some_value, # ClassType
+     Likelihood =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+     OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+       Type =>  $some_value, # string
+       Likelihood =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm
new file mode 100644
index 000000000..d0f2b1fa2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::ClassDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %OtherTypes_of :ATTR(:get<OtherTypes>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        OtherTypes
+        Extension
+
+    ) ],
+    {
+        'OtherTypes' => \%OtherTypes_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'OtherTypes' => 'ONVIF::Analytics::Types::OtherType',
+        'Extension' => 'ONVIF::Analytics::Types::ClassDescriptorExtension2',
+    },
+    {
+
+        'OtherTypes' => 'OtherTypes',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ClassDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ClassDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OtherTypes
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ClassDescriptorExtension
+   OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+     Type =>  $some_value, # string
+     Likelihood =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm
new file mode 100644
index 000000000..4ef892aef
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassDescriptorExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ClassDescriptorExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ClassDescriptorExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ClassDescriptorExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm
new file mode 100644
index 000000000..7d788ea56
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ClassType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ClassType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ClassType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm
new file mode 100644
index 000000000..8f761ca97
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/CodingCapabilities.pm
@@ -0,0 +1,205 @@
+package ONVIF::Analytics::Types::CodingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioEncodingCapabilities_of :ATTR(:get<AudioEncodingCapabilities>);
+my %AudioDecodingCapabilities_of :ATTR(:get<AudioDecodingCapabilities>);
+my %VideoDecodingCapabilities_of :ATTR(:get<VideoDecodingCapabilities>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioEncodingCapabilities
+        AudioDecodingCapabilities
+        VideoDecodingCapabilities
+
+    ) ],
+    {
+        'AudioEncodingCapabilities' => \%AudioEncodingCapabilities_of,
+        'AudioDecodingCapabilities' => \%AudioDecodingCapabilities_of,
+        'VideoDecodingCapabilities' => \%VideoDecodingCapabilities_of,
+    },
+    {
+        'AudioEncodingCapabilities' => 'ONVIF::Analytics::Types::AudioEncoderConfigurationOptions',
+        'AudioDecodingCapabilities' => 'ONVIF::Analytics::Types::AudioDecoderConfigurationOptions',
+        'VideoDecodingCapabilities' => 'ONVIF::Analytics::Types::VideoDecoderConfigurationOptions',
+    },
+    {
+
+        'AudioEncodingCapabilities' => 'AudioEncodingCapabilities',
+        'AudioDecodingCapabilities' => 'AudioDecodingCapabilities',
+        'VideoDecodingCapabilities' => 'VideoDecodingCapabilities',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::CodingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+CodingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+This type contains the Audio and Video coding capabilities of a display service.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioEncodingCapabilities
+
+
+=item * AudioDecodingCapabilities
+
+
+=item * VideoDecodingCapabilities
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::CodingCapabilities
+   AudioEncodingCapabilities =>  { # ONVIF::Analytics::Types::AudioEncoderConfigurationOptions
+     Options =>  { # ONVIF::Analytics::Types::AudioEncoderConfigurationOption
+       Encoding => $some_value, # AudioEncoding
+       BitrateList =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateList =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+   },
+   AudioDecodingCapabilities =>  { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptions
+     AACDecOptions =>  { # ONVIF::Analytics::Types::AACDecOptions
+       Bitrate =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+     G711DecOptions =>  { # ONVIF::Analytics::Types::G711DecOptions
+       Bitrate =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+     G726DecOptions =>  { # ONVIF::Analytics::Types::G726DecOptions
+       Bitrate =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AudioDecoderConfigurationOptionsExtension
+     },
+   },
+   VideoDecodingCapabilities =>  { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptions
+     JpegDecOptions =>  { # ONVIF::Analytics::Types::JpegDecOptions
+       ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+         Width =>  $some_value, # int
+         Height =>  $some_value, # int
+       },
+       SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     H264DecOptions =>  { # ONVIF::Analytics::Types::H264DecOptions
+       ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+         Width =>  $some_value, # int
+         Height =>  $some_value, # int
+       },
+       SupportedH264Profiles => $some_value, # H264Profile
+       SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     Mpeg4DecOptions =>  { # ONVIF::Analytics::Types::Mpeg4DecOptions
+       ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+         Width =>  $some_value, # int
+         Height =>  $some_value, # int
+       },
+       SupportedMpeg4Profiles => $some_value, # Mpeg4Profile
+       SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm
new file mode 100644
index 000000000..8632b3d75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Color.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::Color;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Color::_Color::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Color::_Color::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %X_of :ATTR(:get<X>);
+my %Y_of :ATTR(:get<Y>);
+my %Z_of :ATTR(:get<Z>);
+my %Colorspace_of :ATTR(:get<Colorspace>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        X
+        Y
+        Z
+        Colorspace
+    ) ],
+    {
+
+        X => \%X_of,
+
+        Y => \%Y_of,
+
+        Z => \%Z_of,
+
+        Colorspace => \%Colorspace_of,
+    },
+    {
+        X => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Y => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Z => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Colorspace => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Color
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Color from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Color::_Color::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * X
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Z
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Colorspace
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm
new file mode 100644
index 000000000..f3cafc4b6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorCovariance.pm
@@ -0,0 +1,188 @@
+package ONVIF::Analytics::Types::ColorCovariance;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ColorCovariance::_ColorCovariance::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ColorCovariance::_ColorCovariance::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %XX_of :ATTR(:get<XX>);
+my %YY_of :ATTR(:get<YY>);
+my %ZZ_of :ATTR(:get<ZZ>);
+my %XY_of :ATTR(:get<XY>);
+my %XZ_of :ATTR(:get<XZ>);
+my %YZ_of :ATTR(:get<YZ>);
+my %Colorspace_of :ATTR(:get<Colorspace>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        XX
+        YY
+        ZZ
+        XY
+        XZ
+        YZ
+        Colorspace
+    ) ],
+    {
+
+        XX => \%XX_of,
+
+        YY => \%YY_of,
+
+        ZZ => \%ZZ_of,
+
+        XY => \%XY_of,
+
+        XZ => \%XZ_of,
+
+        YZ => \%YZ_of,
+
+        Colorspace => \%Colorspace_of,
+    },
+    {
+        XX => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        YY => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        ZZ => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        XY => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        XZ => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        YZ => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        Colorspace => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorCovariance
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorCovariance from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ColorCovariance::_ColorCovariance::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * XX
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * YY
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * ZZ
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * XY
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * XZ
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * YZ
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * Colorspace
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm
new file mode 100644
index 000000000..102629f8d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptor.pm
@@ -0,0 +1,176 @@
+package ONVIF::Analytics::Types::ColorDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ColorCluster_of :ATTR(:get<ColorCluster>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ColorCluster
+        Extension
+
+    ) ],
+    {
+        'ColorCluster' => \%ColorCluster_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'ColorCluster' => 'ONVIF::Analytics::Types::ColorDescriptor::_ColorCluster',
+        'Extension' => 'ONVIF::Analytics::Types::ColorDescriptorExtension',
+    },
+    {
+
+        'ColorCluster' => 'ColorCluster',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ColorDescriptor::_ColorCluster;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Color_of :ATTR(:get<Color>);
+my %Weight_of :ATTR(:get<Weight>);
+my %Covariance_of :ATTR(:get<Covariance>);
+
+__PACKAGE__->_factory(
+    [ qw(        Color
+        Weight
+        Covariance
+
+    ) ],
+    {
+        'Color' => \%Color_of,
+        'Weight' => \%Weight_of,
+        'Covariance' => \%Covariance_of,
+    },
+    {
+        'Color' => 'ONVIF::Analytics::Types::Color',
+        'Weight' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Covariance' => 'ONVIF::Analytics::Types::ColorCovariance',
+    },
+    {
+
+        'Color' => 'Color',
+        'Weight' => 'Weight',
+        'Covariance' => 'Covariance',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ColorCluster
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorDescriptor
+   ColorCluster =>  {
+     Color => ,
+     Weight =>  $some_value, # float
+     Covariance => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm
new file mode 100644
index 000000000..bc67c8681
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorDescriptorExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ColorDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorDescriptorExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm
new file mode 100644
index 000000000..eaf6fea9f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorOptions.pm
@@ -0,0 +1,128 @@
+package ONVIF::Analytics::Types::ColorOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ColorList_of :ATTR(:get<ColorList>);
+my %ColorspaceRange_of :ATTR(:get<ColorspaceRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ColorList
+        ColorspaceRange
+
+    ) ],
+    {
+        'ColorList' => \%ColorList_of,
+        'ColorspaceRange' => \%ColorspaceRange_of,
+    },
+    {
+        'ColorList' => 'ONVIF::Analytics::Types::Color',
+        'ColorspaceRange' => 'ONVIF::Analytics::Types::ColorspaceRange',
+    },
+    {
+
+        'ColorList' => 'ColorList',
+        'ColorspaceRange' => 'ColorspaceRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorOptions from the namespace http://www.onvif.org/ver10/schema.
+
+http://www.onvif.org/ver10/colorspace/HSV - HSV colourspace 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ColorList
+
+
+=item * ColorspaceRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorOptions
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   ColorList => ,
+   ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+     X =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Y =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Z =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Colorspace =>  $some_value, # anyURI
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm
new file mode 100644
index 000000000..9a41fd6e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ColorspaceRange.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::ColorspaceRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %X_of :ATTR(:get<X>);
+my %Y_of :ATTR(:get<Y>);
+my %Z_of :ATTR(:get<Z>);
+my %Colorspace_of :ATTR(:get<Colorspace>);
+
+__PACKAGE__->_factory(
+    [ qw(        X
+        Y
+        Z
+        Colorspace
+
+    ) ],
+    {
+        'X' => \%X_of,
+        'Y' => \%Y_of,
+        'Z' => \%Z_of,
+        'Colorspace' => \%Colorspace_of,
+    },
+    {
+        'X' => 'ONVIF::Analytics::Types::FloatRange',
+        'Y' => 'ONVIF::Analytics::Types::FloatRange',
+        'Z' => 'ONVIF::Analytics::Types::FloatRange',
+        'Colorspace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'X' => 'X',
+        'Y' => 'Y',
+        'Z' => 'Z',
+        'Colorspace' => 'Colorspace',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ColorspaceRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ColorspaceRange from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * X
+
+
+=item * Y
+
+
+=item * Z
+
+
+=item * Colorspace
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ColorspaceRange
+   X =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Y =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Z =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Colorspace =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm
new file mode 100644
index 000000000..b4fbe9997
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Config.pm
@@ -0,0 +1,169 @@
+package ONVIF::Analytics::Types::Config;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Config::_Config::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Parameters_of :ATTR(:get<Parameters>);
+
+__PACKAGE__->_factory(
+    [ qw(        Parameters
+
+    ) ],
+    {
+        'Parameters' => \%Parameters_of,
+    },
+    {
+        'Parameters' => 'ONVIF::Analytics::Types::ItemList',
+    },
+    {
+
+        'Parameters' => 'Parameters',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Config::_Config::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Type
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Type => \%Type_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Config
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Config from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Parameters
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Config
+   Parameters =>  { # ONVIF::Analytics::Types::ItemList
+     SimpleItem => ,
+     ElementItem =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Config::_Config::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Name
+
+ Name of the configuration.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::string|SOAP::WSDL::XSD::Typelib::Builtin::string>.
+
+=item * Type
+
+ Type of the configuration represented by a unique QName. The Type characterizes a ConfigDescription defining the Parameters.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm
new file mode 100644
index 000000000..e36c3ac0b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescription.pm
@@ -0,0 +1,248 @@
+package ONVIF::Analytics::Types::ConfigDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ConfigDescription::_ConfigDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Parameters_of :ATTR(:get<Parameters>);
+my %Messages_of :ATTR(:get<Messages>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Parameters
+        Messages
+        Extension
+
+    ) ],
+    {
+        'Parameters' => \%Parameters_of,
+        'Messages' => \%Messages_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Parameters' => 'ONVIF::Analytics::Types::ItemListDescription',
+
+        'Messages' => 'ONVIF::Analytics::Types::ConfigDescription::_Messages',
+        'Extension' => 'ONVIF::Analytics::Types::ConfigDescriptionExtension',
+    },
+    {
+
+        'Parameters' => 'Parameters',
+        'Messages' => 'Messages',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ConfigDescription::_Messages;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::MessageDescription);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Key_of :ATTR(:get<Key>);
+my %Data_of :ATTR(:get<Data>);
+my %Extension_of :ATTR(:get<Extension>);
+my %ParentTopic_of :ATTR(:get<ParentTopic>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Key
+        Data
+        Extension
+        ParentTopic
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Key' => \%Key_of,
+        'Data' => \%Data_of,
+        'Extension' => \%Extension_of,
+        'ParentTopic' => \%ParentTopic_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Key' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+        'ParentTopic' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Source' => 'Source',
+        'Key' => 'Key',
+        'Data' => 'Data',
+        'Extension' => 'Extension',
+        'ParentTopic' => 'ParentTopic',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::ConfigDescription::_ConfigDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+    ) ],
+    {
+
+        Name => \%Name_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ConfigDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ConfigDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Parameters
+
+
+=item * Messages
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ConfigDescription
+   Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Messages =>  {
+     ParentTopic =>  $some_value, # string
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ConfigDescription::_ConfigDescription::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Name
+
+ XML Type of the Configuration (e.g. "tt::LineDetector"). 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm
new file mode 100644
index 000000000..9c2eefde8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigDescriptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ConfigDescriptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ConfigDescriptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ConfigDescriptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm
new file mode 100644
index 000000000..8e544d6a6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ConfigurationEntity.pm
@@ -0,0 +1,159 @@
+package ONVIF::Analytics::Types::ConfigurationEntity;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ConfigurationEntity::_ConfigurationEntity::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ConfigurationEntity::_ConfigurationEntity::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ConfigurationEntity
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ConfigurationEntity from the namespace http://www.onvif.org/ver10/schema.
+
+Base type defining the common properties of a configuration.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * UseCount
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ConfigurationEntity
+   Name => $some_value, # Name
+   UseCount =>  $some_value, # int
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ConfigurationEntity::_ConfigurationEntity::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Token that uniquely refernces this configuration. Length up to 64 characters.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm
new file mode 100644
index 000000000..cf6f1cabe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocus.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ContinuousFocus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Speed
+
+    ) ],
+    {
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ContinuousFocus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ContinuousFocus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ContinuousFocus
+   Speed =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm
new file mode 100644
index 000000000..f9970d781
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ContinuousFocusOptions.pm
@@ -0,0 +1,106 @@
+package ONVIF::Analytics::Types::ContinuousFocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Speed
+
+    ) ],
+    {
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ContinuousFocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ContinuousFocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ContinuousFocusOptions
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm
new file mode 100644
index 000000000..8c0e830bb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformation.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::DNSInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %SearchDomain_of :ATTR(:get<SearchDomain>);
+my %DNSFromDHCP_of :ATTR(:get<DNSFromDHCP>);
+my %DNSManual_of :ATTR(:get<DNSManual>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FromDHCP
+        SearchDomain
+        DNSFromDHCP
+        DNSManual
+        Extension
+
+    ) ],
+    {
+        'FromDHCP' => \%FromDHCP_of,
+        'SearchDomain' => \%SearchDomain_of,
+        'DNSFromDHCP' => \%DNSFromDHCP_of,
+        'DNSManual' => \%DNSManual_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FromDHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SearchDomain' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'DNSFromDHCP' => 'ONVIF::Analytics::Types::IPAddress',
+        'DNSManual' => 'ONVIF::Analytics::Types::IPAddress',
+        'Extension' => 'ONVIF::Analytics::Types::DNSInformationExtension',
+    },
+    {
+
+        'FromDHCP' => 'FromDHCP',
+        'SearchDomain' => 'SearchDomain',
+        'DNSFromDHCP' => 'DNSFromDHCP',
+        'DNSManual' => 'DNSManual',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DNSInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DNSInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FromDHCP
+
+
+=item * SearchDomain
+
+
+=item * DNSFromDHCP
+
+
+=item * DNSManual
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DNSInformation
+   FromDHCP =>  $some_value, # boolean
+   SearchDomain =>  $some_value, # token
+   DNSFromDHCP =>  { # ONVIF::Analytics::Types::IPAddress
+     Type => $some_value, # IPType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+   },
+   DNSManual =>  { # ONVIF::Analytics::Types::IPAddress
+     Type => $some_value, # IPType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+   },
+   Extension =>  { # ONVIF::Analytics::Types::DNSInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm
new file mode 100644
index 000000000..e5ed4f566
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::DNSInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DNSInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DNSInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DNSInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm
new file mode 100644
index 000000000..b9f099649
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DNSName.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::DNSName;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+DNSName from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm
new file mode 100644
index 000000000..e528318a0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Date.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::Date;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Year_of :ATTR(:get<Year>);
+my %Month_of :ATTR(:get<Month>);
+my %Day_of :ATTR(:get<Day>);
+
+__PACKAGE__->_factory(
+    [ qw(        Year
+        Month
+        Day
+
+    ) ],
+    {
+        'Year' => \%Year_of,
+        'Month' => \%Month_of,
+        'Day' => \%Day_of,
+    },
+    {
+        'Year' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Month' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Day' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Year' => 'Year',
+        'Month' => 'Month',
+        'Day' => 'Day',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Date
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Date from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Year
+
+
+=item * Month
+
+
+=item * Day
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Date
+   Year =>  $some_value, # int
+   Month =>  $some_value, # int
+   Day =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm
new file mode 100644
index 000000000..c4e1ed2b6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTime.pm
@@ -0,0 +1,120 @@
+package ONVIF::Analytics::Types::DateTime;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Time_of :ATTR(:get<Time>);
+my %Date_of :ATTR(:get<Date>);
+
+__PACKAGE__->_factory(
+    [ qw(        Time
+        Date
+
+    ) ],
+    {
+        'Time' => \%Time_of,
+        'Date' => \%Date_of,
+    },
+    {
+        'Time' => 'ONVIF::Analytics::Types::Time',
+        'Date' => 'ONVIF::Analytics::Types::Date',
+    },
+    {
+
+        'Time' => 'Time',
+        'Date' => 'Date',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DateTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DateTime from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Time
+
+
+=item * Date
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DateTime
+   Time =>  { # ONVIF::Analytics::Types::Time
+     Hour =>  $some_value, # int
+     Minute =>  $some_value, # int
+     Second =>  $some_value, # int
+   },
+   Date =>  { # ONVIF::Analytics::Types::Date
+     Year =>  $some_value, # int
+     Month =>  $some_value, # int
+     Day =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm
new file mode 100644
index 000000000..38f909404
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DateTimeRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::DateTimeRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %From_of :ATTR(:get<From>);
+my %Until_of :ATTR(:get<Until>);
+
+__PACKAGE__->_factory(
+    [ qw(        From
+        Until
+
+    ) ],
+    {
+        'From' => \%From_of,
+        'Until' => \%Until_of,
+    },
+    {
+        'From' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Until' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'From' => 'From',
+        'Until' => 'Until',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DateTimeRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DateTimeRange from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * From
+
+
+=item * Until
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DateTimeRange
+   From =>  $some_value, # dateTime
+   Until =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm
new file mode 100644
index 000000000..bfdfdf6f1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Description.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Description;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Description from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm
new file mode 100644
index 000000000..0e7be66f8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilities.pm
@@ -0,0 +1,204 @@
+package ONVIF::Analytics::Types::DeviceCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %Network_of :ATTR(:get<Network>);
+my %System_of :ATTR(:get<System>);
+my %IO_of :ATTR(:get<IO>);
+my %Security_of :ATTR(:get<Security>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        Network
+        System
+        IO
+        Security
+        Extension
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'Network' => \%Network_of,
+        'System' => \%System_of,
+        'IO' => \%IO_of,
+        'Security' => \%Security_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Network' => 'ONVIF::Analytics::Types::NetworkCapabilities',
+        'System' => 'ONVIF::Analytics::Types::SystemCapabilities',
+        'IO' => 'ONVIF::Analytics::Types::IOCapabilities',
+        'Security' => 'ONVIF::Analytics::Types::SecurityCapabilities',
+        'Extension' => 'ONVIF::Analytics::Types::DeviceCapabilitiesExtension',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'Network' => 'Network',
+        'System' => 'System',
+        'IO' => 'IO',
+        'Security' => 'Security',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * Network
+
+
+=item * System
+
+
+=item * IO
+
+
+=item * Security
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DeviceCapabilities
+   XAddr =>  $some_value, # anyURI
+   Network =>  { # ONVIF::Analytics::Types::NetworkCapabilities
+     IPFilter =>  $some_value, # boolean
+     ZeroConfiguration =>  $some_value, # boolean
+     IPVersion6 =>  $some_value, # boolean
+     DynDNS =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+       Dot11Configuration =>  $some_value, # boolean
+       Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+       },
+     },
+   },
+   System =>  { # ONVIF::Analytics::Types::SystemCapabilities
+     DiscoveryResolve =>  $some_value, # boolean
+     DiscoveryBye =>  $some_value, # boolean
+     RemoteDiscovery =>  $some_value, # boolean
+     SystemBackup =>  $some_value, # boolean
+     SystemLogging =>  $some_value, # boolean
+     FirmwareUpgrade =>  $some_value, # boolean
+     SupportedVersions =>  { # ONVIF::Analytics::Types::OnvifVersion
+       Major =>  $some_value, # int
+       Minor =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension
+       HttpFirmwareUpgrade =>  $some_value, # boolean
+       HttpSystemBackup =>  $some_value, # boolean
+       HttpSystemLogging =>  $some_value, # boolean
+       HttpSupportInformation =>  $some_value, # boolean
+       Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+       },
+     },
+   },
+   IO =>  { # ONVIF::Analytics::Types::IOCapabilities
+     InputConnectors =>  $some_value, # int
+     RelayOutputs =>  $some_value, # int
+     Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension
+       Auxiliary =>  $some_value, # boolean
+       AuxiliaryCommands => $some_value, # AuxiliaryData
+       Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+       },
+     },
+   },
+   Security =>  { # ONVIF::Analytics::Types::SecurityCapabilities
+     TLS1__1 =>  $some_value, # boolean
+     TLS1__2 =>  $some_value, # boolean
+     OnboardKeyGeneration =>  $some_value, # boolean
+     AccessPolicyConfig =>  $some_value, # boolean
+     X__509Token =>  $some_value, # boolean
+     SAMLToken =>  $some_value, # boolean
+     KerberosToken =>  $some_value, # boolean
+     RELToken =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+       TLS1__0 =>  $some_value, # boolean
+       Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+         Dot1X =>  $some_value, # boolean
+         SupportedEAPMethod =>  $some_value, # int
+         RemoteUserHandling =>  $some_value, # boolean
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::DeviceCapabilitiesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm
new file mode 100644
index 000000000..286eba0c4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceCapabilitiesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::DeviceCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DeviceCapabilitiesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm
new file mode 100644
index 000000000..d25d9c3e1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceEntity.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::DeviceEntity;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::DeviceEntity::_DeviceEntity::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::DeviceEntity::_DeviceEntity::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceEntity
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceEntity from the namespace http://www.onvif.org/ver10/schema.
+
+Base class for physical entities like inputs and outputs.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::DeviceEntity::_DeviceEntity::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Unique identifier referencing the physical entity.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm
new file mode 100644
index 000000000..24265c7ad
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DeviceIOCapabilities.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::DeviceIOCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %VideoSources_of :ATTR(:get<VideoSources>);
+my %VideoOutputs_of :ATTR(:get<VideoOutputs>);
+my %AudioSources_of :ATTR(:get<AudioSources>);
+my %AudioOutputs_of :ATTR(:get<AudioOutputs>);
+my %RelayOutputs_of :ATTR(:get<RelayOutputs>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        VideoSources
+        VideoOutputs
+        AudioSources
+        AudioOutputs
+        RelayOutputs
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'VideoSources' => \%VideoSources_of,
+        'VideoOutputs' => \%VideoOutputs_of,
+        'AudioSources' => \%AudioSources_of,
+        'AudioOutputs' => \%AudioOutputs_of,
+        'RelayOutputs' => \%RelayOutputs_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'VideoSources' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'VideoOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AudioSources' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AudioOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RelayOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'VideoSources' => 'VideoSources',
+        'VideoOutputs' => 'VideoOutputs',
+        'AudioSources' => 'AudioSources',
+        'AudioOutputs' => 'AudioOutputs',
+        'RelayOutputs' => 'RelayOutputs',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DeviceIOCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DeviceIOCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * VideoSources
+
+
+=item * VideoOutputs
+
+
+=item * AudioSources
+
+
+=item * AudioOutputs
+
+
+=item * RelayOutputs
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DeviceIOCapabilities
+   XAddr =>  $some_value, # anyURI
+   VideoSources =>  $some_value, # int
+   VideoOutputs =>  $some_value, # int
+   AudioSources =>  $some_value, # int
+   AudioOutputs =>  $some_value, # int
+   RelayOutputs =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm
new file mode 100644
index 000000000..266e67b15
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DigitalInput.pm
@@ -0,0 +1,97 @@
+package ONVIF::Analytics::Types::DigitalInput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DigitalInput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DigitalInput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DigitalInput
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm
new file mode 100644
index 000000000..e3246c2c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Direction.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Direction;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Direction from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm
new file mode 100644
index 000000000..a988edbfb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DiscoveryMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::DiscoveryMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+DiscoveryMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm
new file mode 100644
index 000000000..396229504
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DisplayCapabilities.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::DisplayCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %FixedLayout_of :ATTR(:get<FixedLayout>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        FixedLayout
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'FixedLayout' => \%FixedLayout_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'FixedLayout' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'FixedLayout' => 'FixedLayout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DisplayCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DisplayCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * FixedLayout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DisplayCapabilities
+   XAddr =>  $some_value, # anyURI
+   FixedLayout =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm
new file mode 100644
index 000000000..90b46b2bf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Domain.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Domain;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Domain from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm
new file mode 100644
index 000000000..9d0bc5945
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AuthAndMangementSuite.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11AuthAndMangementSuite;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11AuthAndMangementSuite from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm
new file mode 100644
index 000000000..796f9fa92
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworks.pm
@@ -0,0 +1,158 @@
+package ONVIF::Analytics::Types::Dot11AvailableNetworks;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SSID_of :ATTR(:get<SSID>);
+my %BSSID_of :ATTR(:get<BSSID>);
+my %AuthAndMangementSuite_of :ATTR(:get<AuthAndMangementSuite>);
+my %PairCipher_of :ATTR(:get<PairCipher>);
+my %GroupCipher_of :ATTR(:get<GroupCipher>);
+my %SignalStrength_of :ATTR(:get<SignalStrength>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SSID
+        BSSID
+        AuthAndMangementSuite
+        PairCipher
+        GroupCipher
+        SignalStrength
+        Extension
+
+    ) ],
+    {
+        'SSID' => \%SSID_of,
+        'BSSID' => \%BSSID_of,
+        'AuthAndMangementSuite' => \%AuthAndMangementSuite_of,
+        'PairCipher' => \%PairCipher_of,
+        'GroupCipher' => \%GroupCipher_of,
+        'SignalStrength' => \%SignalStrength_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'SSID' => 'ONVIF::Analytics::Types::Dot11SSIDType',
+        'BSSID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'AuthAndMangementSuite' => 'ONVIF::Analytics::Types::Dot11AuthAndMangementSuite',
+        'PairCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'GroupCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'SignalStrength' => 'ONVIF::Analytics::Types::Dot11SignalStrength',
+        'Extension' => 'ONVIF::Analytics::Types::Dot11AvailableNetworksExtension',
+    },
+    {
+
+        'SSID' => 'SSID',
+        'BSSID' => 'BSSID',
+        'AuthAndMangementSuite' => 'AuthAndMangementSuite',
+        'PairCipher' => 'PairCipher',
+        'GroupCipher' => 'GroupCipher',
+        'SignalStrength' => 'SignalStrength',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11AvailableNetworks
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11AvailableNetworks from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SSID
+
+
+=item * BSSID
+
+
+=item * AuthAndMangementSuite
+
+
+=item * PairCipher
+
+
+=item * GroupCipher
+
+
+=item * SignalStrength
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11AvailableNetworks
+   SSID => $some_value, # Dot11SSIDType
+   BSSID =>  $some_value, # string
+   AuthAndMangementSuite => $some_value, # Dot11AuthAndMangementSuite
+   PairCipher => $some_value, # Dot11Cipher
+   GroupCipher => $some_value, # Dot11Cipher
+   SignalStrength => $some_value, # Dot11SignalStrength
+   Extension =>  { # ONVIF::Analytics::Types::Dot11AvailableNetworksExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm
new file mode 100644
index 000000000..2360622d7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11AvailableNetworksExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot11AvailableNetworksExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11AvailableNetworksExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11AvailableNetworksExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11AvailableNetworksExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm
new file mode 100644
index 000000000..88c6fce06
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Capabilities.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::Dot11Capabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TKIP_of :ATTR(:get<TKIP>);
+my %ScanAvailableNetworks_of :ATTR(:get<ScanAvailableNetworks>);
+my %MultipleConfiguration_of :ATTR(:get<MultipleConfiguration>);
+my %AdHocStationMode_of :ATTR(:get<AdHocStationMode>);
+my %WEP_of :ATTR(:get<WEP>);
+
+__PACKAGE__->_factory(
+    [ qw(        TKIP
+        ScanAvailableNetworks
+        MultipleConfiguration
+        AdHocStationMode
+        WEP
+
+    ) ],
+    {
+        'TKIP' => \%TKIP_of,
+        'ScanAvailableNetworks' => \%ScanAvailableNetworks_of,
+        'MultipleConfiguration' => \%MultipleConfiguration_of,
+        'AdHocStationMode' => \%AdHocStationMode_of,
+        'WEP' => \%WEP_of,
+    },
+    {
+        'TKIP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ScanAvailableNetworks' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'MultipleConfiguration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AdHocStationMode' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'WEP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'TKIP' => 'TKIP',
+        'ScanAvailableNetworks' => 'ScanAvailableNetworks',
+        'MultipleConfiguration' => 'MultipleConfiguration',
+        'AdHocStationMode' => 'AdHocStationMode',
+        'WEP' => 'WEP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11Capabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11Capabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TKIP
+
+
+=item * ScanAvailableNetworks
+
+
+=item * MultipleConfiguration
+
+
+=item * AdHocStationMode
+
+
+=item * WEP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11Capabilities
+   TKIP =>  $some_value, # boolean
+   ScanAvailableNetworks =>  $some_value, # boolean
+   MultipleConfiguration =>  $some_value, # boolean
+   AdHocStationMode =>  $some_value, # boolean
+   WEP =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm
new file mode 100644
index 000000000..3f9536fcc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Cipher.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11Cipher;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11Cipher from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm
new file mode 100644
index 000000000..8555b434c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Configuration.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::Dot11Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SSID_of :ATTR(:get<SSID>);
+my %Mode_of :ATTR(:get<Mode>);
+my %Alias_of :ATTR(:get<Alias>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Security_of :ATTR(:get<Security>);
+
+__PACKAGE__->_factory(
+    [ qw(        SSID
+        Mode
+        Alias
+        Priority
+        Security
+
+    ) ],
+    {
+        'SSID' => \%SSID_of,
+        'Mode' => \%Mode_of,
+        'Alias' => \%Alias_of,
+        'Priority' => \%Priority_of,
+        'Security' => \%Security_of,
+    },
+    {
+        'SSID' => 'ONVIF::Analytics::Types::Dot11SSIDType',
+        'Mode' => 'ONVIF::Analytics::Types::Dot11StationMode',
+        'Alias' => 'ONVIF::Analytics::Types::Name',
+        'Priority' => 'ONVIF::Analytics::Types::NetworkInterfaceConfigPriority',
+        'Security' => 'ONVIF::Analytics::Types::Dot11SecurityConfiguration',
+    },
+    {
+
+        'SSID' => 'SSID',
+        'Mode' => 'Mode',
+        'Alias' => 'Alias',
+        'Priority' => 'Priority',
+        'Security' => 'Security',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SSID
+
+
+=item * Mode
+
+
+=item * Alias
+
+
+=item * Priority
+
+
+=item * Security
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11Configuration
+   SSID => $some_value, # Dot11SSIDType
+   Mode => $some_value, # Dot11StationMode
+   Alias => $some_value, # Name
+   Priority => $some_value, # NetworkInterfaceConfigPriority
+   Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+     Mode => $some_value, # Dot11SecurityMode
+     Algorithm => $some_value, # Dot11Cipher
+     PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+       Key => $some_value, # Dot11PSK
+       Passphrase => $some_value, # Dot11PSKPassphrase
+       Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+       },
+     },
+     Dot1X => $some_value, # ReferenceToken
+     Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm
new file mode 100644
index 000000000..2b1d80988
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSK.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11PSK;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::hexBinary);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11PSK from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::hexBinary
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm
new file mode 100644
index 000000000..4567ae0e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKPassphrase.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11PSKPassphrase;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11PSKPassphrase from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm
new file mode 100644
index 000000000..e87f83400
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSet.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::Dot11PSKSet;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Key_of :ATTR(:get<Key>);
+my %Passphrase_of :ATTR(:get<Passphrase>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Key
+        Passphrase
+        Extension
+
+    ) ],
+    {
+        'Key' => \%Key_of,
+        'Passphrase' => \%Passphrase_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Key' => 'ONVIF::Analytics::Types::Dot11PSK',
+        'Passphrase' => 'ONVIF::Analytics::Types::Dot11PSKPassphrase',
+        'Extension' => 'ONVIF::Analytics::Types::Dot11PSKSetExtension',
+    },
+    {
+
+        'Key' => 'Key',
+        'Passphrase' => 'Passphrase',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11PSKSet
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11PSKSet from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Key
+
+
+=item * Passphrase
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11PSKSet
+   Key => $some_value, # Dot11PSK
+   Passphrase => $some_value, # Dot11PSKPassphrase
+   Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm
new file mode 100644
index 000000000..64c9511bd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11PSKSetExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot11PSKSetExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11PSKSetExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11PSKSetExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm
new file mode 100644
index 000000000..d48defbad
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SSIDType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11SSIDType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::hexBinary);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11SSIDType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::hexBinary
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm
new file mode 100644
index 000000000..36ee0d7a2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfiguration.pm
@@ -0,0 +1,145 @@
+package ONVIF::Analytics::Types::Dot11SecurityConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Algorithm_of :ATTR(:get<Algorithm>);
+my %PSK_of :ATTR(:get<PSK>);
+my %Dot1X_of :ATTR(:get<Dot1X>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Algorithm
+        PSK
+        Dot1X
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Algorithm' => \%Algorithm_of,
+        'PSK' => \%PSK_of,
+        'Dot1X' => \%Dot1X_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::Dot11SecurityMode',
+        'Algorithm' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'PSK' => 'ONVIF::Analytics::Types::Dot11PSKSet',
+        'Dot1X' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Algorithm' => 'Algorithm',
+        'PSK' => 'PSK',
+        'Dot1X' => 'Dot1X',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11SecurityConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11SecurityConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Algorithm
+
+
+=item * PSK
+
+
+=item * Dot1X
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+   Mode => $some_value, # Dot11SecurityMode
+   Algorithm => $some_value, # Dot11Cipher
+   PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+     Key => $some_value, # Dot11PSK
+     Passphrase => $some_value, # Dot11PSKPassphrase
+     Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+     },
+   },
+   Dot1X => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm
new file mode 100644
index 000000000..d08313f47
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11SecurityConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm
new file mode 100644
index 000000000..f66f64a90
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SecurityMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11SecurityMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11SecurityMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm
new file mode 100644
index 000000000..c8da97218
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11SignalStrength.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11SignalStrength;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11SignalStrength from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm
new file mode 100644
index 000000000..6575f2a17
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11StationMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Dot11StationMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Dot11StationMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm
new file mode 100644
index 000000000..1b25f1ed0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot11Status.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::Dot11Status;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SSID_of :ATTR(:get<SSID>);
+my %BSSID_of :ATTR(:get<BSSID>);
+my %PairCipher_of :ATTR(:get<PairCipher>);
+my %GroupCipher_of :ATTR(:get<GroupCipher>);
+my %SignalStrength_of :ATTR(:get<SignalStrength>);
+my %ActiveConfigAlias_of :ATTR(:get<ActiveConfigAlias>);
+
+__PACKAGE__->_factory(
+    [ qw(        SSID
+        BSSID
+        PairCipher
+        GroupCipher
+        SignalStrength
+        ActiveConfigAlias
+
+    ) ],
+    {
+        'SSID' => \%SSID_of,
+        'BSSID' => \%BSSID_of,
+        'PairCipher' => \%PairCipher_of,
+        'GroupCipher' => \%GroupCipher_of,
+        'SignalStrength' => \%SignalStrength_of,
+        'ActiveConfigAlias' => \%ActiveConfigAlias_of,
+    },
+    {
+        'SSID' => 'ONVIF::Analytics::Types::Dot11SSIDType',
+        'BSSID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'PairCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'GroupCipher' => 'ONVIF::Analytics::Types::Dot11Cipher',
+        'SignalStrength' => 'ONVIF::Analytics::Types::Dot11SignalStrength',
+        'ActiveConfigAlias' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'SSID' => 'SSID',
+        'BSSID' => 'BSSID',
+        'PairCipher' => 'PairCipher',
+        'GroupCipher' => 'GroupCipher',
+        'SignalStrength' => 'SignalStrength',
+        'ActiveConfigAlias' => 'ActiveConfigAlias',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot11Status
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot11Status from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SSID
+
+
+=item * BSSID
+
+
+=item * PairCipher
+
+
+=item * GroupCipher
+
+
+=item * SignalStrength
+
+
+=item * ActiveConfigAlias
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot11Status
+   SSID => $some_value, # Dot11SSIDType
+   BSSID =>  $some_value, # string
+   PairCipher => $some_value, # Dot11Cipher
+   GroupCipher => $some_value, # Dot11Cipher
+   SignalStrength => $some_value, # Dot11SignalStrength
+   ActiveConfigAlias => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm
new file mode 100644
index 000000000..fc35b8a8f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfiguration.pm
@@ -0,0 +1,165 @@
+package ONVIF::Analytics::Types::Dot1XConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot1XConfigurationToken_of :ATTR(:get<Dot1XConfigurationToken>);
+my %Identity_of :ATTR(:get<Identity>);
+my %AnonymousID_of :ATTR(:get<AnonymousID>);
+my %EAPMethod_of :ATTR(:get<EAPMethod>);
+my %CACertificateID_of :ATTR(:get<CACertificateID>);
+my %EAPMethodConfiguration_of :ATTR(:get<EAPMethodConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot1XConfigurationToken
+        Identity
+        AnonymousID
+        EAPMethod
+        CACertificateID
+        EAPMethodConfiguration
+        Extension
+
+    ) ],
+    {
+        'Dot1XConfigurationToken' => \%Dot1XConfigurationToken_of,
+        'Identity' => \%Identity_of,
+        'AnonymousID' => \%AnonymousID_of,
+        'EAPMethod' => \%EAPMethod_of,
+        'CACertificateID' => \%CACertificateID_of,
+        'EAPMethodConfiguration' => \%EAPMethodConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Dot1XConfigurationToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Identity' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'AnonymousID' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'EAPMethod' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'CACertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'EAPMethodConfiguration' => 'ONVIF::Analytics::Types::EAPMethodConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::Dot1XConfigurationExtension',
+    },
+    {
+
+        'Dot1XConfigurationToken' => 'Dot1XConfigurationToken',
+        'Identity' => 'Identity',
+        'AnonymousID' => 'AnonymousID',
+        'EAPMethod' => 'EAPMethod',
+        'CACertificateID' => 'CACertificateID',
+        'EAPMethodConfiguration' => 'EAPMethodConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot1XConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot1XConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot1XConfigurationToken
+
+
+=item * Identity
+
+
+=item * AnonymousID
+
+
+=item * EAPMethod
+
+
+=item * CACertificateID
+
+
+=item * EAPMethodConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot1XConfiguration
+   Dot1XConfigurationToken => $some_value, # ReferenceToken
+   Identity =>  $some_value, # string
+   AnonymousID =>  $some_value, # string
+   EAPMethod =>  $some_value, # int
+   CACertificateID =>  $some_value, # token
+   EAPMethodConfiguration =>  { # ONVIF::Analytics::Types::EAPMethodConfiguration
+     TLSConfiguration =>  { # ONVIF::Analytics::Types::TLSConfiguration
+       CertificateID =>  $some_value, # token
+     },
+     Password =>  $some_value, # string
+     Extension =>  { # ONVIF::Analytics::Types::EapMethodExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::Dot1XConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm
new file mode 100644
index 000000000..00d97bf6e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot1XConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot1XConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot1XConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot1XConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot1XConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm
new file mode 100644
index 000000000..8613c3527
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Dot3Configuration.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Dot3Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Dot3Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Dot3Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Dot3Configuration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm
new file mode 100644
index 000000000..08b290b38
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Duplex.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Duplex;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Duplex from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm
new file mode 100644
index 000000000..6b639290c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DurationRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::DurationRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Min_of :ATTR(:get<Min>);
+my %Max_of :ATTR(:get<Max>);
+
+__PACKAGE__->_factory(
+    [ qw(        Min
+        Max
+
+    ) ],
+    {
+        'Min' => \%Min_of,
+        'Max' => \%Max_of,
+    },
+    {
+        'Min' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Max' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Min' => 'Min',
+        'Max' => 'Max',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DurationRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DurationRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of duration greater equal Min duration and less equal Max duration.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Min
+
+
+=item * Max
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DurationRange
+   Min =>  $some_value, # duration
+   Max =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm
new file mode 100644
index 000000000..5b237db83
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformation.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::DynamicDNSInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Name_of :ATTR(:get<Name>);
+my %TTL_of :ATTR(:get<TTL>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Name
+        TTL
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Name' => \%Name_of,
+        'TTL' => \%TTL_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::DynamicDNSType',
+        'Name' => 'ONVIF::Analytics::Types::DNSName',
+        'TTL' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Extension' => 'ONVIF::Analytics::Types::DynamicDNSInformationExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'Name' => 'Name',
+        'TTL' => 'TTL',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DynamicDNSInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DynamicDNSInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Name
+
+
+=item * TTL
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DynamicDNSInformation
+   Type => $some_value, # DynamicDNSType
+   Name => $some_value, # DNSName
+   TTL =>  $some_value, # duration
+   Extension =>  { # ONVIF::Analytics::Types::DynamicDNSInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm
new file mode 100644
index 000000000..57d945d5b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::DynamicDNSInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::DynamicDNSInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+DynamicDNSInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::DynamicDNSInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm
new file mode 100644
index 000000000..bc2e64c1f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/DynamicDNSType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::DynamicDNSType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+DynamicDNSType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm
new file mode 100644
index 000000000..cfbdff031
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EAPMethodConfiguration.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::EAPMethodConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TLSConfiguration_of :ATTR(:get<TLSConfiguration>);
+my %Password_of :ATTR(:get<Password>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TLSConfiguration
+        Password
+        Extension
+
+    ) ],
+    {
+        'TLSConfiguration' => \%TLSConfiguration_of,
+        'Password' => \%Password_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TLSConfiguration' => 'ONVIF::Analytics::Types::TLSConfiguration',
+        'Password' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Extension' => 'ONVIF::Analytics::Types::EapMethodExtension',
+    },
+    {
+
+        'TLSConfiguration' => 'TLSConfiguration',
+        'Password' => 'Password',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EAPMethodConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EAPMethodConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TLSConfiguration
+
+
+=item * Password
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EAPMethodConfiguration
+   TLSConfiguration =>  { # ONVIF::Analytics::Types::TLSConfiguration
+     CertificateID =>  $some_value, # token
+   },
+   Password =>  $some_value, # string
+   Extension =>  { # ONVIF::Analytics::Types::EapMethodExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm
new file mode 100644
index 000000000..16afe3468
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlip.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::EFlip;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::EFlipMode',
+    },
+    {
+
+        'Mode' => 'Mode',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EFlip
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EFlip from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EFlip
+   Mode => $some_value, # EFlipMode
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm
new file mode 100644
index 000000000..47585292e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::EFlipMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+EFlipMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm
new file mode 100644
index 000000000..0b4850e36
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::EFlipOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::EFlipMode',
+        'Extension' => 'ONVIF::Analytics::Types::EFlipOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EFlipOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EFlipOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EFlipOptions
+   Mode => $some_value, # EFlipMode
+   Extension =>  { # ONVIF::Analytics::Types::EFlipOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm
new file mode 100644
index 000000000..8d45e135c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EFlipOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::EFlipOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EFlipOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EFlipOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EFlipOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm
new file mode 100644
index 000000000..5d8e96f0f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EapMethodExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::EapMethodExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EapMethodExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EapMethodExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EapMethodExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm
new file mode 100644
index 000000000..e55f7ad77
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Enabled.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Enabled;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Enabled from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm
new file mode 100644
index 000000000..a4bef790f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EngineConfiguration.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::EngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %VideoAnalyticsConfiguration_of :ATTR(:get<VideoAnalyticsConfiguration>);
+my %AnalyticsEngineInputInfo_of :ATTR(:get<AnalyticsEngineInputInfo>);
+
+__PACKAGE__->_factory(
+    [ qw(        VideoAnalyticsConfiguration
+        AnalyticsEngineInputInfo
+
+    ) ],
+    {
+        'VideoAnalyticsConfiguration' => \%VideoAnalyticsConfiguration_of,
+        'AnalyticsEngineInputInfo' => \%AnalyticsEngineInputInfo_of,
+    },
+    {
+        'VideoAnalyticsConfiguration' => 'ONVIF::Analytics::Types::VideoAnalyticsConfiguration',
+        'AnalyticsEngineInputInfo' => 'ONVIF::Analytics::Types::AnalyticsEngineInputInfo',
+    },
+    {
+
+        'VideoAnalyticsConfiguration' => 'VideoAnalyticsConfiguration',
+        'AnalyticsEngineInputInfo' => 'AnalyticsEngineInputInfo',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * VideoAnalyticsConfiguration
+
+
+=item * AnalyticsEngineInputInfo
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EngineConfiguration
+   VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+     AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+       AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+       },
+     },
+     RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+       Rule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+       },
+     },
+   },
+   AnalyticsEngineInputInfo =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfo
+     InputInfo =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineInputInfoExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm
new file mode 100644
index 000000000..fbf5eca8e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Envelope.pm
@@ -0,0 +1,128 @@
+package ONVIF::Analytics::Types::Envelope;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Header_of :ATTR(:get<Header>);
+my %Body_of :ATTR(:get<Body>);
+
+__PACKAGE__->_factory(
+    [ qw(        Header
+        Body
+
+    ) ],
+    {
+        'Header' => \%Header_of,
+        'Body' => \%Body_of,
+    },
+    {
+        'Header' => 'ONVIF::Analytics::Elements::Header',
+
+        'Body' => 'ONVIF::Analytics::Elements::Body',
+
+    },
+    {
+
+        'Header' => '',
+        'Body' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Envelope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Envelope from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Header
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Body
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Envelope
+   Header =>  { # ONVIF::Analytics::Types::Header
+   },
+   Body =>  { # ONVIF::Analytics::Types::Body
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm
new file mode 100644
index 000000000..759bca600
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EventCapabilities.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::EventCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %WSSubscriptionPolicySupport_of :ATTR(:get<WSSubscriptionPolicySupport>);
+my %WSPullPointSupport_of :ATTR(:get<WSPullPointSupport>);
+my %WSPausableSubscriptionManagerInterfaceSupport_of :ATTR(:get<WSPausableSubscriptionManagerInterfaceSupport>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        WSSubscriptionPolicySupport
+        WSPullPointSupport
+        WSPausableSubscriptionManagerInterfaceSupport
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'WSSubscriptionPolicySupport' => \%WSSubscriptionPolicySupport_of,
+        'WSPullPointSupport' => \%WSPullPointSupport_of,
+        'WSPausableSubscriptionManagerInterfaceSupport' => \%WSPausableSubscriptionManagerInterfaceSupport_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'WSSubscriptionPolicySupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'WSPullPointSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'WSPausableSubscriptionManagerInterfaceSupport' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'WSSubscriptionPolicySupport' => 'WSSubscriptionPolicySupport',
+        'WSPullPointSupport' => 'WSPullPointSupport',
+        'WSPausableSubscriptionManagerInterfaceSupport' => 'WSPausableSubscriptionManagerInterfaceSupport',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EventCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EventCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * WSSubscriptionPolicySupport
+
+
+=item * WSPullPointSupport
+
+
+=item * WSPausableSubscriptionManagerInterfaceSupport
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EventCapabilities
+   XAddr =>  $some_value, # anyURI
+   WSSubscriptionPolicySupport =>  $some_value, # boolean
+   WSPullPointSupport =>  $some_value, # boolean
+   WSPausableSubscriptionManagerInterfaceSupport =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm
new file mode 100644
index 000000000..f110c4f9e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EventStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::EventStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EventStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EventStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EventStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm
new file mode 100644
index 000000000..4b42f6ce1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/EventSubscription.pm
@@ -0,0 +1,157 @@
+package ONVIF::Analytics::Types::EventSubscription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Filter_of :ATTR(:get<Filter>);
+my %SubscriptionPolicy_of :ATTR(:get<SubscriptionPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        Filter
+        SubscriptionPolicy
+
+    ) ],
+    {
+        'Filter' => \%Filter_of,
+        'SubscriptionPolicy' => \%SubscriptionPolicy_of,
+    },
+    {
+        'Filter' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyType',
+
+        'SubscriptionPolicy' => 'ONVIF::Analytics::Types::EventSubscription::_SubscriptionPolicy',
+    },
+    {
+
+        'Filter' => 'Filter',
+        'SubscriptionPolicy' => 'SubscriptionPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::EventSubscription::_SubscriptionPolicy;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::EventSubscription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EventSubscription from the namespace http://www.onvif.org/ver10/schema.
+
+Subcription handling in the same way as base notification subscription.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Filter
+
+
+=item * SubscriptionPolicy
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::EventSubscription
+   Filter =>  $some_value, # anyType
+   SubscriptionPolicy =>  {
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm
new file mode 100644
index 000000000..cd47f4b0d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure.pm
@@ -0,0 +1,202 @@
+package ONVIF::Analytics::Types::Exposure;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Window_of :ATTR(:get<Window>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        Window
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'Window' => \%Window_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'Window' => 'ONVIF::Analytics::Types::Rectangle',
+        'MinExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Gain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Iris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'Window' => 'Window',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Exposure
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Exposure from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * Window
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Exposure
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   Window => ,
+   MinExposureTime =>  $some_value, # float
+   MaxExposureTime =>  $some_value, # float
+   MinGain =>  $some_value, # float
+   MaxGain =>  $some_value, # float
+   MinIris =>  $some_value, # float
+   MaxIris =>  $some_value, # float
+   ExposureTime =>  $some_value, # float
+   Gain =>  $some_value, # float
+   Iris =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm
new file mode 100644
index 000000000..299d6b964
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Exposure20.pm
@@ -0,0 +1,202 @@
+package ONVIF::Analytics::Types::Exposure20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Window_of :ATTR(:get<Window>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        Window
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'Window' => \%Window_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'Window' => 'ONVIF::Analytics::Types::Rectangle',
+        'MinExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MinIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MaxIris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ExposureTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Gain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Iris' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'Window' => 'Window',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Exposure20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Exposure20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing the exposure settings.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * Window
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Exposure20
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   Window => ,
+   MinExposureTime =>  $some_value, # float
+   MaxExposureTime =>  $some_value, # float
+   MinGain =>  $some_value, # float
+   MaxGain =>  $some_value, # float
+   MinIris =>  $some_value, # float
+   MaxIris =>  $some_value, # float
+   ExposureTime =>  $some_value, # float
+   Gain =>  $some_value, # float
+   Iris =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm
new file mode 100644
index 000000000..a5265f7a1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ExposureMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ExposureMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm
new file mode 100644
index 000000000..b67e1adb7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions.pm
@@ -0,0 +1,220 @@
+package ONVIF::Analytics::Types::ExposureOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'MinExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'ExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'Gain' => 'ONVIF::Analytics::Types::FloatRange',
+        'Iris' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ExposureOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ExposureOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ExposureOptions
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Gain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Iris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm
new file mode 100644
index 000000000..44f01abdb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposureOptions20.pm
@@ -0,0 +1,220 @@
+package ONVIF::Analytics::Types::ExposureOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %MinExposureTime_of :ATTR(:get<MinExposureTime>);
+my %MaxExposureTime_of :ATTR(:get<MaxExposureTime>);
+my %MinGain_of :ATTR(:get<MinGain>);
+my %MaxGain_of :ATTR(:get<MaxGain>);
+my %MinIris_of :ATTR(:get<MinIris>);
+my %MaxIris_of :ATTR(:get<MaxIris>);
+my %ExposureTime_of :ATTR(:get<ExposureTime>);
+my %Gain_of :ATTR(:get<Gain>);
+my %Iris_of :ATTR(:get<Iris>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Priority
+        MinExposureTime
+        MaxExposureTime
+        MinGain
+        MaxGain
+        MinIris
+        MaxIris
+        ExposureTime
+        Gain
+        Iris
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'MinExposureTime' => \%MinExposureTime_of,
+        'MaxExposureTime' => \%MaxExposureTime_of,
+        'MinGain' => \%MinGain_of,
+        'MaxGain' => \%MaxGain_of,
+        'MinIris' => \%MinIris_of,
+        'MaxIris' => \%MaxIris_of,
+        'ExposureTime' => \%ExposureTime_of,
+        'Gain' => \%Gain_of,
+        'Iris' => \%Iris_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ExposureMode',
+        'Priority' => 'ONVIF::Analytics::Types::ExposurePriority',
+        'MinExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'MinIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'MaxIris' => 'ONVIF::Analytics::Types::FloatRange',
+        'ExposureTime' => 'ONVIF::Analytics::Types::FloatRange',
+        'Gain' => 'ONVIF::Analytics::Types::FloatRange',
+        'Iris' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'MinExposureTime' => 'MinExposureTime',
+        'MaxExposureTime' => 'MaxExposureTime',
+        'MinGain' => 'MinGain',
+        'MaxGain' => 'MaxGain',
+        'MinIris' => 'MinIris',
+        'MaxIris' => 'MaxIris',
+        'ExposureTime' => 'ExposureTime',
+        'Gain' => 'Gain',
+        'Iris' => 'Iris',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ExposureOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ExposureOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * MinExposureTime
+
+
+=item * MaxExposureTime
+
+
+=item * MinGain
+
+
+=item * MaxGain
+
+
+=item * MinIris
+
+
+=item * MaxIris
+
+
+=item * ExposureTime
+
+
+=item * Gain
+
+
+=item * Iris
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ExposureOptions20
+   Mode => $some_value, # ExposureMode
+   Priority => $some_value, # ExposurePriority
+   MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Gain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Iris =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm
new file mode 100644
index 000000000..2ad95fb9d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ExposurePriority.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ExposurePriority;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ExposurePriority from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm
new file mode 100644
index 000000000..b616d8289
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FactoryDefaultType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::FactoryDefaultType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FactoryDefaultType from the namespace http://www.onvif.org/ver10/schema.
+
+Enumeration describing the available factory default modes.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm
new file mode 100644
index 000000000..46cfc6edd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Fault.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::Fault;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %faultcode_of :ATTR(:get<faultcode>);
+my %faultstring_of :ATTR(:get<faultstring>);
+my %faultactor_of :ATTR(:get<faultactor>);
+my %detail_of :ATTR(:get<detail>);
+
+__PACKAGE__->_factory(
+    [ qw(        faultcode
+        faultstring
+        faultactor
+        detail
+
+    ) ],
+    {
+        'faultcode' => \%faultcode_of,
+        'faultstring' => \%faultstring_of,
+        'faultactor' => \%faultactor_of,
+        'detail' => \%detail_of,
+    },
+    {
+        'faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+        'faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'detail' => 'ONVIF::Analytics::Types::detail',
+    },
+    {
+
+        'faultcode' => 'faultcode',
+        'faultstring' => 'faultstring',
+        'faultactor' => 'faultactor',
+        'detail' => 'detail',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Fault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Fault from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+Fault reporting structure 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * faultcode
+
+
+=item * faultstring
+
+
+=item * faultactor
+
+
+=item * detail
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Fault
+   faultcode =>  $some_value, # QName
+   faultstring =>  $some_value, # string
+   faultactor =>  $some_value, # anyURI
+   detail =>  { # ONVIF::Analytics::Types::detail
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm
new file mode 100644
index 000000000..102d3d8aa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResult.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::FindEventResult;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Time_of :ATTR(:get<Time>);
+my %Event_of :ATTR(:get<Event>);
+my %StartStateEvent_of :ATTR(:get<StartStateEvent>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackToken
+        Time
+        Event
+        StartStateEvent
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackToken' => \%TrackToken_of,
+        'Time' => \%Time_of,
+        'Event' => \%Event_of,
+        'StartStateEvent' => \%StartStateEvent_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Time' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Event' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyType',
+        'StartStateEvent' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackToken' => 'TrackToken',
+        'Time' => 'Time',
+        'Event' => 'Event',
+        'StartStateEvent' => 'StartStateEvent',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindEventResult
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindEventResult from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackToken
+
+
+=item * Time
+
+
+=item * Event
+
+
+=item * StartStateEvent
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindEventResult
+   RecordingToken => $some_value, # RecordingReference
+   TrackToken => $some_value, # TrackReference
+   Time =>  $some_value, # dateTime
+   Event =>  $some_value, # anyType
+   StartStateEvent =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm
new file mode 100644
index 000000000..1f716a457
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindEventResultList.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::FindEventResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %Result_of :ATTR(:get<Result>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        Result
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'Result' => \%Result_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'Result' => 'ONVIF::Analytics::Types::FindEventResult',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'Result' => 'Result',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindEventResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindEventResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * Result
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindEventResultList
+   SearchState => $some_value, # SearchState
+   Result =>  { # ONVIF::Analytics::Types::FindEventResult
+     RecordingToken => $some_value, # RecordingReference
+     TrackToken => $some_value, # TrackReference
+     Time =>  $some_value, # dateTime
+     Event =>  $some_value, # anyType
+     StartStateEvent =>  $some_value, # boolean
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm
new file mode 100644
index 000000000..6c564e796
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResult.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::FindMetadataResult;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Time_of :ATTR(:get<Time>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackToken
+        Time
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackToken' => \%TrackToken_of,
+        'Time' => \%Time_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Time' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackToken' => 'TrackToken',
+        'Time' => 'Time',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindMetadataResult
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindMetadataResult from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackToken
+
+
+=item * Time
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindMetadataResult
+   RecordingToken => $some_value, # RecordingReference
+   TrackToken => $some_value, # TrackReference
+   Time =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm
new file mode 100644
index 000000000..b6f9e0a09
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindMetadataResultList.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::FindMetadataResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %Result_of :ATTR(:get<Result>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        Result
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'Result' => \%Result_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'Result' => 'ONVIF::Analytics::Types::FindMetadataResult',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'Result' => 'Result',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindMetadataResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindMetadataResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * Result
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindMetadataResultList
+   SearchState => $some_value, # SearchState
+   Result =>  { # ONVIF::Analytics::Types::FindMetadataResult
+     RecordingToken => $some_value, # RecordingReference
+     TrackToken => $some_value, # TrackReference
+     Time =>  $some_value, # dateTime
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm
new file mode 100644
index 000000000..4f89a9351
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResult.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::FindPTZPositionResult;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Time_of :ATTR(:get<Time>);
+my %Position_of :ATTR(:get<Position>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackToken
+        Time
+        Position
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackToken' => \%TrackToken_of,
+        'Time' => \%Time_of,
+        'Position' => \%Position_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Time' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Position' => 'ONVIF::Analytics::Types::PTZVector',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackToken' => 'TrackToken',
+        'Time' => 'Time',
+        'Position' => 'Position',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindPTZPositionResult
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindPTZPositionResult from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackToken
+
+
+=item * Time
+
+
+=item * Position
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindPTZPositionResult
+   RecordingToken => $some_value, # RecordingReference
+   TrackToken => $some_value, # TrackReference
+   Time =>  $some_value, # dateTime
+   Position =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm
new file mode 100644
index 000000000..54d31b786
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindPTZPositionResultList.pm
@@ -0,0 +1,120 @@
+package ONVIF::Analytics::Types::FindPTZPositionResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %Result_of :ATTR(:get<Result>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        Result
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'Result' => \%Result_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'Result' => 'ONVIF::Analytics::Types::FindPTZPositionResult',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'Result' => 'Result',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindPTZPositionResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindPTZPositionResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * Result
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindPTZPositionResultList
+   SearchState => $some_value, # SearchState
+   Result =>  { # ONVIF::Analytics::Types::FindPTZPositionResult
+     RecordingToken => $some_value, # RecordingReference
+     TrackToken => $some_value, # TrackReference
+     Time =>  $some_value, # dateTime
+     Position =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm
new file mode 100644
index 000000000..aab2a7534
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FindRecordingResultList.pm
@@ -0,0 +1,132 @@
+package ONVIF::Analytics::Types::FindRecordingResultList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SearchState_of :ATTR(:get<SearchState>);
+my %RecordingInformation_of :ATTR(:get<RecordingInformation>);
+
+__PACKAGE__->_factory(
+    [ qw(        SearchState
+        RecordingInformation
+
+    ) ],
+    {
+        'SearchState' => \%SearchState_of,
+        'RecordingInformation' => \%RecordingInformation_of,
+    },
+    {
+        'SearchState' => 'ONVIF::Analytics::Types::SearchState',
+        'RecordingInformation' => 'ONVIF::Analytics::Types::RecordingInformation',
+    },
+    {
+
+        'SearchState' => 'SearchState',
+        'RecordingInformation' => 'RecordingInformation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FindRecordingResultList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FindRecordingResultList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SearchState
+
+
+=item * RecordingInformation
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FindRecordingResultList
+   SearchState => $some_value, # SearchState
+   RecordingInformation =>  { # ONVIF::Analytics::Types::RecordingInformation
+     RecordingToken => $some_value, # RecordingReference
+     Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+       SourceId =>  $some_value, # anyURI
+       Name => $some_value, # Name
+       Location => $some_value, # Description
+       Description => $some_value, # Description
+       Address =>  $some_value, # anyURI
+     },
+     EarliestRecording =>  $some_value, # dateTime
+     LatestRecording =>  $some_value, # dateTime
+     Content => $some_value, # Description
+     Track =>  { # ONVIF::Analytics::Types::TrackInformation
+       TrackToken => $some_value, # TrackReference
+       TrackType => $some_value, # TrackType
+       Description => $some_value, # Description
+       DataFrom =>  $some_value, # dateTime
+       DataTo =>  $some_value, # dateTime
+     },
+     RecordingStatus => $some_value, # RecordingStatus
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm
new file mode 100644
index 000000000..b5c004a33
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatAttrList.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::FloatAttrList;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::float
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FloatAttrList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::float
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm
new file mode 100644
index 000000000..78ef2a13b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatList.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::FloatList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Items_of :ATTR(:get<Items>);
+
+__PACKAGE__->_factory(
+    [ qw(        Items
+
+    ) ],
+    {
+        'Items' => \%Items_of,
+    },
+    {
+        'Items' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Items' => 'Items',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FloatList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FloatList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Items
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FloatList
+   Items =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm
new file mode 100644
index 000000000..03d97dc11
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FloatRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::FloatRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Min_of :ATTR(:get<Min>);
+my %Max_of :ATTR(:get<Max>);
+
+__PACKAGE__->_factory(
+    [ qw(        Min
+        Max
+
+    ) ],
+    {
+        'Min' => \%Min_of,
+        'Max' => \%Max_of,
+    },
+    {
+        'Min' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Max' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Min' => 'Min',
+        'Max' => 'Max',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FloatRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FloatRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of values greater equal Min value and less equal Max value.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Min
+
+
+=item * Max
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FloatRange
+   Min =>  $some_value, # float
+   Max =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm
new file mode 100644
index 000000000..0006d20fc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::FocusConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusMode_of :ATTR(:get<AutoFocusMode>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusMode
+        DefaultSpeed
+        NearLimit
+        FarLimit
+
+    ) ],
+    {
+        'AutoFocusMode' => \%AutoFocusMode_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+    },
+    {
+        'AutoFocusMode' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'NearLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'FarLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'AutoFocusMode' => 'AutoFocusMode',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusMode
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusConfiguration
+   AutoFocusMode => $some_value, # AutoFocusMode
+   DefaultSpeed =>  $some_value, # float
+   NearLimit =>  $some_value, # float
+   FarLimit =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm
new file mode 100644
index 000000000..7f3aa4576
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::FocusConfiguration20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusMode_of :ATTR(:get<AutoFocusMode>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusMode
+        DefaultSpeed
+        NearLimit
+        FarLimit
+        Extension
+
+    ) ],
+    {
+        'AutoFocusMode' => \%AutoFocusMode_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AutoFocusMode' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'NearLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'FarLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::FocusConfiguration20Extension',
+    },
+    {
+
+        'AutoFocusMode' => 'AutoFocusMode',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusConfiguration20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusConfiguration20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusMode
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusConfiguration20
+   AutoFocusMode => $some_value, # AutoFocusMode
+   DefaultSpeed =>  $some_value, # float
+   NearLimit =>  $some_value, # float
+   FarLimit =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm
new file mode 100644
index 000000000..0a46a2e44
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusConfiguration20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FocusConfiguration20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusConfiguration20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusConfiguration20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm
new file mode 100644
index 000000000..432af470b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusMove.pm
@@ -0,0 +1,129 @@
+package ONVIF::Analytics::Types::FocusMove;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Absolute_of :ATTR(:get<Absolute>);
+my %Relative_of :ATTR(:get<Relative>);
+my %Continuous_of :ATTR(:get<Continuous>);
+
+__PACKAGE__->_factory(
+    [ qw(        Absolute
+        Relative
+        Continuous
+
+    ) ],
+    {
+        'Absolute' => \%Absolute_of,
+        'Relative' => \%Relative_of,
+        'Continuous' => \%Continuous_of,
+    },
+    {
+        'Absolute' => 'ONVIF::Analytics::Types::AbsoluteFocus',
+        'Relative' => 'ONVIF::Analytics::Types::RelativeFocus',
+        'Continuous' => 'ONVIF::Analytics::Types::ContinuousFocus',
+    },
+    {
+
+        'Absolute' => 'Absolute',
+        'Relative' => 'Relative',
+        'Continuous' => 'Continuous',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusMove
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusMove from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Absolute
+
+
+=item * Relative
+
+
+=item * Continuous
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusMove
+   Absolute =>  { # ONVIF::Analytics::Types::AbsoluteFocus
+     Position =>  $some_value, # float
+     Speed =>  $some_value, # float
+   },
+   Relative =>  { # ONVIF::Analytics::Types::RelativeFocus
+     Distance =>  $some_value, # float
+     Speed =>  $some_value, # float
+   },
+   Continuous =>  { # ONVIF::Analytics::Types::ContinuousFocus
+     Speed =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm
new file mode 100644
index 000000000..3317e6357
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::FocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusModes_of :ATTR(:get<AutoFocusModes>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusModes
+        DefaultSpeed
+        NearLimit
+        FarLimit
+
+    ) ],
+    {
+        'AutoFocusModes' => \%AutoFocusModes_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+    },
+    {
+        'AutoFocusModes' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'ONVIF::Analytics::Types::FloatRange',
+        'NearLimit' => 'ONVIF::Analytics::Types::FloatRange',
+        'FarLimit' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'AutoFocusModes' => 'AutoFocusModes',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusModes
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusOptions
+   AutoFocusModes => $some_value, # AutoFocusMode
+   DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm
new file mode 100644
index 000000000..098236e52
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::FocusOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoFocusModes_of :ATTR(:get<AutoFocusModes>);
+my %DefaultSpeed_of :ATTR(:get<DefaultSpeed>);
+my %NearLimit_of :ATTR(:get<NearLimit>);
+my %FarLimit_of :ATTR(:get<FarLimit>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoFocusModes
+        DefaultSpeed
+        NearLimit
+        FarLimit
+        Extension
+
+    ) ],
+    {
+        'AutoFocusModes' => \%AutoFocusModes_of,
+        'DefaultSpeed' => \%DefaultSpeed_of,
+        'NearLimit' => \%NearLimit_of,
+        'FarLimit' => \%FarLimit_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AutoFocusModes' => 'ONVIF::Analytics::Types::AutoFocusMode',
+        'DefaultSpeed' => 'ONVIF::Analytics::Types::FloatRange',
+        'NearLimit' => 'ONVIF::Analytics::Types::FloatRange',
+        'FarLimit' => 'ONVIF::Analytics::Types::FloatRange',
+        'Extension' => 'ONVIF::Analytics::Types::FocusOptions20Extension',
+    },
+    {
+
+        'AutoFocusModes' => 'AutoFocusModes',
+        'DefaultSpeed' => 'DefaultSpeed',
+        'NearLimit' => 'NearLimit',
+        'FarLimit' => 'FarLimit',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoFocusModes
+
+
+=item * DefaultSpeed
+
+
+=item * NearLimit
+
+
+=item * FarLimit
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusOptions20
+   AutoFocusModes => $some_value, # AutoFocusMode
+   DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::FocusOptions20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm
new file mode 100644
index 000000000..4e7e9c9e9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusOptions20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FocusOptions20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusOptions20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusOptions20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusOptions20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm
new file mode 100644
index 000000000..496497fa1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::FocusStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %MoveStatus_of :ATTR(:get<MoveStatus>);
+my %Error_of :ATTR(:get<Error>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        MoveStatus
+        Error
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'MoveStatus' => \%MoveStatus_of,
+        'Error' => \%Error_of,
+    },
+    {
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MoveStatus' => 'ONVIF::Analytics::Types::MoveStatus',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Position' => 'Position',
+        'MoveStatus' => 'MoveStatus',
+        'Error' => 'Error',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * MoveStatus
+
+
+=item * Error
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusStatus
+   Position =>  $some_value, # float
+   MoveStatus => $some_value, # MoveStatus
+   Error =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm
new file mode 100644
index 000000000..f06b9c0c8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::FocusStatus20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %MoveStatus_of :ATTR(:get<MoveStatus>);
+my %Error_of :ATTR(:get<Error>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        MoveStatus
+        Error
+        Extension
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'MoveStatus' => \%MoveStatus_of,
+        'Error' => \%Error_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'MoveStatus' => 'ONVIF::Analytics::Types::MoveStatus',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Extension' => 'ONVIF::Analytics::Types::FocusStatus20Extension',
+    },
+    {
+
+        'Position' => 'Position',
+        'MoveStatus' => 'MoveStatus',
+        'Error' => 'Error',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusStatus20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusStatus20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * MoveStatus
+
+
+=item * Error
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusStatus20
+   Position =>  $some_value, # float
+   MoveStatus => $some_value, # MoveStatus
+   Error =>  $some_value, # string
+   Extension =>  { # ONVIF::Analytics::Types::FocusStatus20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm
new file mode 100644
index 000000000..8352076c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FocusStatus20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FocusStatus20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FocusStatus20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FocusStatus20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FocusStatus20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm
new file mode 100644
index 000000000..b009e7042
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Frame.pm
@@ -0,0 +1,274 @@
+package ONVIF::Analytics::Types::Frame;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Frame::_Frame::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTZStatus_of :ATTR(:get<PTZStatus>);
+my %Transformation_of :ATTR(:get<Transformation>);
+my %Object_of :ATTR(:get<Object>);
+my %ObjectTree_of :ATTR(:get<ObjectTree>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTZStatus
+        Transformation
+        Object
+        ObjectTree
+        Extension
+
+    ) ],
+    {
+        'PTZStatus' => \%PTZStatus_of,
+        'Transformation' => \%Transformation_of,
+        'Object' => \%Object_of,
+        'ObjectTree' => \%ObjectTree_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PTZStatus' => 'ONVIF::Analytics::Types::PTZStatus',
+        'Transformation' => 'ONVIF::Analytics::Types::Transformation',
+        'Object' => 'ONVIF::Analytics::Types::Object',
+        'ObjectTree' => 'ONVIF::Analytics::Types::ObjectTree',
+        'Extension' => 'ONVIF::Analytics::Types::FrameExtension',
+    },
+    {
+
+        'PTZStatus' => 'PTZStatus',
+        'Transformation' => 'Transformation',
+        'Object' => 'Object',
+        'ObjectTree' => 'ObjectTree',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Frame::_Frame::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %UtcTime_of :ATTR(:get<UtcTime>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        UtcTime
+    ) ],
+    {
+
+        UtcTime => \%UtcTime_of,
+    },
+    {
+        UtcTime => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Frame
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Frame from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatus
+
+
+=item * Transformation
+
+
+=item * Object
+
+
+=item * ObjectTree
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Frame
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+     Position =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+     MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+       PanTilt => $some_value, # MoveStatus
+       Zoom => $some_value, # MoveStatus
+     },
+     Error =>  $some_value, # string
+     UtcTime =>  $some_value, # dateTime
+   },
+   Transformation =>  { # ONVIF::Analytics::Types::Transformation
+     Translate => ,
+     Scale => ,
+     Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+     },
+   },
+   Object =>  { # ONVIF::Analytics::Types::Object
+     Appearance =>  { # ONVIF::Analytics::Types::Appearance
+       Transformation =>  { # ONVIF::Analytics::Types::Transformation
+         Translate => ,
+         Scale => ,
+         Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+         },
+       },
+       Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+         BoundingBox => ,
+         CenterOfGravity => ,
+         Polygon =>  { # ONVIF::Analytics::Types::Polygon
+           Point => ,
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+         },
+       },
+       Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+         ColorCluster =>  {
+           Color => ,
+           Weight =>  $some_value, # float
+           Covariance => ,
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+         },
+       },
+       Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+         ClassCandidate =>  {
+           Type => $some_value, # ClassType
+           Likelihood =>  $some_value, # float
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+           OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+             Type =>  $some_value, # string
+             Likelihood =>  $some_value, # float
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+       },
+     },
+     Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+       Removed =>  {
+       },
+       Idle =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+     },
+   },
+   ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+     Rename =>  { # ONVIF::Analytics::Types::Rename
+       from => ,
+       to => ,
+     },
+     Split =>  { # ONVIF::Analytics::Types::Split
+       from => ,
+       to => ,
+     },
+     Merge =>  { # ONVIF::Analytics::Types::Merge
+       from => ,
+       to => ,
+     },
+     Delete => ,
+     Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+     MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+     },
+     Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Frame::_Frame::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * UtcTime
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::dateTime|SOAP::WSDL::XSD::Typelib::Builtin::dateTime>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm
new file mode 100644
index 000000000..74ef68da3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::FrameExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MotionInCells_of :ATTR(:get<MotionInCells>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MotionInCells
+        Extension
+
+    ) ],
+    {
+        'MotionInCells' => \%MotionInCells_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MotionInCells' => 'ONVIF::Analytics::Types::MotionInCells',
+        'Extension' => 'ONVIF::Analytics::Types::FrameExtension2',
+    },
+    {
+
+        'MotionInCells' => 'MotionInCells',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FrameExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FrameExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MotionInCells
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FrameExtension
+   MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+   },
+   Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm
new file mode 100644
index 000000000..4b7c039c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/FrameExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::FrameExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::FrameExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FrameExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::FrameExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm
new file mode 100644
index 000000000..b562f825c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/G711DecOptions.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::G711DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRateRange_of :ATTR(:get<SampleRateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        SampleRateRange
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'SampleRateRange' => \%SampleRateRange_of,
+    },
+    {
+        'Bitrate' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateRange' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'SampleRateRange' => 'SampleRateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::G711DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+G711DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * SampleRateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::G711DecOptions
+   Bitrate =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm
new file mode 100644
index 000000000..7bc884856
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/G726DecOptions.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::G726DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %SampleRateRange_of :ATTR(:get<SampleRateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        SampleRateRange
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'SampleRateRange' => \%SampleRateRange_of,
+    },
+    {
+        'Bitrate' => 'ONVIF::Analytics::Types::IntList',
+        'SampleRateRange' => 'ONVIF::Analytics::Types::IntList',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'SampleRateRange' => 'SampleRateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::G726DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+G726DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * SampleRateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::G726DecOptions
+   Bitrate =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   SampleRateRange =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm
new file mode 100644
index 000000000..70cbdb54a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GenericEapPwdConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::GenericEapPwdConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GenericEapPwdConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GenericEapPwdConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GenericEapPwdConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm
new file mode 100644
index 000000000..02e8f49c5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingJobsResponseItem.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::GetRecordingJobsResponseItem;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %JobToken_of :ATTR(:get<JobToken>);
+my %JobConfiguration_of :ATTR(:get<JobConfiguration>);
+
+__PACKAGE__->_factory(
+    [ qw(        JobToken
+        JobConfiguration
+
+    ) ],
+    {
+        'JobToken' => \%JobToken_of,
+        'JobConfiguration' => \%JobConfiguration_of,
+    },
+    {
+        'JobToken' => 'ONVIF::Analytics::Types::RecordingJobReference',
+        'JobConfiguration' => 'ONVIF::Analytics::Types::RecordingJobConfiguration',
+    },
+    {
+
+        'JobToken' => 'JobToken',
+        'JobConfiguration' => 'JobConfiguration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetRecordingJobsResponseItem
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetRecordingJobsResponseItem from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * JobToken
+
+
+=item * JobConfiguration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetRecordingJobsResponseItem
+   JobToken => $some_value, # RecordingJobReference
+   JobConfiguration =>  { # ONVIF::Analytics::Types::RecordingJobConfiguration
+     RecordingToken => $some_value, # RecordingReference
+     Mode => $some_value, # RecordingJobMode
+     Priority =>  $some_value, # int
+     Source =>  { # ONVIF::Analytics::Types::RecordingJobSource
+       SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+         Token => $some_value, # ReferenceToken
+       },
+       AutoCreateReceiver =>  $some_value, # boolean
+       Tracks =>  { # ONVIF::Analytics::Types::RecordingJobTrack
+         SourceTag =>  $some_value, # string
+         Destination => $some_value, # TrackReference
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm
new file mode 100644
index 000000000..c6485467c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetRecordingsResponseItem.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::GetRecordingsResponseItem;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %Configuration_of :ATTR(:get<Configuration>);
+my %Tracks_of :ATTR(:get<Tracks>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        Configuration
+        Tracks
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'Configuration' => \%Configuration_of,
+        'Tracks' => \%Tracks_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'Configuration' => 'ONVIF::Analytics::Types::RecordingConfiguration',
+        'Tracks' => 'ONVIF::Analytics::Types::GetTracksResponseList',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'Configuration' => 'Configuration',
+        'Tracks' => 'Tracks',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetRecordingsResponseItem
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetRecordingsResponseItem from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * Configuration
+
+
+=item * Tracks
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetRecordingsResponseItem
+   RecordingToken => $some_value, # RecordingReference
+   Configuration =>  { # ONVIF::Analytics::Types::RecordingConfiguration
+     Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+       SourceId =>  $some_value, # anyURI
+       Name => $some_value, # Name
+       Location => $some_value, # Description
+       Description => $some_value, # Description
+       Address =>  $some_value, # anyURI
+     },
+     Content => $some_value, # Description
+     MaximumRetentionTime =>  $some_value, # duration
+   },
+   Tracks =>  { # ONVIF::Analytics::Types::GetTracksResponseList
+     Track =>  { # ONVIF::Analytics::Types::GetTracksResponseItem
+       TrackToken => $some_value, # TrackReference
+       Configuration =>  { # ONVIF::Analytics::Types::TrackConfiguration
+         TrackType => $some_value, # TrackType
+         Description => $some_value, # Description
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm
new file mode 100644
index 000000000..142633ae7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseItem.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::GetTracksResponseItem;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %Configuration_of :ATTR(:get<Configuration>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackToken
+        Configuration
+
+    ) ],
+    {
+        'TrackToken' => \%TrackToken_of,
+        'Configuration' => \%Configuration_of,
+    },
+    {
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'Configuration' => 'ONVIF::Analytics::Types::TrackConfiguration',
+    },
+    {
+
+        'TrackToken' => 'TrackToken',
+        'Configuration' => 'Configuration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetTracksResponseItem
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetTracksResponseItem from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackToken
+
+
+=item * Configuration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetTracksResponseItem
+   TrackToken => $some_value, # TrackReference
+   Configuration =>  { # ONVIF::Analytics::Types::TrackConfiguration
+     TrackType => $some_value, # TrackType
+     Description => $some_value, # Description
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm
new file mode 100644
index 000000000..23072b371
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/GetTracksResponseList.pm
@@ -0,0 +1,109 @@
+package ONVIF::Analytics::Types::GetTracksResponseList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Track_of :ATTR(:get<Track>);
+
+__PACKAGE__->_factory(
+    [ qw(        Track
+
+    ) ],
+    {
+        'Track' => \%Track_of,
+    },
+    {
+        'Track' => 'ONVIF::Analytics::Types::GetTracksResponseItem',
+    },
+    {
+
+        'Track' => 'Track',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::GetTracksResponseList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+GetTracksResponseList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Track
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::GetTracksResponseList
+   Track =>  { # ONVIF::Analytics::Types::GetTracksResponseItem
+     TrackToken => $some_value, # TrackReference
+     Configuration =>  { # ONVIF::Analytics::Types::TrackConfiguration
+       TrackType => $some_value, # TrackType
+       Description => $some_value, # Description
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm
new file mode 100644
index 000000000..2db6a372a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Configuration.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::H264Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %GovLength_of :ATTR(:get<GovLength>);
+my %H264Profile_of :ATTR(:get<H264Profile>);
+
+__PACKAGE__->_factory(
+    [ qw(        GovLength
+        H264Profile
+
+    ) ],
+    {
+        'GovLength' => \%GovLength_of,
+        'H264Profile' => \%H264Profile_of,
+    },
+    {
+        'GovLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'H264Profile' => 'ONVIF::Analytics::Types::H264Profile',
+    },
+    {
+
+        'GovLength' => 'GovLength',
+        'H264Profile' => 'H264Profile',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * GovLength
+
+
+=item * H264Profile
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264Configuration
+   GovLength =>  $some_value, # int
+   H264Profile => $some_value, # H264Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm
new file mode 100644
index 000000000..9c883f654
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264DecOptions.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::H264DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %SupportedH264Profiles_of :ATTR(:get<SupportedH264Profiles>);
+my %SupportedInputBitrate_of :ATTR(:get<SupportedInputBitrate>);
+my %SupportedFrameRate_of :ATTR(:get<SupportedFrameRate>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        SupportedH264Profiles
+        SupportedInputBitrate
+        SupportedFrameRate
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'SupportedH264Profiles' => \%SupportedH264Profiles_of,
+        'SupportedInputBitrate' => \%SupportedInputBitrate_of,
+        'SupportedFrameRate' => \%SupportedFrameRate_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'SupportedH264Profiles' => 'ONVIF::Analytics::Types::H264Profile',
+        'SupportedInputBitrate' => 'ONVIF::Analytics::Types::IntRange',
+        'SupportedFrameRate' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'SupportedH264Profiles' => 'SupportedH264Profiles',
+        'SupportedInputBitrate' => 'SupportedInputBitrate',
+        'SupportedFrameRate' => 'SupportedFrameRate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * SupportedH264Profiles
+
+
+=item * SupportedInputBitrate
+
+
+=item * SupportedFrameRate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264DecOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   SupportedH264Profiles => $some_value, # H264Profile
+   SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm
new file mode 100644
index 000000000..bd5b43fe0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::H264Options;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %H264ProfilesSupported_of :ATTR(:get<H264ProfilesSupported>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        H264ProfilesSupported
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'H264ProfilesSupported' => \%H264ProfilesSupported_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'H264ProfilesSupported' => 'ONVIF::Analytics::Types::H264Profile',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'H264ProfilesSupported' => 'H264ProfilesSupported',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264Options
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264Options from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * GovLengthRange
+
+
+=item * FrameRateRange
+
+
+=item * EncodingIntervalRange
+
+
+=item * H264ProfilesSupported
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264Options
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   H264ProfilesSupported => $some_value, # H264Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm
new file mode 100644
index 000000000..0cbd7b2eb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Options2.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::H264Options2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::H264Options);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %H264ProfilesSupported_of :ATTR(:get<H264ProfilesSupported>);
+my %BitrateRange_of :ATTR(:get<BitrateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        H264ProfilesSupported
+        BitrateRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'H264ProfilesSupported' => \%H264ProfilesSupported_of,
+        'BitrateRange' => \%BitrateRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'H264ProfilesSupported' => 'ONVIF::Analytics::Types::H264Profile',
+        'BitrateRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'H264ProfilesSupported' => 'H264ProfilesSupported',
+        'BitrateRange' => 'BitrateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::H264Options2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+H264Options2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BitrateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::H264Options2
+   BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm
new file mode 100644
index 000000000..b1776d3ec
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/H264Profile.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::H264Profile;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+H264Profile from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm
new file mode 100644
index 000000000..570c7a869
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Header.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::Header;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Header
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Header from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Header
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm
new file mode 100644
index 000000000..f40b423ae
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformation.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::HostnameInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %Name_of :ATTR(:get<Name>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FromDHCP
+        Name
+        Extension
+
+    ) ],
+    {
+        'FromDHCP' => \%FromDHCP_of,
+        'Name' => \%Name_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FromDHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+        'Extension' => 'ONVIF::Analytics::Types::HostnameInformationExtension',
+    },
+    {
+
+        'FromDHCP' => 'FromDHCP',
+        'Name' => 'Name',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::HostnameInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+HostnameInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FromDHCP
+
+
+=item * Name
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::HostnameInformation
+   FromDHCP =>  $some_value, # boolean
+   Name =>  $some_value, # token
+   Extension =>  { # ONVIF::Analytics::Types::HostnameInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm
new file mode 100644
index 000000000..193b887ca
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/HostnameInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::HostnameInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::HostnameInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+HostnameInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::HostnameInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm
new file mode 100644
index 000000000..db9cd4dbe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/HwAddress.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::HwAddress;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+HwAddress from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm
new file mode 100644
index 000000000..3c7ce4925
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IANA_IfTypes.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IANA_IfTypes;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::int);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IANA-IfTypes from the namespace http://www.onvif.org/ver10/schema.
+
+For valid numbers, please refer to http://www.iana.org/assignments/ianaiftype-mib. 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::int
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm
new file mode 100644
index 000000000..320669865
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilities.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::IOCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InputConnectors_of :ATTR(:get<InputConnectors>);
+my %RelayOutputs_of :ATTR(:get<RelayOutputs>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InputConnectors
+        RelayOutputs
+        Extension
+
+    ) ],
+    {
+        'InputConnectors' => \%InputConnectors_of,
+        'RelayOutputs' => \%RelayOutputs_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InputConnectors' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RelayOutputs' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Extension' => 'ONVIF::Analytics::Types::IOCapabilitiesExtension',
+    },
+    {
+
+        'InputConnectors' => 'InputConnectors',
+        'RelayOutputs' => 'RelayOutputs',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IOCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IOCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InputConnectors
+
+
+=item * RelayOutputs
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IOCapabilities
+   InputConnectors =>  $some_value, # int
+   RelayOutputs =>  $some_value, # int
+   Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension
+     Auxiliary =>  $some_value, # boolean
+     AuxiliaryCommands => $some_value, # AuxiliaryData
+     Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm
new file mode 100644
index 000000000..a1ca50221
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::IOCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Auxiliary_of :ATTR(:get<Auxiliary>);
+my %AuxiliaryCommands_of :ATTR(:get<AuxiliaryCommands>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Auxiliary
+        AuxiliaryCommands
+        Extension
+
+    ) ],
+    {
+        'Auxiliary' => \%Auxiliary_of,
+        'AuxiliaryCommands' => \%AuxiliaryCommands_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Auxiliary' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AuxiliaryCommands' => 'ONVIF::Analytics::Types::AuxiliaryData',
+        'Extension' => 'ONVIF::Analytics::Types::IOCapabilitiesExtension2',
+    },
+    {
+
+        'Auxiliary' => 'Auxiliary',
+        'AuxiliaryCommands' => 'AuxiliaryCommands',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IOCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IOCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Auxiliary
+
+
+=item * AuxiliaryCommands
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IOCapabilitiesExtension
+   Auxiliary =>  $some_value, # boolean
+   AuxiliaryCommands => $some_value, # AuxiliaryData
+   Extension =>  { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm
new file mode 100644
index 000000000..8743dece3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IOCapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IOCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IOCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IOCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IOCapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm
new file mode 100644
index 000000000..fabc90c3a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddress.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::IPAddress;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        IPv4Address
+        IPv6Address
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::IPType',
+        'IPv4Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::IPv6Address',
+    },
+    {
+
+        'Type' => 'Type',
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPAddress
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPAddress from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPAddress
+   Type => $some_value, # IPType
+   IPv4Address => $some_value, # IPv4Address
+   IPv6Address => $some_value, # IPv6Address
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm
new file mode 100644
index 000000000..4749663c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilter.pm
@@ -0,0 +1,137 @@
+package ONVIF::Analytics::Types::IPAddressFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        IPv4Address
+        IPv6Address
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::IPAddressFilterType',
+        'IPv4Address' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'Extension' => 'ONVIF::Analytics::Types::IPAddressFilterExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPAddressFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPAddressFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPAddressFilter
+   Type => $some_value, # IPAddressFilterType
+   IPv4Address =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   IPv6Address =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::IPAddressFilterExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm
new file mode 100644
index 000000000..a0d290a09
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IPAddressFilterExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPAddressFilterExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPAddressFilterExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPAddressFilterExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm
new file mode 100644
index 000000000..85643035b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPAddressFilterType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPAddressFilterType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPAddressFilterType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm
new file mode 100644
index 000000000..64f4410e0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm
new file mode 100644
index 000000000..13060faf5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Address.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPv4Address;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPv4Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm
new file mode 100644
index 000000000..586dc4dff
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4Configuration.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::IPv4Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Manual_of :ATTR(:get<Manual>);
+my %LinkLocal_of :ATTR(:get<LinkLocal>);
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %DHCP_of :ATTR(:get<DHCP>);
+
+__PACKAGE__->_factory(
+    [ qw(        Manual
+        LinkLocal
+        FromDHCP
+        DHCP
+
+    ) ],
+    {
+        'Manual' => \%Manual_of,
+        'LinkLocal' => \%LinkLocal_of,
+        'FromDHCP' => \%FromDHCP_of,
+        'DHCP' => \%DHCP_of,
+    },
+    {
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'LinkLocal' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'FromDHCP' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'DHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Manual' => 'Manual',
+        'LinkLocal' => 'LinkLocal',
+        'FromDHCP' => 'FromDHCP',
+        'DHCP' => 'DHCP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv4Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv4Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Manual
+
+
+=item * LinkLocal
+
+
+=item * FromDHCP
+
+
+=item * DHCP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv4Configuration
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   DHCP =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm
new file mode 100644
index 000000000..3f6177f4d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterface.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::IPv4NetworkInterface;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Config_of :ATTR(:get<Config>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Config
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Config' => \%Config_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Config' => 'ONVIF::Analytics::Types::IPv4Configuration',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Config' => 'Config',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv4NetworkInterface
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv4NetworkInterface from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Config
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv4NetworkInterface
+   Enabled =>  $some_value, # boolean
+   Config =>  { # ONVIF::Analytics::Types::IPv4Configuration
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     DHCP =>  $some_value, # boolean
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm
new file mode 100644
index 000000000..b1d06aed5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv4NetworkInterfaceSetConfiguration.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Manual_of :ATTR(:get<Manual>);
+my %DHCP_of :ATTR(:get<DHCP>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Manual
+        DHCP
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Manual' => \%Manual_of,
+        'DHCP' => \%DHCP_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv4Address',
+        'DHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Manual' => 'Manual',
+        'DHCP' => 'DHCP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv4NetworkInterfaceSetConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Manual
+
+
+=item * DHCP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration
+   Enabled =>  $some_value, # boolean
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+     Address => $some_value, # IPv4Address
+     PrefixLength =>  $some_value, # int
+   },
+   DHCP =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm
new file mode 100644
index 000000000..4bce119b1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Address.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPv6Address;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPv6Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm
new file mode 100644
index 000000000..75bc7d500
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6Configuration.pm
@@ -0,0 +1,170 @@
+package ONVIF::Analytics::Types::IPv6Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AcceptRouterAdvert_of :ATTR(:get<AcceptRouterAdvert>);
+my %DHCP_of :ATTR(:get<DHCP>);
+my %Manual_of :ATTR(:get<Manual>);
+my %LinkLocal_of :ATTR(:get<LinkLocal>);
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %FromRA_of :ATTR(:get<FromRA>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AcceptRouterAdvert
+        DHCP
+        Manual
+        LinkLocal
+        FromDHCP
+        FromRA
+        Extension
+
+    ) ],
+    {
+        'AcceptRouterAdvert' => \%AcceptRouterAdvert_of,
+        'DHCP' => \%DHCP_of,
+        'Manual' => \%Manual_of,
+        'LinkLocal' => \%LinkLocal_of,
+        'FromDHCP' => \%FromDHCP_of,
+        'FromRA' => \%FromRA_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AcceptRouterAdvert' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DHCP' => 'ONVIF::Analytics::Types::IPv6DHCPConfiguration',
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'LinkLocal' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'FromDHCP' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'FromRA' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'Extension' => 'ONVIF::Analytics::Types::IPv6ConfigurationExtension',
+    },
+    {
+
+        'AcceptRouterAdvert' => 'AcceptRouterAdvert',
+        'DHCP' => 'DHCP',
+        'Manual' => 'Manual',
+        'LinkLocal' => 'LinkLocal',
+        'FromDHCP' => 'FromDHCP',
+        'FromRA' => 'FromRA',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AcceptRouterAdvert
+
+
+=item * DHCP
+
+
+=item * Manual
+
+
+=item * LinkLocal
+
+
+=item * FromDHCP
+
+
+=item * FromRA
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6Configuration
+   AcceptRouterAdvert =>  $some_value, # boolean
+   DHCP => $some_value, # IPv6DHCPConfiguration
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   FromRA =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm
new file mode 100644
index 000000000..45cc890f4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6ConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IPv6ConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6ConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6ConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm
new file mode 100644
index 000000000..3589b8cda
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6DHCPConfiguration.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IPv6DHCPConfiguration;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IPv6DHCPConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm
new file mode 100644
index 000000000..8ad389cee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterface.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::IPv6NetworkInterface;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Config_of :ATTR(:get<Config>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Config
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Config' => \%Config_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Config' => 'ONVIF::Analytics::Types::IPv6Configuration',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Config' => 'Config',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6NetworkInterface
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6NetworkInterface from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Config
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6NetworkInterface
+   Enabled =>  $some_value, # boolean
+   Config =>  { # ONVIF::Analytics::Types::IPv6Configuration
+     AcceptRouterAdvert =>  $some_value, # boolean
+     DHCP => $some_value, # IPv6DHCPConfiguration
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     FromRA =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm
new file mode 100644
index 000000000..e9804eac1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IPv6NetworkInterfaceSetConfiguration.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %AcceptRouterAdvert_of :ATTR(:get<AcceptRouterAdvert>);
+my %Manual_of :ATTR(:get<Manual>);
+my %DHCP_of :ATTR(:get<DHCP>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        AcceptRouterAdvert
+        Manual
+        DHCP
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'AcceptRouterAdvert' => \%AcceptRouterAdvert_of,
+        'Manual' => \%Manual_of,
+        'DHCP' => \%DHCP_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AcceptRouterAdvert' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Manual' => 'ONVIF::Analytics::Types::PrefixedIPv6Address',
+        'DHCP' => 'ONVIF::Analytics::Types::IPv6DHCPConfiguration',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'AcceptRouterAdvert' => 'AcceptRouterAdvert',
+        'Manual' => 'Manual',
+        'DHCP' => 'DHCP',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IPv6NetworkInterfaceSetConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * AcceptRouterAdvert
+
+
+=item * Manual
+
+
+=item * DHCP
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration
+   Enabled =>  $some_value, # boolean
+   AcceptRouterAdvert =>  $some_value, # boolean
+   Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+     Address => $some_value, # IPv6Address
+     PrefixLength =>  $some_value, # int
+   },
+   DHCP => $some_value, # IPv6DHCPConfiguration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm
new file mode 100644
index 000000000..1ea11d8df
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilization.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::ImageStabilization;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ImageStabilizationMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::ImageStabilizationExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilization
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilization from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilization
+   Mode => $some_value, # ImageStabilizationMode
+   Level =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm
new file mode 100644
index 000000000..9fad9005e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImageStabilizationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilizationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilizationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilizationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm
new file mode 100644
index 000000000..8ff37b476
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ImageStabilizationMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ImageStabilizationMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm
new file mode 100644
index 000000000..32c42d66b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptions.pm
@@ -0,0 +1,125 @@
+package ONVIF::Analytics::Types::ImageStabilizationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ImageStabilizationMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+        'Extension' => 'ONVIF::Analytics::Types::ImageStabilizationOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilizationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilizationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilizationOptions
+   Mode => $some_value, # ImageStabilizationMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm
new file mode 100644
index 000000000..35c64abf2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImageStabilizationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImageStabilizationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImageStabilizationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm
new file mode 100644
index 000000000..9733f5af0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ImagingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingCapabilities
+   XAddr =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm
new file mode 100644
index 000000000..7baf69846
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions.pm
@@ -0,0 +1,271 @@
+package ONVIF::Analytics::Types::ImagingOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilterModes_of :ATTR(:get<IrCutFilterModes>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilterModes
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilterModes' => \%IrCutFilterModes_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensationOptions',
+        'Brightness' => 'ONVIF::Analytics::Types::FloatRange',
+        'ColorSaturation' => 'ONVIF::Analytics::Types::FloatRange',
+        'Contrast' => 'ONVIF::Analytics::Types::FloatRange',
+        'Exposure' => 'ONVIF::Analytics::Types::ExposureOptions',
+        'Focus' => 'ONVIF::Analytics::Types::FocusOptions',
+        'IrCutFilterModes' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'ONVIF::Analytics::Types::FloatRange',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRangeOptions',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalanceOptions',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilterModes' => 'IrCutFilterModes',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilterModes
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensationOptions
+     Mode => $some_value, # WideDynamicMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Brightness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ColorSaturation =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Contrast =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Exposure =>  { # ONVIF::Analytics::Types::ExposureOptions
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Gain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Iris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusOptions
+     AutoFocusModes => $some_value, # AutoFocusMode
+     DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   IrCutFilterModes => $some_value, # IrCutFilterMode
+   Sharpness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRangeOptions
+     Mode => $some_value, # WideDynamicMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions
+     Mode => $some_value, # WhiteBalanceMode
+     YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm
new file mode 100644
index 000000000..186d0cf46
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20.pm
@@ -0,0 +1,308 @@
+package ONVIF::Analytics::Types::ImagingOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilterModes_of :ATTR(:get<IrCutFilterModes>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilterModes
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+        Extension
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilterModes' => \%IrCutFilterModes_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensationOptions20',
+        'Brightness' => 'ONVIF::Analytics::Types::FloatRange',
+        'ColorSaturation' => 'ONVIF::Analytics::Types::FloatRange',
+        'Contrast' => 'ONVIF::Analytics::Types::FloatRange',
+        'Exposure' => 'ONVIF::Analytics::Types::ExposureOptions20',
+        'Focus' => 'ONVIF::Analytics::Types::FocusOptions20',
+        'IrCutFilterModes' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'ONVIF::Analytics::Types::FloatRange',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRangeOptions20',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalanceOptions20',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingOptions20Extension',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilterModes' => 'IrCutFilterModes',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilterModes
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensationOptions20
+     Mode => $some_value, # BacklightCompensationMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Brightness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   ColorSaturation =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Contrast =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Exposure =>  { # ONVIF::Analytics::Types::ExposureOptions20
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     MinExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MinIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     MaxIris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     ExposureTime =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Gain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Iris =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusOptions20
+     AutoFocusModes => $some_value, # AutoFocusMode
+     DefaultSpeed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     NearLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     FarLimit =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::FocusOptions20Extension
+     },
+   },
+   IrCutFilterModes => $some_value, # IrCutFilterMode
+   Sharpness =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRangeOptions20
+     Mode => $some_value, # WideDynamicMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions20
+     Mode => $some_value, # WhiteBalanceMode
+     YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension
+     ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilizationOptions
+       Mode => $some_value, # ImageStabilizationMode
+       Level =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension2
+       IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+         BoundaryType =>  $some_value, # string
+         BoundaryOffset =>  $some_value, # boolean
+         ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+           Min =>  $some_value, # duration
+           Max =>  $some_value, # duration
+         },
+         Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm
new file mode 100644
index 000000000..bb398fd72
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::ImagingOptions20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImageStabilization_of :ATTR(:get<ImageStabilization>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImageStabilization
+        Extension
+
+    ) ],
+    {
+        'ImageStabilization' => \%ImageStabilization_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImageStabilization' => 'ONVIF::Analytics::Types::ImageStabilizationOptions',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingOptions20Extension2',
+    },
+    {
+
+        'ImageStabilization' => 'ImageStabilization',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImageStabilization
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20Extension
+   ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilizationOptions
+     Mode => $some_value, # ImageStabilizationMode
+     Level =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension2
+     IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+       BoundaryType =>  $some_value, # string
+       BoundaryOffset =>  $some_value, # boolean
+       ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+         Min =>  $some_value, # duration
+         Max =>  $some_value, # duration
+       },
+       Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm
new file mode 100644
index 000000000..c58220565
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension2.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::ImagingOptions20Extension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IrCutFilterAutoAdjustment_of :ATTR(:get<IrCutFilterAutoAdjustment>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IrCutFilterAutoAdjustment
+        Extension
+
+    ) ],
+    {
+        'IrCutFilterAutoAdjustment' => \%IrCutFilterAutoAdjustment_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IrCutFilterAutoAdjustment' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingOptions20Extension3',
+    },
+    {
+
+        'IrCutFilterAutoAdjustment' => 'IrCutFilterAutoAdjustment',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20Extension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20Extension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IrCutFilterAutoAdjustment
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20Extension2
+   IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+     BoundaryType =>  $some_value, # string
+     BoundaryOffset =>  $some_value, # boolean
+     ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+       Min =>  $some_value, # duration
+       Max =>  $some_value, # duration
+     },
+     Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm
new file mode 100644
index 000000000..aeaec974a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingOptions20Extension3.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingOptions20Extension3;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingOptions20Extension3
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingOptions20Extension3 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingOptions20Extension3
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm
new file mode 100644
index 000000000..f6ef5ece8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings.pm
@@ -0,0 +1,222 @@
+package ONVIF::Analytics::Types::ImagingSettings;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilter_of :ATTR(:get<IrCutFilter>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilter
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+        Extension
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilter' => \%IrCutFilter_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensation',
+        'Brightness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ColorSaturation' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Contrast' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Exposure' => 'ONVIF::Analytics::Types::Exposure',
+        'Focus' => 'ONVIF::Analytics::Types::FocusConfiguration',
+        'IrCutFilter' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRange',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalance',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilter' => 'IrCutFilter',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettings
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettings from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilter
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettings
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation
+     Mode => $some_value, # BacklightCompensationMode
+     Level =>  $some_value, # float
+   },
+   Brightness =>  $some_value, # float
+   ColorSaturation =>  $some_value, # float
+   Contrast =>  $some_value, # float
+   Exposure =>  { # ONVIF::Analytics::Types::Exposure
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     Window => ,
+     MinExposureTime =>  $some_value, # float
+     MaxExposureTime =>  $some_value, # float
+     MinGain =>  $some_value, # float
+     MaxGain =>  $some_value, # float
+     MinIris =>  $some_value, # float
+     MaxIris =>  $some_value, # float
+     ExposureTime =>  $some_value, # float
+     Gain =>  $some_value, # float
+     Iris =>  $some_value, # float
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration
+     AutoFocusMode => $some_value, # AutoFocusMode
+     DefaultSpeed =>  $some_value, # float
+     NearLimit =>  $some_value, # float
+     FarLimit =>  $some_value, # float
+   },
+   IrCutFilter => $some_value, # IrCutFilterMode
+   Sharpness =>  $some_value, # float
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange
+     Mode => $some_value, # WideDynamicMode
+     Level =>  $some_value, # float
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance
+     Mode => $some_value, # WhiteBalanceMode
+     CrGain =>  $some_value, # float
+     CbGain =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm
new file mode 100644
index 000000000..1e994a51b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettings20.pm
@@ -0,0 +1,243 @@
+package ONVIF::Analytics::Types::ImagingSettings20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BacklightCompensation_of :ATTR(:get<BacklightCompensation>);
+my %Brightness_of :ATTR(:get<Brightness>);
+my %ColorSaturation_of :ATTR(:get<ColorSaturation>);
+my %Contrast_of :ATTR(:get<Contrast>);
+my %Exposure_of :ATTR(:get<Exposure>);
+my %Focus_of :ATTR(:get<Focus>);
+my %IrCutFilter_of :ATTR(:get<IrCutFilter>);
+my %Sharpness_of :ATTR(:get<Sharpness>);
+my %WideDynamicRange_of :ATTR(:get<WideDynamicRange>);
+my %WhiteBalance_of :ATTR(:get<WhiteBalance>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BacklightCompensation
+        Brightness
+        ColorSaturation
+        Contrast
+        Exposure
+        Focus
+        IrCutFilter
+        Sharpness
+        WideDynamicRange
+        WhiteBalance
+        Extension
+
+    ) ],
+    {
+        'BacklightCompensation' => \%BacklightCompensation_of,
+        'Brightness' => \%Brightness_of,
+        'ColorSaturation' => \%ColorSaturation_of,
+        'Contrast' => \%Contrast_of,
+        'Exposure' => \%Exposure_of,
+        'Focus' => \%Focus_of,
+        'IrCutFilter' => \%IrCutFilter_of,
+        'Sharpness' => \%Sharpness_of,
+        'WideDynamicRange' => \%WideDynamicRange_of,
+        'WhiteBalance' => \%WhiteBalance_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BacklightCompensation' => 'ONVIF::Analytics::Types::BacklightCompensation20',
+        'Brightness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ColorSaturation' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Contrast' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Exposure' => 'ONVIF::Analytics::Types::Exposure20',
+        'Focus' => 'ONVIF::Analytics::Types::FocusConfiguration20',
+        'IrCutFilter' => 'ONVIF::Analytics::Types::IrCutFilterMode',
+        'Sharpness' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'WideDynamicRange' => 'ONVIF::Analytics::Types::WideDynamicRange20',
+        'WhiteBalance' => 'ONVIF::Analytics::Types::WhiteBalance20',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension20',
+    },
+    {
+
+        'BacklightCompensation' => 'BacklightCompensation',
+        'Brightness' => 'Brightness',
+        'ColorSaturation' => 'ColorSaturation',
+        'Contrast' => 'Contrast',
+        'Exposure' => 'Exposure',
+        'Focus' => 'Focus',
+        'IrCutFilter' => 'IrCutFilter',
+        'Sharpness' => 'Sharpness',
+        'WideDynamicRange' => 'WideDynamicRange',
+        'WhiteBalance' => 'WhiteBalance',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettings20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettings20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing the ImagingSettings of a VideoSource. The supported options and ranges can be obtained via the GetOptions command.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BacklightCompensation
+
+
+=item * Brightness
+
+
+=item * ColorSaturation
+
+
+=item * Contrast
+
+
+=item * Exposure
+
+
+=item * Focus
+
+
+=item * IrCutFilter
+
+
+=item * Sharpness
+
+
+=item * WideDynamicRange
+
+
+=item * WhiteBalance
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettings20
+   BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation20
+     Mode => $some_value, # BacklightCompensationMode
+     Level =>  $some_value, # float
+   },
+   Brightness =>  $some_value, # float
+   ColorSaturation =>  $some_value, # float
+   Contrast =>  $some_value, # float
+   Exposure =>  { # ONVIF::Analytics::Types::Exposure20
+     Mode => $some_value, # ExposureMode
+     Priority => $some_value, # ExposurePriority
+     Window => ,
+     MinExposureTime =>  $some_value, # float
+     MaxExposureTime =>  $some_value, # float
+     MinGain =>  $some_value, # float
+     MaxGain =>  $some_value, # float
+     MinIris =>  $some_value, # float
+     MaxIris =>  $some_value, # float
+     ExposureTime =>  $some_value, # float
+     Gain =>  $some_value, # float
+     Iris =>  $some_value, # float
+   },
+   Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration20
+     AutoFocusMode => $some_value, # AutoFocusMode
+     DefaultSpeed =>  $some_value, # float
+     NearLimit =>  $some_value, # float
+     FarLimit =>  $some_value, # float
+     Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+     },
+   },
+   IrCutFilter => $some_value, # IrCutFilterMode
+   Sharpness =>  $some_value, # float
+   WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange20
+     Mode => $some_value, # WideDynamicMode
+     Level =>  $some_value, # float
+   },
+   WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance20
+     Mode => $some_value, # WhiteBalanceMode
+     CrGain =>  $some_value, # float
+     CbGain =>  $some_value, # float
+     Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+     ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+       Mode => $some_value, # ImageStabilizationMode
+       Level =>  $some_value, # float
+       Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+       IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+         BoundaryType =>  $some_value, # string
+         BoundaryOffset =>  $some_value, # float
+         ResponseTime =>  $some_value, # duration
+         Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm
new file mode 100644
index 000000000..ee229ef1d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm
new file mode 100644
index 000000000..3961abaaa
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension20.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImageStabilization_of :ATTR(:get<ImageStabilization>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImageStabilization
+        Extension
+
+    ) ],
+    {
+        'ImageStabilization' => \%ImageStabilization_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImageStabilization' => 'ONVIF::Analytics::Types::ImageStabilization',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension202',
+    },
+    {
+
+        'ImageStabilization' => 'ImageStabilization',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImageStabilization
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+   ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+     Mode => $some_value, # ImageStabilizationMode
+     Level =>  $some_value, # float
+     Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+     IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+       BoundaryType =>  $some_value, # string
+       BoundaryOffset =>  $some_value, # float
+       ResponseTime =>  $some_value, # duration
+       Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm
new file mode 100644
index 000000000..05bac2e9a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension202.pm
@@ -0,0 +1,119 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension202;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IrCutFilterAutoAdjustment_of :ATTR(:get<IrCutFilterAutoAdjustment>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IrCutFilterAutoAdjustment
+        Extension
+
+    ) ],
+    {
+        'IrCutFilterAutoAdjustment' => \%IrCutFilterAutoAdjustment_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IrCutFilterAutoAdjustment' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustment',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingSettingsExtension203',
+    },
+    {
+
+        'IrCutFilterAutoAdjustment' => 'IrCutFilterAutoAdjustment',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension202
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension202 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IrCutFilterAutoAdjustment
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+   IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+     BoundaryType =>  $some_value, # string
+     BoundaryOffset =>  $some_value, # float
+     ResponseTime =>  $some_value, # duration
+     Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm
new file mode 100644
index 000000000..495c5b4ca
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingSettingsExtension203.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingSettingsExtension203;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingSettingsExtension203
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingSettingsExtension203 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm
new file mode 100644
index 000000000..d52565795
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus.pm
@@ -0,0 +1,107 @@
+package ONVIF::Analytics::Types::ImagingStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FocusStatus_of :ATTR(:get<FocusStatus>);
+
+__PACKAGE__->_factory(
+    [ qw(        FocusStatus
+
+    ) ],
+    {
+        'FocusStatus' => \%FocusStatus_of,
+    },
+    {
+        'FocusStatus' => 'ONVIF::Analytics::Types::FocusStatus',
+    },
+    {
+
+        'FocusStatus' => 'FocusStatus',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FocusStatus
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingStatus
+   FocusStatus =>  { # ONVIF::Analytics::Types::FocusStatus
+     Position =>  $some_value, # float
+     MoveStatus => $some_value, # MoveStatus
+     Error =>  $some_value, # string
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm
new file mode 100644
index 000000000..742149e19
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20.pm
@@ -0,0 +1,119 @@
+package ONVIF::Analytics::Types::ImagingStatus20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FocusStatus20_of :ATTR(:get<FocusStatus20>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FocusStatus20
+        Extension
+
+    ) ],
+    {
+        'FocusStatus20' => \%FocusStatus20_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FocusStatus20' => 'ONVIF::Analytics::Types::FocusStatus20',
+        'Extension' => 'ONVIF::Analytics::Types::ImagingStatus20Extension',
+    },
+    {
+
+        'FocusStatus20' => 'FocusStatus20',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingStatus20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingStatus20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FocusStatus20
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingStatus20
+   FocusStatus20 =>  { # ONVIF::Analytics::Types::FocusStatus20
+     Position =>  $some_value, # float
+     MoveStatus => $some_value, # MoveStatus
+     Error =>  $some_value, # string
+     Extension =>  { # ONVIF::Analytics::Types::FocusStatus20Extension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ImagingStatus20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm
new file mode 100644
index 000000000..54e5fa944
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ImagingStatus20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ImagingStatus20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ImagingStatus20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ImagingStatus20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ImagingStatus20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm
new file mode 100644
index 000000000..5bea2349e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Include.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::Include;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2004/08/xop/include' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Include::_Include::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Include::_Include::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %href_of :ATTR(:get<href>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        href
+    ) ],
+    {
+
+        href => \%href_of,
+    },
+    {
+        href => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Include
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Include from the namespace http://www.w3.org/2004/08/xop/include.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Include
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Include::_Include::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * href
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm
new file mode 100644
index 000000000..227393a28
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntAttrList.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::IntAttrList;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::int
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IntAttrList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::int
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm
new file mode 100644
index 000000000..f90f60ade
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntList.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::IntList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Items_of :ATTR(:get<Items>);
+
+__PACKAGE__->_factory(
+    [ qw(        Items
+
+    ) ],
+    {
+        'Items' => \%Items_of,
+    },
+    {
+        'Items' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Items' => 'Items',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntList from the namespace http://www.onvif.org/ver10/schema.
+
+List of values.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Items
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IntList
+   Items =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm
new file mode 100644
index 000000000..8eb6235ce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::IntRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Min_of :ATTR(:get<Min>);
+my %Max_of :ATTR(:get<Max>);
+
+__PACKAGE__->_factory(
+    [ qw(        Min
+        Max
+
+    ) ],
+    {
+        'Min' => \%Min_of,
+        'Max' => \%Max_of,
+    },
+    {
+        'Min' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Max' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Min' => 'Min',
+        'Max' => 'Max',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of values greater equal Min value and less equal Max value.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Min
+
+
+=item * Max
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IntRange
+   Min =>  $some_value, # int
+   Max =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm
new file mode 100644
index 000000000..91aa0144e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangle.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::IntRectangle;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::IntRectangle::_IntRectangle::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::IntRectangle::_IntRectangle::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %y_of :ATTR(:get<y>);
+my %width_of :ATTR(:get<width>);
+my %height_of :ATTR(:get<height>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        y
+        width
+        height
+    ) ],
+    {
+
+        x => \%x_of,
+
+        y => \%y_of,
+
+        width => \%width_of,
+
+        height => \%height_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        y => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        width => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        height => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntRectangle
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntRectangle from the namespace http://www.onvif.org/ver10/schema.
+
+Rectangle defined by lower left corner position and size. Units are pixel.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::IntRectangle::_IntRectangle::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * width
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * height
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm
new file mode 100644
index 000000000..88df3f377
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IntRectangleRange.pm
@@ -0,0 +1,142 @@
+package ONVIF::Analytics::Types::IntRectangleRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XRange_of :ATTR(:get<XRange>);
+my %YRange_of :ATTR(:get<YRange>);
+my %WidthRange_of :ATTR(:get<WidthRange>);
+my %HeightRange_of :ATTR(:get<HeightRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        XRange
+        YRange
+        WidthRange
+        HeightRange
+
+    ) ],
+    {
+        'XRange' => \%XRange_of,
+        'YRange' => \%YRange_of,
+        'WidthRange' => \%WidthRange_of,
+        'HeightRange' => \%HeightRange_of,
+    },
+    {
+        'XRange' => 'ONVIF::Analytics::Types::IntRange',
+        'YRange' => 'ONVIF::Analytics::Types::IntRange',
+        'WidthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'HeightRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'XRange' => 'XRange',
+        'YRange' => 'YRange',
+        'WidthRange' => 'WidthRange',
+        'HeightRange' => 'HeightRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IntRectangleRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IntRectangleRange from the namespace http://www.onvif.org/ver10/schema.
+
+Range of a rectangle. The rectangle itself is defined by lower left corner position and size. Units are pixel.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XRange
+
+
+=item * YRange
+
+
+=item * WidthRange
+
+
+=item * HeightRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IntRectangleRange
+   XRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   YRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   WidthRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   HeightRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm
new file mode 100644
index 000000000..92247d072
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustment.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustment;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundaryType_of :ATTR(:get<BoundaryType>);
+my %BoundaryOffset_of :ATTR(:get<BoundaryOffset>);
+my %ResponseTime_of :ATTR(:get<ResponseTime>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundaryType
+        BoundaryOffset
+        ResponseTime
+        Extension
+
+    ) ],
+    {
+        'BoundaryType' => \%BoundaryType_of,
+        'BoundaryOffset' => \%BoundaryOffset_of,
+        'ResponseTime' => \%ResponseTime_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundaryType' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'BoundaryOffset' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'ResponseTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Extension' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension',
+    },
+    {
+
+        'BoundaryType' => 'BoundaryType',
+        'BoundaryOffset' => 'BoundaryOffset',
+        'ResponseTime' => 'ResponseTime',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustment from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundaryType
+
+
+=item * BoundaryOffset
+
+
+=item * ResponseTime
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+   BoundaryType =>  $some_value, # string
+   BoundaryOffset =>  $some_value, # float
+   ResponseTime =>  $some_value, # duration
+   Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm
new file mode 100644
index 000000000..157cea07a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustmentExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm
new file mode 100644
index 000000000..adeb25f3f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptions.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundaryType_of :ATTR(:get<BoundaryType>);
+my %BoundaryOffset_of :ATTR(:get<BoundaryOffset>);
+my %ResponseTimeRange_of :ATTR(:get<ResponseTimeRange>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundaryType
+        BoundaryOffset
+        ResponseTimeRange
+        Extension
+
+    ) ],
+    {
+        'BoundaryType' => \%BoundaryType_of,
+        'BoundaryOffset' => \%BoundaryOffset_of,
+        'ResponseTimeRange' => \%ResponseTimeRange_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundaryType' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'BoundaryOffset' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ResponseTimeRange' => 'ONVIF::Analytics::Types::DurationRange',
+        'Extension' => 'ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension',
+    },
+    {
+
+        'BoundaryType' => 'BoundaryType',
+        'BoundaryOffset' => 'BoundaryOffset',
+        'ResponseTimeRange' => 'ResponseTimeRange',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustmentOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundaryType
+
+
+=item * BoundaryOffset
+
+
+=item * ResponseTimeRange
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptions
+   BoundaryType =>  $some_value, # string
+   BoundaryOffset =>  $some_value, # boolean
+   ResponseTimeRange =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+   Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm
new file mode 100644
index 000000000..816da3897
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoAdjustmentOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+IrCutFilterAutoAdjustmentOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm
new file mode 100644
index 000000000..808562cc7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterAutoBoundaryType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IrCutFilterAutoBoundaryType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IrCutFilterAutoBoundaryType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm
new file mode 100644
index 000000000..414536d0c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/IrCutFilterMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::IrCutFilterMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+IrCutFilterMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm
new file mode 100644
index 000000000..e88a0dedc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemList.pm
@@ -0,0 +1,240 @@
+package ONVIF::Analytics::Types::ItemList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SimpleItem_of :ATTR(:get<SimpleItem>);
+my %ElementItem_of :ATTR(:get<ElementItem>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SimpleItem
+        ElementItem
+        Extension
+
+    ) ],
+    {
+        'SimpleItem' => \%SimpleItem_of,
+        'ElementItem' => \%ElementItem_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'SimpleItem' => 'ONVIF::Analytics::Types::ItemList::_SimpleItem',
+
+        'ElementItem' => 'ONVIF::Analytics::Types::ItemList::_ElementItem',
+        'Extension' => 'ONVIF::Analytics::Types::ItemListExtension',
+    },
+    {
+
+        'SimpleItem' => 'SimpleItem',
+        'ElementItem' => 'ElementItem',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ItemList::_ElementItem;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemList::_ElementItem::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ItemList::_ElementItem::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+    ) ],
+    {
+
+        Name => \%Name_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::ItemList::_SimpleItem;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemList::_SimpleItem::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ItemList::_SimpleItem::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Value_of :ATTR(:get<Value>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Value
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Value => \%Value_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Value => 'SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemList from the namespace http://www.onvif.org/ver10/schema.
+
+List of parameters according to the corresponding ItemListDescription. Each item in the list shall have a unique name. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SimpleItem
+
+
+=item * ElementItem
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemList
+   SimpleItem => ,
+   ElementItem =>  {
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm
new file mode 100644
index 000000000..0da5fe2c5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescription.pm
@@ -0,0 +1,228 @@
+package ONVIF::Analytics::Types::ItemListDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SimpleItemDescription_of :ATTR(:get<SimpleItemDescription>);
+my %ElementItemDescription_of :ATTR(:get<ElementItemDescription>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SimpleItemDescription
+        ElementItemDescription
+        Extension
+
+    ) ],
+    {
+        'SimpleItemDescription' => \%SimpleItemDescription_of,
+        'ElementItemDescription' => \%ElementItemDescription_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+
+        'SimpleItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription',
+
+        'ElementItemDescription' => 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription',
+        'Extension' => 'ONVIF::Analytics::Types::ItemListDescriptionExtension',
+    },
+    {
+
+        'SimpleItemDescription' => 'SimpleItemDescription',
+        'ElementItemDescription' => 'ElementItemDescription',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_ElementItemDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Type
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Type => \%Type_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ItemListDescription::_SimpleItemDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Name
+        Type
+    ) ],
+    {
+
+        Name => \%Name_of,
+
+        Type => \%Type_of,
+    },
+    {
+        Name => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemListDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemListDescription from the namespace http://www.onvif.org/ver10/schema.
+
+Describes a list of items. Each item in the list shall have a unique name. The list is designed as linear structure without optional or unbounded elements. Use ElementItems only when complex structures are inevitable. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SimpleItemDescription
+
+
+=item * ElementItemDescription
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemListDescription
+   SimpleItemDescription => ,
+   ElementItemDescription => ,
+   Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm
new file mode 100644
index 000000000..4e531d643
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListDescriptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ItemListDescriptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemListDescriptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemListDescriptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm
new file mode 100644
index 000000000..71bd6fe8d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ItemListExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ItemListExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ItemListExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ItemListExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ItemListExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm
new file mode 100644
index 000000000..192353ec7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JobToken.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::JobToken;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+JobToken from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm
new file mode 100644
index 000000000..60eec26cf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegDecOptions.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::JpegDecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %SupportedInputBitrate_of :ATTR(:get<SupportedInputBitrate>);
+my %SupportedFrameRate_of :ATTR(:get<SupportedFrameRate>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        SupportedInputBitrate
+        SupportedFrameRate
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'SupportedInputBitrate' => \%SupportedInputBitrate_of,
+        'SupportedFrameRate' => \%SupportedFrameRate_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'SupportedInputBitrate' => 'ONVIF::Analytics::Types::IntRange',
+        'SupportedFrameRate' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'SupportedInputBitrate' => 'SupportedInputBitrate',
+        'SupportedFrameRate' => 'SupportedFrameRate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::JpegDecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+JpegDecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * SupportedInputBitrate
+
+
+=item * SupportedFrameRate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::JpegDecOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm
new file mode 100644
index 000000000..8db5cefa8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::JpegOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        FrameRateRange
+        EncodingIntervalRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::JpegOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+JpegOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * FrameRateRange
+
+
+=item * EncodingIntervalRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::JpegOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm
new file mode 100644
index 000000000..408a5c745
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/JpegOptions2.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::JpegOptions2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::JpegOptions);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %BitrateRange_of :ATTR(:get<BitrateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        FrameRateRange
+        EncodingIntervalRange
+        BitrateRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'BitrateRange' => \%BitrateRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'BitrateRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'BitrateRange' => 'BitrateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::JpegOptions2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+JpegOptions2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BitrateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::JpegOptions2
+   BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm
new file mode 100644
index 000000000..053e408a9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Layout.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::Layout;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PaneLayout_of :ATTR(:get<PaneLayout>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PaneLayout
+        Extension
+
+    ) ],
+    {
+        'PaneLayout' => \%PaneLayout_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PaneLayout' => 'ONVIF::Analytics::Types::PaneLayout',
+        'Extension' => 'ONVIF::Analytics::Types::LayoutExtension',
+    },
+    {
+
+        'PaneLayout' => 'PaneLayout',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Layout
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Layout from the namespace http://www.onvif.org/ver10/schema.
+
+A layout describes a set of Video windows that are displayed simultaniously on a display. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PaneLayout
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Layout
+   PaneLayout =>  { # ONVIF::Analytics::Types::PaneLayout
+     Pane => $some_value, # ReferenceToken
+     Area => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::LayoutExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm
new file mode 100644
index 000000000..aba7128f2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::LayoutExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::LayoutExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+LayoutExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::LayoutExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm
new file mode 100644
index 000000000..24e473bee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptions.pm
@@ -0,0 +1,117 @@
+package ONVIF::Analytics::Types::LayoutOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PaneLayoutOptions_of :ATTR(:get<PaneLayoutOptions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PaneLayoutOptions
+        Extension
+
+    ) ],
+    {
+        'PaneLayoutOptions' => \%PaneLayoutOptions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PaneLayoutOptions' => 'ONVIF::Analytics::Types::PaneLayoutOptions',
+        'Extension' => 'ONVIF::Analytics::Types::LayoutOptionsExtension',
+    },
+    {
+
+        'PaneLayoutOptions' => 'PaneLayoutOptions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::LayoutOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+LayoutOptions from the namespace http://www.onvif.org/ver10/schema.
+
+The options supported for a display layout.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PaneLayoutOptions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::LayoutOptions
+   PaneLayoutOptions =>  { # ONVIF::Analytics::Types::PaneLayoutOptions
+     Area => ,
+     Extension =>  { # ONVIF::Analytics::Types::PaneOptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::LayoutOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm
new file mode 100644
index 000000000..ce5d361d0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/LayoutOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::LayoutOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::LayoutOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+LayoutOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::LayoutOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm
new file mode 100644
index 000000000..dee9cf4a4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MaximumNumberOfOSDs.pm
@@ -0,0 +1,177 @@
+package ONVIF::Analytics::Types::MaximumNumberOfOSDs;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MaximumNumberOfOSDs::_MaximumNumberOfOSDs::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::MaximumNumberOfOSDs::_MaximumNumberOfOSDs::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Total_of :ATTR(:get<Total>);
+my %Image_of :ATTR(:get<Image>);
+my %PlainText_of :ATTR(:get<PlainText>);
+my %Date_of :ATTR(:get<Date>);
+my %Time_of :ATTR(:get<Time>);
+my %DateAndTime_of :ATTR(:get<DateAndTime>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Total
+        Image
+        PlainText
+        Date
+        Time
+        DateAndTime
+    ) ],
+    {
+
+        Total => \%Total_of,
+
+        Image => \%Image_of,
+
+        PlainText => \%PlainText_of,
+
+        Date => \%Date_of,
+
+        Time => \%Time_of,
+
+        DateAndTime => \%DateAndTime_of,
+    },
+    {
+        Total => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        Image => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        PlainText => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        Date => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        Time => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        DateAndTime => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MaximumNumberOfOSDs
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MaximumNumberOfOSDs from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MaximumNumberOfOSDs::_MaximumNumberOfOSDs::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Total
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * Image
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * PlainText
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * Date
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * Time
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+=item * DateAndTime
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm
new file mode 100644
index 000000000..433b277e0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaAttributes.pm
@@ -0,0 +1,157 @@
+package ONVIF::Analytics::Types::MediaAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %TrackAttributes_of :ATTR(:get<TrackAttributes>);
+my %From_of :ATTR(:get<From>);
+my %Until_of :ATTR(:get<Until>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        TrackAttributes
+        From
+        Until
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'TrackAttributes' => \%TrackAttributes_of,
+        'From' => \%From_of,
+        'Until' => \%Until_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'TrackAttributes' => 'ONVIF::Analytics::Types::TrackAttributes',
+        'From' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Until' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'TrackAttributes' => 'TrackAttributes',
+        'From' => 'From',
+        'Until' => 'Until',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+A set of media attributes valid for a recording at a point in time or for a time interval.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * TrackAttributes
+
+
+=item * From
+
+
+=item * Until
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaAttributes
+   RecordingToken => $some_value, # RecordingReference
+   TrackAttributes =>  { # ONVIF::Analytics::Types::TrackAttributes
+     TrackInformation =>  { # ONVIF::Analytics::Types::TrackInformation
+       TrackToken => $some_value, # TrackReference
+       TrackType => $some_value, # TrackType
+       Description => $some_value, # Description
+       DataFrom =>  $some_value, # dateTime
+       DataTo =>  $some_value, # dateTime
+     },
+     VideoAttributes =>  { # ONVIF::Analytics::Types::VideoAttributes
+       Bitrate =>  $some_value, # int
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+       Encoding => $some_value, # VideoEncoding
+       Framerate =>  $some_value, # float
+     },
+     AudioAttributes =>  { # ONVIF::Analytics::Types::AudioAttributes
+       Bitrate =>  $some_value, # int
+       Encoding => $some_value, # AudioEncoding
+       Samplerate =>  $some_value, # int
+     },
+     MetadataAttributes =>  { # ONVIF::Analytics::Types::MetadataAttributes
+       CanContainPTZ =>  $some_value, # boolean
+       CanContainAnalytics =>  $some_value, # boolean
+       CanContainNotifications =>  $some_value, # boolean
+     },
+     Extension =>  { # ONVIF::Analytics::Types::TrackAttributesExtension
+     },
+   },
+   From =>  $some_value, # dateTime
+   Until =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm
new file mode 100644
index 000000000..37f2c6252
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilities.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::MediaCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %StreamingCapabilities_of :ATTR(:get<StreamingCapabilities>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        StreamingCapabilities
+        Extension
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'StreamingCapabilities' => \%StreamingCapabilities_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'StreamingCapabilities' => 'ONVIF::Analytics::Types::RealTimeStreamingCapabilities',
+        'Extension' => 'ONVIF::Analytics::Types::MediaCapabilitiesExtension',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'StreamingCapabilities' => 'StreamingCapabilities',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * StreamingCapabilities
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaCapabilities
+   XAddr =>  $some_value, # anyURI
+   StreamingCapabilities =>  { # ONVIF::Analytics::Types::RealTimeStreamingCapabilities
+     RTPMulticast =>  $some_value, # boolean
+     RTP_TCP =>  $some_value, # boolean
+     RTP_RTSP_TCP =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MediaCapabilitiesExtension
+     ProfileCapabilities =>  { # ONVIF::Analytics::Types::ProfileCapabilities
+       MaximumNumberOfProfiles =>  $some_value, # int
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm
new file mode 100644
index 000000000..9e4d232a5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaCapabilitiesExtension.pm
@@ -0,0 +1,105 @@
+package ONVIF::Analytics::Types::MediaCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ProfileCapabilities_of :ATTR(:get<ProfileCapabilities>);
+
+__PACKAGE__->_factory(
+    [ qw(        ProfileCapabilities
+
+    ) ],
+    {
+        'ProfileCapabilities' => \%ProfileCapabilities_of,
+    },
+    {
+        'ProfileCapabilities' => 'ONVIF::Analytics::Types::ProfileCapabilities',
+    },
+    {
+
+        'ProfileCapabilities' => 'ProfileCapabilities',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ProfileCapabilities
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaCapabilitiesExtension
+   ProfileCapabilities =>  { # ONVIF::Analytics::Types::ProfileCapabilities
+     MaximumNumberOfProfiles =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm
new file mode 100644
index 000000000..96135d645
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MediaUri.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::MediaUri;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Uri_of :ATTR(:get<Uri>);
+my %InvalidAfterConnect_of :ATTR(:get<InvalidAfterConnect>);
+my %InvalidAfterReboot_of :ATTR(:get<InvalidAfterReboot>);
+my %Timeout_of :ATTR(:get<Timeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        Uri
+        InvalidAfterConnect
+        InvalidAfterReboot
+        Timeout
+
+    ) ],
+    {
+        'Uri' => \%Uri_of,
+        'InvalidAfterConnect' => \%InvalidAfterConnect_of,
+        'InvalidAfterReboot' => \%InvalidAfterReboot_of,
+        'Timeout' => \%Timeout_of,
+    },
+    {
+        'Uri' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'InvalidAfterConnect' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'InvalidAfterReboot' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Timeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Uri' => 'Uri',
+        'InvalidAfterConnect' => 'InvalidAfterConnect',
+        'InvalidAfterReboot' => 'InvalidAfterReboot',
+        'Timeout' => 'Timeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MediaUri
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MediaUri from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Uri
+
+
+=item * InvalidAfterConnect
+
+
+=item * InvalidAfterReboot
+
+
+=item * Timeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MediaUri
+   Uri =>  $some_value, # anyURI
+   InvalidAfterConnect =>  $some_value, # boolean
+   InvalidAfterReboot =>  $some_value, # boolean
+   Timeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm
new file mode 100644
index 000000000..a0110cbb2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Merge.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Merge;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %from_of :ATTR(:get<from>);
+my %to_of :ATTR(:get<to>);
+
+__PACKAGE__->_factory(
+    [ qw(        from
+        to
+
+    ) ],
+    {
+        'from' => \%from_of,
+        'to' => \%to_of,
+    },
+    {
+        'from' => 'ONVIF::Analytics::Types::ObjectId',
+        'to' => 'ONVIF::Analytics::Types::ObjectId',
+    },
+    {
+
+        'from' => 'from',
+        'to' => 'to',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Merge
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Merge from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * from
+
+
+=item * to
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Merge
+   from => ,
+   to => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm
new file mode 100644
index 000000000..38e24eeb5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescription.pm
@@ -0,0 +1,193 @@
+package ONVIF::Analytics::Types::MessageDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MessageDescription::_MessageDescription::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Key_of :ATTR(:get<Key>);
+my %Data_of :ATTR(:get<Data>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Key
+        Data
+        Extension
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Key' => \%Key_of,
+        'Data' => \%Data_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Key' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Data' => 'ONVIF::Analytics::Types::ItemListDescription',
+        'Extension' => 'ONVIF::Analytics::Types::MessageDescriptionExtension',
+    },
+    {
+
+        'Source' => 'Source',
+        'Key' => 'Key',
+        'Data' => 'Data',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MessageDescription::_MessageDescription::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %IsProperty_of :ATTR(:get<IsProperty>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        IsProperty
+    ) ],
+    {
+
+        IsProperty => \%IsProperty_of,
+    },
+    {
+        IsProperty => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MessageDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MessageDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Source
+
+
+=item * Key
+
+
+=item * Data
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MessageDescription
+   Source =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Key =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Data =>  { # ONVIF::Analytics::Types::ItemListDescription
+     SimpleItemDescription => ,
+     ElementItemDescription => ,
+     Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MessageDescriptionExtension
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MessageDescription::_MessageDescription::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * IsProperty
+
+ Default is false.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm
new file mode 100644
index 000000000..d747adc69
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageDescriptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MessageDescriptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MessageDescriptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MessageDescriptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MessageDescriptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm
new file mode 100644
index 000000000..96774979a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MessageExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MessageExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MessageExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MessageExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MessageExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm
new file mode 100644
index 000000000..e875154b7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataAttributes.pm
@@ -0,0 +1,168 @@
+package ONVIF::Analytics::Types::MetadataAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MetadataAttributes::_MetadataAttributes::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CanContainPTZ_of :ATTR(:get<CanContainPTZ>);
+my %CanContainAnalytics_of :ATTR(:get<CanContainAnalytics>);
+my %CanContainNotifications_of :ATTR(:get<CanContainNotifications>);
+
+__PACKAGE__->_factory(
+    [ qw(        CanContainPTZ
+        CanContainAnalytics
+        CanContainNotifications
+
+    ) ],
+    {
+        'CanContainPTZ' => \%CanContainPTZ_of,
+        'CanContainAnalytics' => \%CanContainAnalytics_of,
+        'CanContainNotifications' => \%CanContainNotifications_of,
+    },
+    {
+        'CanContainPTZ' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'CanContainAnalytics' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'CanContainNotifications' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'CanContainPTZ' => 'CanContainPTZ',
+        'CanContainAnalytics' => 'CanContainAnalytics',
+        'CanContainNotifications' => 'CanContainNotifications',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MetadataAttributes::_MetadataAttributes::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %PtzSpaces_of :ATTR(:get<PtzSpaces>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        PtzSpaces
+    ) ],
+    {
+
+        PtzSpaces => \%PtzSpaces_of,
+    },
+    {
+        PtzSpaces => 'ONVIF::Analytics::Types::StringAttrList',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CanContainPTZ
+
+
+=item * CanContainAnalytics
+
+
+=item * CanContainNotifications
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataAttributes
+   CanContainPTZ =>  $some_value, # boolean
+   CanContainAnalytics =>  $some_value, # boolean
+   CanContainNotifications =>  $some_value, # boolean
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MetadataAttributes::_MetadataAttributes::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * PtzSpaces
+
+ List of all PTZ spaces active for recording. Note that events are only recorded on position changes and the actual point of recording may not necessarily contain an event of the specified type. 
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::StringAttrList|ONVIF::Analytics::Types::StringAttrList>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm
new file mode 100644
index 000000000..5ea8ec4f9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfiguration.pm
@@ -0,0 +1,186 @@
+package ONVIF::Analytics::Types::MetadataConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %PTZStatus_of :ATTR(:get<PTZStatus>);
+my %Analytics_of :ATTR(:get<Analytics>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+my %AnalyticsEngineConfiguration_of :ATTR(:get<AnalyticsEngineConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        PTZStatus
+        Analytics
+        Multicast
+        SessionTimeout
+        AnalyticsEngineConfiguration
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'PTZStatus' => \%PTZStatus_of,
+        'Analytics' => \%Analytics_of,
+        'Multicast' => \%Multicast_of,
+        'SessionTimeout' => \%SessionTimeout_of,
+        'AnalyticsEngineConfiguration' => \%AnalyticsEngineConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'PTZStatus' => 'ONVIF::Analytics::Types::PTZFilter',
+        'Analytics' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'AnalyticsEngineConfiguration' => 'ONVIF::Analytics::Types::AnalyticsEngineConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataConfigurationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'PTZStatus' => 'PTZStatus',
+        'Analytics' => 'Analytics',
+        'Multicast' => 'Multicast',
+        'SessionTimeout' => 'SessionTimeout',
+        'AnalyticsEngineConfiguration' => 'AnalyticsEngineConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatus
+
+
+=item * Analytics
+
+
+=item * Multicast
+
+
+=item * SessionTimeout
+
+
+=item * AnalyticsEngineConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfiguration
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZFilter
+     Status =>  $some_value, # boolean
+     Position =>  $some_value, # boolean
+   },
+   Analytics =>  $some_value, # boolean
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm
new file mode 100644
index 000000000..d67dea763
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MetadataConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm
new file mode 100644
index 000000000..ac0df6882
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataConfigurationOptions.pm
@@ -0,0 +1,110 @@
+package ONVIF::Analytics::Types::MetadataConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTZStatusFilterOptions_of :ATTR(:get<PTZStatusFilterOptions>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTZStatusFilterOptions
+
+    ) ],
+    {
+        'PTZStatusFilterOptions' => \%PTZStatusFilterOptions_of,
+    },
+    {
+        'PTZStatusFilterOptions' => 'ONVIF::Analytics::Types::PTZStatusFilterOptions',
+    },
+    {
+
+        'PTZStatusFilterOptions' => 'PTZStatusFilterOptions',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatusFilterOptions
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataConfigurationOptions
+   PTZStatusFilterOptions =>  { # ONVIF::Analytics::Types::PTZStatusFilterOptions
+     PanTiltStatusSupported =>  $some_value, # boolean
+     ZoomStatusSupported =>  $some_value, # boolean
+     PanTiltPositionSupported =>  $some_value, # boolean
+     ZoomPositionSupported =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm
new file mode 100644
index 000000000..f6279dfb5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataFilter.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::MetadataFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MetadataStreamFilter_of :ATTR(:get<MetadataStreamFilter>);
+
+__PACKAGE__->_factory(
+    [ qw(        MetadataStreamFilter
+
+    ) ],
+    {
+        'MetadataStreamFilter' => \%MetadataStreamFilter_of,
+    },
+    {
+        'MetadataStreamFilter' => 'ONVIF::Analytics::Types::XPathExpression',
+    },
+    {
+
+        'MetadataStreamFilter' => 'MetadataStreamFilter',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MetadataStreamFilter
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataFilter
+   MetadataStreamFilter => $some_value, # XPathExpression
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm
new file mode 100644
index 000000000..446c47f36
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInput.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::MetadataInput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MetadataConfig_of :ATTR(:get<MetadataConfig>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MetadataConfig
+        Extension
+
+    ) ],
+    {
+        'MetadataConfig' => \%MetadataConfig_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MetadataConfig' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataInputExtension',
+    },
+    {
+
+        'MetadataConfig' => 'MetadataConfig',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataInput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataInput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MetadataConfig
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataInput
+   MetadataConfig =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataInputExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm
new file mode 100644
index 000000000..6204de45d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataInputExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MetadataInputExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataInputExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataInputExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataInputExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm
new file mode 100644
index 000000000..d8000cf7b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStream.pm
@@ -0,0 +1,260 @@
+package ONVIF::Analytics::Types::MetadataStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %VideoAnalytics_of :ATTR(:get<VideoAnalytics>);
+my %PTZ_of :ATTR(:get<PTZ>);
+my %Event_of :ATTR(:get<Event>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        VideoAnalytics
+        PTZ
+        Event
+        Extension
+
+    ) ],
+    {
+        'VideoAnalytics' => \%VideoAnalytics_of,
+        'PTZ' => \%PTZ_of,
+        'Event' => \%Event_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'VideoAnalytics' => 'ONVIF::Analytics::Types::VideoAnalyticsStream',
+        'PTZ' => 'ONVIF::Analytics::Types::PTZStream',
+        'Event' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyType',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataStreamExtension',
+    },
+    {
+
+        'VideoAnalytics' => 'VideoAnalytics',
+        'PTZ' => 'PTZ',
+        'Event' => 'Event',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * VideoAnalytics
+
+
+=item * PTZ
+
+
+=item * Event
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   VideoAnalytics =>    { # ONVIF::Analytics::Types::VideoAnalyticsStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     Frame =>  { # ONVIF::Analytics::Types::Frame
+       PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+         Position =>  { # ONVIF::Analytics::Types::PTZVector
+           PanTilt => ,
+           Zoom => ,
+         },
+         MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+           PanTilt => $some_value, # MoveStatus
+           Zoom => $some_value, # MoveStatus
+         },
+         Error =>  $some_value, # string
+         UtcTime =>  $some_value, # dateTime
+       },
+       Transformation =>  { # ONVIF::Analytics::Types::Transformation
+         Translate => ,
+         Scale => ,
+         Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+         },
+       },
+       Object =>  { # ONVIF::Analytics::Types::Object
+         Appearance =>  { # ONVIF::Analytics::Types::Appearance
+           Transformation =>  { # ONVIF::Analytics::Types::Transformation
+             Translate => ,
+             Scale => ,
+             Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+             },
+           },
+           Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+             BoundingBox => ,
+             CenterOfGravity => ,
+             Polygon =>  { # ONVIF::Analytics::Types::Polygon
+               Point => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+             },
+           },
+           Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+             ColorCluster =>  {
+               Color => ,
+               Weight =>  $some_value, # float
+               Covariance => ,
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+             },
+           },
+           Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+             ClassCandidate =>  {
+               Type => $some_value, # ClassType
+               Likelihood =>  $some_value, # float
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+               OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+                 Type =>  $some_value, # string
+                 Likelihood =>  $some_value, # float
+               },
+               Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+               },
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+           },
+         },
+         Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+           Removed =>  {
+           },
+           Idle =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+         },
+       },
+       ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+         Rename =>  { # ONVIF::Analytics::Types::Rename
+           from => ,
+           to => ,
+         },
+         Split =>  { # ONVIF::Analytics::Types::Split
+           from => ,
+           to => ,
+         },
+         Merge =>  { # ONVIF::Analytics::Types::Merge
+           from => ,
+           to => ,
+         },
+         Delete => ,
+         Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+         MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+         },
+         Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+     },
+   },
+   PTZ =>    { # ONVIF::Analytics::Types::PTZStream
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+       Position =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+         PanTilt => $some_value, # MoveStatus
+         Zoom => $some_value, # MoveStatus
+       },
+       Error =>  $some_value, # string
+       UtcTime =>  $some_value, # dateTime
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZStreamExtension
+     },
+   },
+   Event =>  $some_value, # anyType
+   Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension
+     AudioAnalyticsStream =>  { # ONVIF::Analytics::Types::AudioAnalyticsStream
+       AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm
new file mode 100644
index 000000000..d4c0b9015
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::MetadataStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioAnalyticsStream_of :ATTR(:get<AudioAnalyticsStream>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioAnalyticsStream
+        Extension
+
+    ) ],
+    {
+        'AudioAnalyticsStream' => \%AudioAnalyticsStream_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AudioAnalyticsStream' => 'ONVIF::Analytics::Types::AudioAnalyticsStream',
+        'Extension' => 'ONVIF::Analytics::Types::MetadataStreamExtension2',
+    },
+    {
+
+        'AudioAnalyticsStream' => 'AudioAnalyticsStream',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioAnalyticsStream
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStreamExtension
+   AudioAnalyticsStream =>  { # ONVIF::Analytics::Types::AudioAnalyticsStream
+     AudioDescriptor =>  { # ONVIF::Analytics::Types::AudioDescriptor
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AudioAnalyticsStreamExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::MetadataStreamExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm
new file mode 100644
index 000000000..3b76aa4ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MetadataStreamExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::MetadataStreamExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MetadataStreamExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MetadataStreamExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MetadataStreamExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm
new file mode 100644
index 000000000..15a296e5f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ModeOfOperation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ModeOfOperation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ModeOfOperation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm
new file mode 100644
index 000000000..b5970afba
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpression.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::MotionExpression;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MotionExpression::_MotionExpression::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Expression_of :ATTR(:get<Expression>);
+
+__PACKAGE__->_factory(
+    [ qw(        Expression
+
+    ) ],
+    {
+        'Expression' => \%Expression_of,
+    },
+    {
+        'Expression' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Expression' => 'Expression',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MotionExpression::_MotionExpression::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Type
+    ) ],
+    {
+
+        Type => \%Type_of,
+    },
+    {
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MotionExpression
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MotionExpression from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Expression
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MotionExpression
+   Expression =>  $some_value, # string
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MotionExpression::_MotionExpression::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Type
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::string|SOAP::WSDL::XSD::Typelib::Builtin::string>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm
new file mode 100644
index 000000000..cb2d55d75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionExpressionConfiguration.pm
@@ -0,0 +1,105 @@
+package ONVIF::Analytics::Types::MotionExpressionConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MotionExpression_of :ATTR(:get<MotionExpression>);
+
+__PACKAGE__->_factory(
+    [ qw(        MotionExpression
+
+    ) ],
+    {
+        'MotionExpression' => \%MotionExpression_of,
+    },
+    {
+        'MotionExpression' => 'ONVIF::Analytics::Types::MotionExpression',
+    },
+    {
+
+        'MotionExpression' => 'MotionExpression',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MotionExpressionConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MotionExpressionConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MotionExpression
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MotionExpressionConfiguration
+   MotionExpression =>  { # ONVIF::Analytics::Types::MotionExpression
+     Expression =>  $some_value, # string
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm
new file mode 100644
index 000000000..89de61e18
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MotionInCells.pm
@@ -0,0 +1,167 @@
+package ONVIF::Analytics::Types::MotionInCells;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::MotionInCells::_MotionInCells::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::MotionInCells::_MotionInCells::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Columns_of :ATTR(:get<Columns>);
+my %Rows_of :ATTR(:get<Rows>);
+my %Cells_of :ATTR(:get<Cells>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Columns
+        Rows
+        Cells
+    ) ],
+    {
+
+        Columns => \%Columns_of,
+
+        Rows => \%Rows_of,
+
+        Cells => \%Cells_of,
+    },
+    {
+        Columns => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+        Rows => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+        Cells => 'SOAP::WSDL::XSD::Typelib::Builtin::base64Binary',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MotionInCells
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MotionInCells from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MotionInCells
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::MotionInCells::_MotionInCells::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Columns
+
+ Number of columns of the cell grid (x dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+=item * Rows
+
+ Number of rows of the cell grid (y dimension)
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+=item * Cells
+
+ A “1” denotes a cell where motion is detected and a “0” an empty cell. The first cell is in the upper left corner. Then the cell order goes first from left to right and then from up to down. If the number of cells is not a multiple of 8 the last byte is filled with zeros. The information is run length encoded according to Packbit coding in ISO 12369 (TIFF, Revision 6.0).
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::base64Binary|SOAP::WSDL::XSD::Typelib::Builtin::base64Binary>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm
new file mode 100644
index 000000000..d78c53c1f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::MoveOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Absolute_of :ATTR(:get<Absolute>);
+my %Relative_of :ATTR(:get<Relative>);
+my %Continuous_of :ATTR(:get<Continuous>);
+
+__PACKAGE__->_factory(
+    [ qw(        Absolute
+        Relative
+        Continuous
+
+    ) ],
+    {
+        'Absolute' => \%Absolute_of,
+        'Relative' => \%Relative_of,
+        'Continuous' => \%Continuous_of,
+    },
+    {
+        'Absolute' => 'ONVIF::Analytics::Types::AbsoluteFocusOptions',
+        'Relative' => 'ONVIF::Analytics::Types::RelativeFocusOptions',
+        'Continuous' => 'ONVIF::Analytics::Types::ContinuousFocusOptions',
+    },
+    {
+
+        'Absolute' => 'Absolute',
+        'Relative' => 'Relative',
+        'Continuous' => 'Continuous',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MoveOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MoveOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Absolute
+
+
+=item * Relative
+
+
+=item * Continuous
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MoveOptions
+   Absolute =>  { # ONVIF::Analytics::Types::AbsoluteFocusOptions
+     Position =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Relative =>  { # ONVIF::Analytics::Types::RelativeFocusOptions
+     Distance =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Continuous =>  { # ONVIF::Analytics::Types::ContinuousFocusOptions
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm
new file mode 100644
index 000000000..0adb4eeba
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveOptions20.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::MoveOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Absolute_of :ATTR(:get<Absolute>);
+my %Relative_of :ATTR(:get<Relative>);
+my %Continuous_of :ATTR(:get<Continuous>);
+
+__PACKAGE__->_factory(
+    [ qw(        Absolute
+        Relative
+        Continuous
+
+    ) ],
+    {
+        'Absolute' => \%Absolute_of,
+        'Relative' => \%Relative_of,
+        'Continuous' => \%Continuous_of,
+    },
+    {
+        'Absolute' => 'ONVIF::Analytics::Types::AbsoluteFocusOptions',
+        'Relative' => 'ONVIF::Analytics::Types::RelativeFocusOptions20',
+        'Continuous' => 'ONVIF::Analytics::Types::ContinuousFocusOptions',
+    },
+    {
+
+        'Absolute' => 'Absolute',
+        'Relative' => 'Relative',
+        'Continuous' => 'Continuous',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MoveOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MoveOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Absolute
+
+
+=item * Relative
+
+
+=item * Continuous
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MoveOptions20
+   Absolute =>  { # ONVIF::Analytics::Types::AbsoluteFocusOptions
+     Position =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Relative =>  { # ONVIF::Analytics::Types::RelativeFocusOptions20
+     Distance =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Continuous =>  { # ONVIF::Analytics::Types::ContinuousFocusOptions
+     Speed =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm
new file mode 100644
index 000000000..4ff1de037
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MoveStatus.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::MoveStatus;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+MoveStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm
new file mode 100644
index 000000000..da13fcde6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Configuration.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Mpeg4Configuration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %GovLength_of :ATTR(:get<GovLength>);
+my %Mpeg4Profile_of :ATTR(:get<Mpeg4Profile>);
+
+__PACKAGE__->_factory(
+    [ qw(        GovLength
+        Mpeg4Profile
+
+    ) ],
+    {
+        'GovLength' => \%GovLength_of,
+        'Mpeg4Profile' => \%Mpeg4Profile_of,
+    },
+    {
+        'GovLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Mpeg4Profile' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+    },
+    {
+
+        'GovLength' => 'GovLength',
+        'Mpeg4Profile' => 'Mpeg4Profile',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4Configuration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4Configuration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * GovLength
+
+
+=item * Mpeg4Profile
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4Configuration
+   GovLength =>  $some_value, # int
+   Mpeg4Profile => $some_value, # Mpeg4Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm
new file mode 100644
index 000000000..93aaec9b0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4DecOptions.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::Mpeg4DecOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %SupportedMpeg4Profiles_of :ATTR(:get<SupportedMpeg4Profiles>);
+my %SupportedInputBitrate_of :ATTR(:get<SupportedInputBitrate>);
+my %SupportedFrameRate_of :ATTR(:get<SupportedFrameRate>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        SupportedMpeg4Profiles
+        SupportedInputBitrate
+        SupportedFrameRate
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'SupportedMpeg4Profiles' => \%SupportedMpeg4Profiles_of,
+        'SupportedInputBitrate' => \%SupportedInputBitrate_of,
+        'SupportedFrameRate' => \%SupportedFrameRate_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'SupportedMpeg4Profiles' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+        'SupportedInputBitrate' => 'ONVIF::Analytics::Types::IntRange',
+        'SupportedFrameRate' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'SupportedMpeg4Profiles' => 'SupportedMpeg4Profiles',
+        'SupportedInputBitrate' => 'SupportedInputBitrate',
+        'SupportedFrameRate' => 'SupportedFrameRate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4DecOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4DecOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * SupportedMpeg4Profiles
+
+
+=item * SupportedInputBitrate
+
+
+=item * SupportedFrameRate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4DecOptions
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   SupportedMpeg4Profiles => $some_value, # Mpeg4Profile
+   SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm
new file mode 100644
index 000000000..4ab63bc75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::Mpeg4Options;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %Mpeg4ProfilesSupported_of :ATTR(:get<Mpeg4ProfilesSupported>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        Mpeg4ProfilesSupported
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'Mpeg4ProfilesSupported' => \%Mpeg4ProfilesSupported_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'Mpeg4ProfilesSupported' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'Mpeg4ProfilesSupported' => 'Mpeg4ProfilesSupported',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4Options
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4Options from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ResolutionsAvailable
+
+
+=item * GovLengthRange
+
+
+=item * FrameRateRange
+
+
+=item * EncodingIntervalRange
+
+
+=item * Mpeg4ProfilesSupported
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4Options
+   ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   Mpeg4ProfilesSupported => $some_value, # Mpeg4Profile
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm
new file mode 100644
index 000000000..fc5749f7a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Options2.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::Mpeg4Options2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::Mpeg4Options);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ResolutionsAvailable_of :ATTR(:get<ResolutionsAvailable>);
+my %GovLengthRange_of :ATTR(:get<GovLengthRange>);
+my %FrameRateRange_of :ATTR(:get<FrameRateRange>);
+my %EncodingIntervalRange_of :ATTR(:get<EncodingIntervalRange>);
+my %Mpeg4ProfilesSupported_of :ATTR(:get<Mpeg4ProfilesSupported>);
+my %BitrateRange_of :ATTR(:get<BitrateRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        ResolutionsAvailable
+        GovLengthRange
+        FrameRateRange
+        EncodingIntervalRange
+        Mpeg4ProfilesSupported
+        BitrateRange
+
+    ) ],
+    {
+        'ResolutionsAvailable' => \%ResolutionsAvailable_of,
+        'GovLengthRange' => \%GovLengthRange_of,
+        'FrameRateRange' => \%FrameRateRange_of,
+        'EncodingIntervalRange' => \%EncodingIntervalRange_of,
+        'Mpeg4ProfilesSupported' => \%Mpeg4ProfilesSupported_of,
+        'BitrateRange' => \%BitrateRange_of,
+    },
+    {
+        'ResolutionsAvailable' => 'ONVIF::Analytics::Types::VideoResolution',
+        'GovLengthRange' => 'ONVIF::Analytics::Types::IntRange',
+        'FrameRateRange' => 'ONVIF::Analytics::Types::IntRange',
+        'EncodingIntervalRange' => 'ONVIF::Analytics::Types::IntRange',
+        'Mpeg4ProfilesSupported' => 'ONVIF::Analytics::Types::Mpeg4Profile',
+        'BitrateRange' => 'ONVIF::Analytics::Types::IntRange',
+    },
+    {
+
+        'ResolutionsAvailable' => 'ResolutionsAvailable',
+        'GovLengthRange' => 'GovLengthRange',
+        'FrameRateRange' => 'FrameRateRange',
+        'EncodingIntervalRange' => 'EncodingIntervalRange',
+        'Mpeg4ProfilesSupported' => 'Mpeg4ProfilesSupported',
+        'BitrateRange' => 'BitrateRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Mpeg4Options2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Mpeg4Options2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BitrateRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Mpeg4Options2
+   BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm
new file mode 100644
index 000000000..d73bc317a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Mpeg4Profile.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Mpeg4Profile;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Mpeg4Profile from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm
new file mode 100644
index 000000000..2dabdb738
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/MulticastConfiguration.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::MulticastConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %Port_of :ATTR(:get<Port>);
+my %TTL_of :ATTR(:get<TTL>);
+my %AutoStart_of :ATTR(:get<AutoStart>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        Port
+        TTL
+        AutoStart
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'Port' => \%Port_of,
+        'TTL' => \%TTL_of,
+        'AutoStart' => \%AutoStart_of,
+    },
+    {
+        'Address' => 'ONVIF::Analytics::Types::IPAddress',
+        'Port' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'TTL' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AutoStart' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Address' => 'Address',
+        'Port' => 'Port',
+        'TTL' => 'TTL',
+        'AutoStart' => 'AutoStart',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::MulticastConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MulticastConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * Port
+
+
+=item * TTL
+
+
+=item * AutoStart
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::MulticastConfiguration
+   Address =>  { # ONVIF::Analytics::Types::IPAddress
+     Type => $some_value, # IPType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+   },
+   Port =>  $some_value, # int
+   TTL =>  $some_value, # int
+   AutoStart =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm
new file mode 100644
index 000000000..531ed9206
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformation.pm
@@ -0,0 +1,145 @@
+package ONVIF::Analytics::Types::NTPInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FromDHCP_of :ATTR(:get<FromDHCP>);
+my %NTPFromDHCP_of :ATTR(:get<NTPFromDHCP>);
+my %NTPManual_of :ATTR(:get<NTPManual>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        FromDHCP
+        NTPFromDHCP
+        NTPManual
+        Extension
+
+    ) ],
+    {
+        'FromDHCP' => \%FromDHCP_of,
+        'NTPFromDHCP' => \%NTPFromDHCP_of,
+        'NTPManual' => \%NTPManual_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'FromDHCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'NTPFromDHCP' => 'ONVIF::Analytics::Types::NetworkHost',
+        'NTPManual' => 'ONVIF::Analytics::Types::NetworkHost',
+        'Extension' => 'ONVIF::Analytics::Types::NTPInformationExtension',
+    },
+    {
+
+        'FromDHCP' => 'FromDHCP',
+        'NTPFromDHCP' => 'NTPFromDHCP',
+        'NTPManual' => 'NTPManual',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NTPInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NTPInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FromDHCP
+
+
+=item * NTPFromDHCP
+
+
+=item * NTPManual
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NTPInformation
+   FromDHCP =>  $some_value, # boolean
+   NTPFromDHCP =>  { # ONVIF::Analytics::Types::NetworkHost
+     Type => $some_value, # NetworkHostType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+     DNSname => $some_value, # DNSName
+     Extension =>  { # ONVIF::Analytics::Types::NetworkHostExtension
+     },
+   },
+   NTPManual =>  { # ONVIF::Analytics::Types::NetworkHost
+     Type => $some_value, # NetworkHostType
+     IPv4Address => $some_value, # IPv4Address
+     IPv6Address => $some_value, # IPv6Address
+     DNSname => $some_value, # DNSName
+     Extension =>  { # ONVIF::Analytics::Types::NetworkHostExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NTPInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm
new file mode 100644
index 000000000..be584bca9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NTPInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NTPInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NTPInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NTPInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NTPInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm
new file mode 100644
index 000000000..f88145484
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Name.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::Name;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+Name from the namespace http://www.onvif.org/ver10/schema.
+
+User readable name. Length up to 64 characters.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm
new file mode 100644
index 000000000..4cfcea41c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilities.pm
@@ -0,0 +1,143 @@
+package ONVIF::Analytics::Types::NetworkCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IPFilter_of :ATTR(:get<IPFilter>);
+my %ZeroConfiguration_of :ATTR(:get<ZeroConfiguration>);
+my %IPVersion6_of :ATTR(:get<IPVersion6>);
+my %DynDNS_of :ATTR(:get<DynDNS>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IPFilter
+        ZeroConfiguration
+        IPVersion6
+        DynDNS
+        Extension
+
+    ) ],
+    {
+        'IPFilter' => \%IPFilter_of,
+        'ZeroConfiguration' => \%ZeroConfiguration_of,
+        'IPVersion6' => \%IPVersion6_of,
+        'DynDNS' => \%DynDNS_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IPFilter' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ZeroConfiguration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'IPVersion6' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DynDNS' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkCapabilitiesExtension',
+    },
+    {
+
+        'IPFilter' => 'IPFilter',
+        'ZeroConfiguration' => 'ZeroConfiguration',
+        'IPVersion6' => 'IPVersion6',
+        'DynDNS' => 'DynDNS',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IPFilter
+
+
+=item * ZeroConfiguration
+
+
+=item * IPVersion6
+
+
+=item * DynDNS
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkCapabilities
+   IPFilter =>  $some_value, # boolean
+   ZeroConfiguration =>  $some_value, # boolean
+   IPVersion6 =>  $some_value, # boolean
+   DynDNS =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+     Dot11Configuration =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm
new file mode 100644
index 000000000..49aad0301
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::NetworkCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot11Configuration_of :ATTR(:get<Dot11Configuration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot11Configuration
+        Extension
+
+    ) ],
+    {
+        'Dot11Configuration' => \%Dot11Configuration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Dot11Configuration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkCapabilitiesExtension2',
+    },
+    {
+
+        'Dot11Configuration' => 'Dot11Configuration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot11Configuration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension
+   Dot11Configuration =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm
new file mode 100644
index 000000000..b47b45030
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkCapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkCapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm
new file mode 100644
index 000000000..22ca72d27
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkGateway.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::NetworkGateway;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+
+__PACKAGE__->_factory(
+    [ qw(        IPv4Address
+        IPv6Address
+
+    ) ],
+    {
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+    },
+    {
+        'IPv4Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::IPv6Address',
+    },
+    {
+
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkGateway
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkGateway from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkGateway
+   IPv4Address => $some_value, # IPv4Address
+   IPv6Address => $some_value, # IPv6Address
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm
new file mode 100644
index 000000000..d2ba03f2d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHost.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::NetworkHost;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %IPv4Address_of :ATTR(:get<IPv4Address>);
+my %IPv6Address_of :ATTR(:get<IPv6Address>);
+my %DNSname_of :ATTR(:get<DNSname>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        IPv4Address
+        IPv6Address
+        DNSname
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'IPv4Address' => \%IPv4Address_of,
+        'IPv6Address' => \%IPv6Address_of,
+        'DNSname' => \%DNSname_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::NetworkHostType',
+        'IPv4Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'IPv6Address' => 'ONVIF::Analytics::Types::IPv6Address',
+        'DNSname' => 'ONVIF::Analytics::Types::DNSName',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkHostExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'IPv4Address' => 'IPv4Address',
+        'IPv6Address' => 'IPv6Address',
+        'DNSname' => 'DNSname',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkHost
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkHost from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * IPv4Address
+
+
+=item * IPv6Address
+
+
+=item * DNSname
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkHost
+   Type => $some_value, # NetworkHostType
+   IPv4Address => $some_value, # IPv4Address
+   IPv6Address => $some_value, # IPv6Address
+   DNSname => $some_value, # DNSName
+   Extension =>  { # ONVIF::Analytics::Types::NetworkHostExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm
new file mode 100644
index 000000000..5aff9a65a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkHostExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkHostExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkHostExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkHostExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm
new file mode 100644
index 000000000..23c06aa48
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkHostType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::NetworkHostType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+NetworkHostType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm
new file mode 100644
index 000000000..96748702a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterface.pm
@@ -0,0 +1,233 @@
+package ONVIF::Analytics::Types::NetworkInterface;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Info_of :ATTR(:get<Info>);
+my %Link_of :ATTR(:get<Link>);
+my %IPv4_of :ATTR(:get<IPv4>);
+my %IPv6_of :ATTR(:get<IPv6>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Info
+        Link
+        IPv4
+        IPv6
+        Extension
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Info' => \%Info_of,
+        'Link' => \%Link_of,
+        'IPv4' => \%IPv4_of,
+        'IPv6' => \%IPv6_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Info' => 'ONVIF::Analytics::Types::NetworkInterfaceInfo',
+        'Link' => 'ONVIF::Analytics::Types::NetworkInterfaceLink',
+        'IPv4' => 'ONVIF::Analytics::Types::IPv4NetworkInterface',
+        'IPv6' => 'ONVIF::Analytics::Types::IPv6NetworkInterface',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceExtension',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Info' => 'Info',
+        'Link' => 'Link',
+        'IPv4' => 'IPv4',
+        'IPv6' => 'IPv6',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterface
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterface from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Info
+
+
+=item * Link
+
+
+=item * IPv4
+
+
+=item * IPv6
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterface
+   Enabled =>  $some_value, # boolean
+   Info =>  { # ONVIF::Analytics::Types::NetworkInterfaceInfo
+     Name =>  $some_value, # string
+     HwAddress => $some_value, # HwAddress
+     MTU =>  $some_value, # int
+   },
+   Link =>  { # ONVIF::Analytics::Types::NetworkInterfaceLink
+     AdminSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+       AutoNegotiation =>  $some_value, # boolean
+       Speed =>  $some_value, # int
+       Duplex => $some_value, # Duplex
+     },
+     OperSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+       AutoNegotiation =>  $some_value, # boolean
+       Speed =>  $some_value, # int
+       Duplex => $some_value, # Duplex
+     },
+     InterfaceType => $some_value, # IANA-IfTypes
+   },
+   IPv4 =>  { # ONVIF::Analytics::Types::IPv4NetworkInterface
+     Enabled =>  $some_value, # boolean
+     Config =>  { # ONVIF::Analytics::Types::IPv4Configuration
+       Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+         Address => $some_value, # IPv4Address
+         PrefixLength =>  $some_value, # int
+       },
+       LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+         Address => $some_value, # IPv4Address
+         PrefixLength =>  $some_value, # int
+       },
+       FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+         Address => $some_value, # IPv4Address
+         PrefixLength =>  $some_value, # int
+       },
+       DHCP =>  $some_value, # boolean
+     },
+   },
+   IPv6 =>  { # ONVIF::Analytics::Types::IPv6NetworkInterface
+     Enabled =>  $some_value, # boolean
+     Config =>  { # ONVIF::Analytics::Types::IPv6Configuration
+       AcceptRouterAdvert =>  $some_value, # boolean
+       DHCP => $some_value, # IPv6DHCPConfiguration
+       Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       LinkLocal =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       FromDHCP =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       FromRA =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+         Address => $some_value, # IPv6Address
+         PrefixLength =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::IPv6ConfigurationExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceExtension
+     InterfaceType => $some_value, # IANA-IfTypes
+     Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+     },
+     Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+       SSID => $some_value, # Dot11SSIDType
+       Mode => $some_value, # Dot11StationMode
+       Alias => $some_value, # Name
+       Priority => $some_value, # NetworkInterfaceConfigPriority
+       Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+         Mode => $some_value, # Dot11SecurityMode
+         Algorithm => $some_value, # Dot11Cipher
+         PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+           Key => $some_value, # Dot11PSK
+           Passphrase => $some_value, # Dot11PSKPassphrase
+           Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+           },
+         },
+         Dot1X => $some_value, # ReferenceToken
+         Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm
new file mode 100644
index 000000000..974026b66
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConfigPriority.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::NetworkInterfaceConfigPriority;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::integer);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+NetworkInterfaceConfigPriority from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::integer
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm
new file mode 100644
index 000000000..1fb953c0c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceConnectionSetting.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoNegotiation_of :ATTR(:get<AutoNegotiation>);
+my %Speed_of :ATTR(:get<Speed>);
+my %Duplex_of :ATTR(:get<Duplex>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoNegotiation
+        Speed
+        Duplex
+
+    ) ],
+    {
+        'AutoNegotiation' => \%AutoNegotiation_of,
+        'Speed' => \%Speed_of,
+        'Duplex' => \%Duplex_of,
+    },
+    {
+        'AutoNegotiation' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Duplex' => 'ONVIF::Analytics::Types::Duplex',
+    },
+    {
+
+        'AutoNegotiation' => 'AutoNegotiation',
+        'Speed' => 'Speed',
+        'Duplex' => 'Duplex',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceConnectionSetting from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoNegotiation
+
+
+=item * Speed
+
+
+=item * Duplex
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+   AutoNegotiation =>  $some_value, # boolean
+   Speed =>  $some_value, # int
+   Duplex => $some_value, # Duplex
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm
new file mode 100644
index 000000000..9def16d78
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension.pm
@@ -0,0 +1,150 @@
+package ONVIF::Analytics::Types::NetworkInterfaceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InterfaceType_of :ATTR(:get<InterfaceType>);
+my %Dot3_of :ATTR(:get<Dot3>);
+my %Dot11_of :ATTR(:get<Dot11>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InterfaceType
+        Dot3
+        Dot11
+        Extension
+
+    ) ],
+    {
+        'InterfaceType' => \%InterfaceType_of,
+        'Dot3' => \%Dot3_of,
+        'Dot11' => \%Dot11_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InterfaceType' => 'ONVIF::Analytics::Types::IANA_IfTypes',
+        'Dot3' => 'ONVIF::Analytics::Types::Dot3Configuration',
+        'Dot11' => 'ONVIF::Analytics::Types::Dot11Configuration',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceExtension2',
+    },
+    {
+
+        'InterfaceType' => 'InterfaceType',
+        'Dot3' => 'Dot3',
+        'Dot11' => 'Dot11',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InterfaceType
+
+
+=item * Dot3
+
+
+=item * Dot11
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceExtension
+   InterfaceType => $some_value, # IANA-IfTypes
+   Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+   },
+   Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+     SSID => $some_value, # Dot11SSIDType
+     Mode => $some_value, # Dot11StationMode
+     Alias => $some_value, # Name
+     Priority => $some_value, # NetworkInterfaceConfigPriority
+     Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+       Mode => $some_value, # Dot11SecurityMode
+       Algorithm => $some_value, # Dot11Cipher
+       PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+         Key => $some_value, # Dot11PSK
+         Passphrase => $some_value, # Dot11PSKPassphrase
+         Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+         },
+       },
+       Dot1X => $some_value, # ReferenceToken
+       Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm
new file mode 100644
index 000000000..cd9cb116c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkInterfaceExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm
new file mode 100644
index 000000000..b9abc22e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceInfo.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::NetworkInterfaceInfo;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %HwAddress_of :ATTR(:get<HwAddress>);
+my %MTU_of :ATTR(:get<MTU>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        HwAddress
+        MTU
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'HwAddress' => \%HwAddress_of,
+        'MTU' => \%MTU_of,
+    },
+    {
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'HwAddress' => 'ONVIF::Analytics::Types::HwAddress',
+        'MTU' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Name' => 'Name',
+        'HwAddress' => 'HwAddress',
+        'MTU' => 'MTU',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceInfo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceInfo from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * HwAddress
+
+
+=item * MTU
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceInfo
+   Name =>  $some_value, # string
+   HwAddress => $some_value, # HwAddress
+   MTU =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm
new file mode 100644
index 000000000..f54a7a060
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceLink.pm
@@ -0,0 +1,129 @@
+package ONVIF::Analytics::Types::NetworkInterfaceLink;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AdminSettings_of :ATTR(:get<AdminSettings>);
+my %OperSettings_of :ATTR(:get<OperSettings>);
+my %InterfaceType_of :ATTR(:get<InterfaceType>);
+
+__PACKAGE__->_factory(
+    [ qw(        AdminSettings
+        OperSettings
+        InterfaceType
+
+    ) ],
+    {
+        'AdminSettings' => \%AdminSettings_of,
+        'OperSettings' => \%OperSettings_of,
+        'InterfaceType' => \%InterfaceType_of,
+    },
+    {
+        'AdminSettings' => 'ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting',
+        'OperSettings' => 'ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting',
+        'InterfaceType' => 'ONVIF::Analytics::Types::IANA_IfTypes',
+    },
+    {
+
+        'AdminSettings' => 'AdminSettings',
+        'OperSettings' => 'OperSettings',
+        'InterfaceType' => 'InterfaceType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceLink
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceLink from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AdminSettings
+
+
+=item * OperSettings
+
+
+=item * InterfaceType
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceLink
+   AdminSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+     AutoNegotiation =>  $some_value, # boolean
+     Speed =>  $some_value, # int
+     Duplex => $some_value, # Duplex
+   },
+   OperSettings =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+     AutoNegotiation =>  $some_value, # boolean
+     Speed =>  $some_value, # int
+     Duplex => $some_value, # Duplex
+   },
+   InterfaceType => $some_value, # IANA-IfTypes
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm
new file mode 100644
index 000000000..4e0ba7705
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfiguration.pm
@@ -0,0 +1,191 @@
+package ONVIF::Analytics::Types::NetworkInterfaceSetConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Link_of :ATTR(:get<Link>);
+my %MTU_of :ATTR(:get<MTU>);
+my %IPv4_of :ATTR(:get<IPv4>);
+my %IPv6_of :ATTR(:get<IPv6>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Enabled
+        Link
+        MTU
+        IPv4
+        IPv6
+        Extension
+
+    ) ],
+    {
+        'Enabled' => \%Enabled_of,
+        'Link' => \%Link_of,
+        'MTU' => \%MTU_of,
+        'IPv4' => \%IPv4_of,
+        'IPv6' => \%IPv6_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Link' => 'ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting',
+        'MTU' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'IPv4' => 'ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration',
+        'IPv6' => 'ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension',
+    },
+    {
+
+        'Enabled' => 'Enabled',
+        'Link' => 'Link',
+        'MTU' => 'MTU',
+        'IPv4' => 'IPv4',
+        'IPv6' => 'IPv6',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceSetConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceSetConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Enabled
+
+
+=item * Link
+
+
+=item * MTU
+
+
+=item * IPv4
+
+
+=item * IPv6
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceSetConfiguration
+   Enabled =>  $some_value, # boolean
+   Link =>  { # ONVIF::Analytics::Types::NetworkInterfaceConnectionSetting
+     AutoNegotiation =>  $some_value, # boolean
+     Speed =>  $some_value, # int
+     Duplex => $some_value, # Duplex
+   },
+   MTU =>  $some_value, # int
+   IPv4 =>  { # ONVIF::Analytics::Types::IPv4NetworkInterfaceSetConfiguration
+     Enabled =>  $some_value, # boolean
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv4Address
+       Address => $some_value, # IPv4Address
+       PrefixLength =>  $some_value, # int
+     },
+     DHCP =>  $some_value, # boolean
+   },
+   IPv6 =>  { # ONVIF::Analytics::Types::IPv6NetworkInterfaceSetConfiguration
+     Enabled =>  $some_value, # boolean
+     AcceptRouterAdvert =>  $some_value, # boolean
+     Manual =>  { # ONVIF::Analytics::Types::PrefixedIPv6Address
+       Address => $some_value, # IPv6Address
+       PrefixLength =>  $some_value, # int
+     },
+     DHCP => $some_value, # IPv6DHCPConfiguration
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension
+     Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+     },
+     Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+       SSID => $some_value, # Dot11SSIDType
+       Mode => $some_value, # Dot11StationMode
+       Alias => $some_value, # Name
+       Priority => $some_value, # NetworkInterfaceConfigPriority
+       Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+         Mode => $some_value, # Dot11SecurityMode
+         Algorithm => $some_value, # Dot11Cipher
+         PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+           Key => $some_value, # Dot11PSK
+           Passphrase => $some_value, # Dot11PSKPassphrase
+           Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+           },
+         },
+         Dot1X => $some_value, # ReferenceToken
+         Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm
new file mode 100644
index 000000000..6cfe08cb3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension.pm
@@ -0,0 +1,141 @@
+package ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot3_of :ATTR(:get<Dot3>);
+my %Dot11_of :ATTR(:get<Dot11>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot3
+        Dot11
+        Extension
+
+    ) ],
+    {
+        'Dot3' => \%Dot3_of,
+        'Dot11' => \%Dot11_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Dot3' => 'ONVIF::Analytics::Types::Dot3Configuration',
+        'Dot11' => 'ONVIF::Analytics::Types::Dot11Configuration',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2',
+    },
+    {
+
+        'Dot3' => 'Dot3',
+        'Dot11' => 'Dot11',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceSetConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot3
+
+
+=item * Dot11
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension
+   Dot3 =>  { # ONVIF::Analytics::Types::Dot3Configuration
+   },
+   Dot11 =>  { # ONVIF::Analytics::Types::Dot11Configuration
+     SSID => $some_value, # Dot11SSIDType
+     Mode => $some_value, # Dot11StationMode
+     Alias => $some_value, # Name
+     Priority => $some_value, # NetworkInterfaceConfigPriority
+     Security =>  { # ONVIF::Analytics::Types::Dot11SecurityConfiguration
+       Mode => $some_value, # Dot11SecurityMode
+       Algorithm => $some_value, # Dot11Cipher
+       PSK =>  { # ONVIF::Analytics::Types::Dot11PSKSet
+         Key => $some_value, # Dot11PSK
+         Passphrase => $some_value, # Dot11PSKPassphrase
+         Extension =>  { # ONVIF::Analytics::Types::Dot11PSKSetExtension
+         },
+       },
+       Dot1X => $some_value, # ReferenceToken
+       Extension =>  { # ONVIF::Analytics::Types::Dot11SecurityConfigurationExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm
new file mode 100644
index 000000000..90786a2b9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkInterfaceSetConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkInterfaceSetConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkInterfaceSetConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm
new file mode 100644
index 000000000..2079fd87e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocol.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::NetworkProtocol;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Port_of :ATTR(:get<Port>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Enabled
+        Port
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Enabled' => \%Enabled_of,
+        'Port' => \%Port_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::NetworkProtocolType',
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Port' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkProtocolExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'Enabled' => 'Enabled',
+        'Port' => 'Port',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkProtocol
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkProtocol from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Enabled
+
+
+=item * Port
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkProtocol
+   Name => $some_value, # NetworkProtocolType
+   Enabled =>  $some_value, # boolean
+   Port =>  $some_value, # int
+   Extension =>  { # ONVIF::Analytics::Types::NetworkProtocolExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm
new file mode 100644
index 000000000..8dec59681
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkProtocolExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkProtocolExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkProtocolExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkProtocolExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm
new file mode 100644
index 000000000..e46ec2839
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkProtocolType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::NetworkProtocolType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+NetworkProtocolType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm
new file mode 100644
index 000000000..258296363
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfiguration.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::NetworkZeroConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %InterfaceToken_of :ATTR(:get<InterfaceToken>);
+my %Enabled_of :ATTR(:get<Enabled>);
+my %Addresses_of :ATTR(:get<Addresses>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        InterfaceToken
+        Enabled
+        Addresses
+        Extension
+
+    ) ],
+    {
+        'InterfaceToken' => \%InterfaceToken_of,
+        'Enabled' => \%Enabled_of,
+        'Addresses' => \%Addresses_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'InterfaceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Enabled' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Addresses' => 'ONVIF::Analytics::Types::IPv4Address',
+        'Extension' => 'ONVIF::Analytics::Types::NetworkZeroConfigurationExtension',
+    },
+    {
+
+        'InterfaceToken' => 'InterfaceToken',
+        'Enabled' => 'Enabled',
+        'Addresses' => 'Addresses',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkZeroConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkZeroConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * InterfaceToken
+
+
+=item * Enabled
+
+
+=item * Addresses
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkZeroConfiguration
+   InterfaceToken => $some_value, # ReferenceToken
+   Enabled =>  $some_value, # boolean
+   Addresses => $some_value, # IPv4Address
+   Extension =>  { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension
+     Extension =>  { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm
new file mode 100644
index 000000000..ec65f3f5c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension.pm
@@ -0,0 +1,104 @@
+package ONVIF::Analytics::Types::NetworkZeroConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Extension
+
+    ) ],
+    {
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Extension' => 'ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2',
+    },
+    {
+
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkZeroConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkZeroConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension
+   Extension =>  { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm
new file mode 100644
index 000000000..a6a609181
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/NetworkZeroConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NetworkZeroConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::NetworkZeroConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm
new file mode 100644
index 000000000..729660b3c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColor.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::OSDColor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::OSDColor::_OSDColor::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Color_of :ATTR(:get<Color>);
+
+__PACKAGE__->_factory(
+    [ qw(        Color
+
+    ) ],
+    {
+        'Color' => \%Color_of,
+    },
+    {
+        'Color' => 'ONVIF::Analytics::Types::Color',
+    },
+    {
+
+        'Color' => 'Color',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::OSDColor::_OSDColor::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Transparent_of :ATTR(:get<Transparent>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Transparent
+    ) ],
+    {
+
+        Transparent => \%Transparent_of,
+    },
+    {
+        Transparent => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDColor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDColor from the namespace http://www.onvif.org/ver10/schema.
+
+The value range of "Transparent" could be defined by vendors only should follow this rule: the minimum value means non-transparent and the maximum value maens fully transparent.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Color
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDColor
+   Color => ,
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::OSDColor::_OSDColor::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Transparent
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::int|SOAP::WSDL::XSD::Typelib::Builtin::int>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm
new file mode 100644
index 000000000..f39a8d84c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptions.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::OSDColorOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Color_of :ATTR(:get<Color>);
+my %Transparent_of :ATTR(:get<Transparent>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Color
+        Transparent
+        Extension
+
+    ) ],
+    {
+        'Color' => \%Color_of,
+        'Transparent' => \%Transparent_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Color' => 'ONVIF::Analytics::Types::ColorOptions',
+        'Transparent' => 'ONVIF::Analytics::Types::IntRange',
+        'Extension' => 'ONVIF::Analytics::Types::OSDColorOptionsExtension',
+    },
+    {
+
+        'Color' => 'Color',
+        'Transparent' => 'Transparent',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDColorOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDColorOptions from the namespace http://www.onvif.org/ver10/schema.
+
+Describe the option of the color and its transparency.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Color
+
+
+=item * Transparent
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDColorOptions
+   Color =>    { # ONVIF::Analytics::Types::ColorOptions
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     ColorList => ,
+     ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+       X =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Y =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Z =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       Colorspace =>  $some_value, # anyURI
+     },
+   },
+   Transparent =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm
new file mode 100644
index 000000000..5258befce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDColorOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDColorOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDColorOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDColorOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm
new file mode 100644
index 000000000..ed260ef01
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfiguration.pm
@@ -0,0 +1,175 @@
+package ONVIF::Analytics::Types::OSDConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %VideoSourceConfigurationToken_of :ATTR(:get<VideoSourceConfigurationToken>);
+my %Type_of :ATTR(:get<Type>);
+my %Position_of :ATTR(:get<Position>);
+my %TextString_of :ATTR(:get<TextString>);
+my %Image_of :ATTR(:get<Image>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        VideoSourceConfigurationToken
+        Type
+        Position
+        TextString
+        Image
+        Extension
+
+    ) ],
+    {
+        'VideoSourceConfigurationToken' => \%VideoSourceConfigurationToken_of,
+        'Type' => \%Type_of,
+        'Position' => \%Position_of,
+        'TextString' => \%TextString_of,
+        'Image' => \%Image_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'VideoSourceConfigurationToken' => 'ONVIF::Analytics::Types::OSDReference',
+        'Type' => 'ONVIF::Analytics::Types::OSDType',
+        'Position' => 'ONVIF::Analytics::Types::OSDPosConfiguration',
+        'TextString' => 'ONVIF::Analytics::Types::OSDTextConfiguration',
+        'Image' => 'ONVIF::Analytics::Types::OSDImgConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::OSDConfigurationExtension',
+    },
+    {
+
+        'VideoSourceConfigurationToken' => 'VideoSourceConfigurationToken',
+        'Type' => 'Type',
+        'Position' => 'Position',
+        'TextString' => 'TextString',
+        'Image' => 'Image',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * VideoSourceConfigurationToken
+
+
+=item * Type
+
+
+=item * Position
+
+
+=item * TextString
+
+
+=item * Image
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfiguration
+   VideoSourceConfigurationToken =>  { value => $some_value },
+   Type => $some_value, # OSDType
+   Position =>  { # ONVIF::Analytics::Types::OSDPosConfiguration
+     Type =>  $some_value, # string
+     Pos => ,
+     Extension =>  { # ONVIF::Analytics::Types::OSDPosConfigurationExtension
+     },
+   },
+   TextString =>  { # ONVIF::Analytics::Types::OSDTextConfiguration
+     Type =>  $some_value, # string
+     DateFormat =>  $some_value, # string
+     TimeFormat =>  $some_value, # string
+     FontSize =>  $some_value, # int
+     FontColor =>  { # ONVIF::Analytics::Types::OSDColor
+       Color => ,
+     },
+     BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColor
+       Color => ,
+     },
+     PlainText =>  $some_value, # string
+     Extension =>  { # ONVIF::Analytics::Types::OSDTextConfigurationExtension
+     },
+   },
+   Image =>  { # ONVIF::Analytics::Types::OSDImgConfiguration
+     ImgPath =>  $some_value, # anyURI
+     Extension =>  { # ONVIF::Analytics::Types::OSDImgConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm
new file mode 100644
index 000000000..6bad82ef8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm
new file mode 100644
index 000000000..105d52097
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptions.pm
@@ -0,0 +1,219 @@
+package ONVIF::Analytics::Types::OSDConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumberOfOSDs_of :ATTR(:get<MaximumNumberOfOSDs>);
+my %Type_of :ATTR(:get<Type>);
+my %PositionOption_of :ATTR(:get<PositionOption>);
+my %TextOption_of :ATTR(:get<TextOption>);
+my %ImageOption_of :ATTR(:get<ImageOption>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumberOfOSDs
+        Type
+        PositionOption
+        TextOption
+        ImageOption
+        Extension
+
+    ) ],
+    {
+        'MaximumNumberOfOSDs' => \%MaximumNumberOfOSDs_of,
+        'Type' => \%Type_of,
+        'PositionOption' => \%PositionOption_of,
+        'TextOption' => \%TextOption_of,
+        'ImageOption' => \%ImageOption_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MaximumNumberOfOSDs' => 'ONVIF::Analytics::Types::MaximumNumberOfOSDs',
+        'Type' => 'ONVIF::Analytics::Types::OSDType',
+        'PositionOption' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'TextOption' => 'ONVIF::Analytics::Types::OSDTextOptions',
+        'ImageOption' => 'ONVIF::Analytics::Types::OSDImgOptions',
+        'Extension' => 'ONVIF::Analytics::Types::OSDConfigurationOptionsExtension',
+    },
+    {
+
+        'MaximumNumberOfOSDs' => 'MaximumNumberOfOSDs',
+        'Type' => 'Type',
+        'PositionOption' => 'PositionOption',
+        'TextOption' => 'TextOption',
+        'ImageOption' => 'ImageOption',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumberOfOSDs
+
+
+=item * Type
+
+
+=item * PositionOption
+
+
+=item * TextOption
+
+
+=item * ImageOption
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfigurationOptions
+   MaximumNumberOfOSDs => ,
+   Type => $some_value, # OSDType
+   PositionOption =>  $some_value, # string
+   TextOption =>  { # ONVIF::Analytics::Types::OSDTextOptions
+     Type =>  $some_value, # string
+     FontSizeRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     DateFormat =>  $some_value, # string
+     TimeFormat =>  $some_value, # string
+     FontColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+       Color =>        { # ONVIF::Analytics::Types::ColorOptions
+         # One of the following elements.
+         # No occurance checks yet, so be sure to pass just one...
+         ColorList => ,
+         ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+           X =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Y =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Z =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Colorspace =>  $some_value, # anyURI
+         },
+       },
+       Transparent =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+       },
+     },
+     BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+       Color =>        { # ONVIF::Analytics::Types::ColorOptions
+         # One of the following elements.
+         # No occurance checks yet, so be sure to pass just one...
+         ColorList => ,
+         ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+           X =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Y =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Z =>  { # ONVIF::Analytics::Types::FloatRange
+             Min =>  $some_value, # float
+             Max =>  $some_value, # float
+           },
+           Colorspace =>  $some_value, # anyURI
+         },
+       },
+       Transparent =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::OSDTextOptionsExtension
+     },
+   },
+   ImageOption =>  { # ONVIF::Analytics::Types::OSDImgOptions
+     ImagePath =>  $some_value, # anyURI
+     Extension =>  { # ONVIF::Analytics::Types::OSDImgOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDConfigurationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..93dd125dc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDConfigurationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDConfigurationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm
new file mode 100644
index 000000000..8d1c4dc35
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfiguration.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::OSDImgConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImgPath_of :ATTR(:get<ImgPath>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImgPath
+        Extension
+
+    ) ],
+    {
+        'ImgPath' => \%ImgPath_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImgPath' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Extension' => 'ONVIF::Analytics::Types::OSDImgConfigurationExtension',
+    },
+    {
+
+        'ImgPath' => 'ImgPath',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImgPath
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgConfiguration
+   ImgPath =>  $some_value, # anyURI
+   Extension =>  { # ONVIF::Analytics::Types::OSDImgConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm
new file mode 100644
index 000000000..9a790ef00
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDImgConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm
new file mode 100644
index 000000000..7c5503915
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::OSDImgOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ImagePath_of :ATTR(:get<ImagePath>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        ImagePath
+        Extension
+
+    ) ],
+    {
+        'ImagePath' => \%ImagePath_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'ImagePath' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Extension' => 'ONVIF::Analytics::Types::OSDImgOptionsExtension',
+    },
+    {
+
+        'ImagePath' => 'ImagePath',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ImagePath
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgOptions
+   ImagePath =>  $some_value, # anyURI
+   Extension =>  { # ONVIF::Analytics::Types::OSDImgOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm
new file mode 100644
index 000000000..789954585
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDImgOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDImgOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDImgOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDImgOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDImgOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm
new file mode 100644
index 000000000..c8abf5160
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfiguration.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::OSDPosConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Pos_of :ATTR(:get<Pos>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Pos
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Pos' => \%Pos_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Pos' => 'ONVIF::Analytics::Types::Vector',
+        'Extension' => 'ONVIF::Analytics::Types::OSDPosConfigurationExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'Pos' => 'Pos',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDPosConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDPosConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Pos
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDPosConfiguration
+   Type =>  $some_value, # string
+   Pos => ,
+   Extension =>  { # ONVIF::Analytics::Types::OSDPosConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm
new file mode 100644
index 000000000..bc381246a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDPosConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDPosConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDPosConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDPosConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDPosConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm
new file mode 100644
index 000000000..de597bd4a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDReference.pm
@@ -0,0 +1,73 @@
+package ONVIF::Analytics::Types::OSDReference;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    ONVIF::Analytics::Types::ReferenceToken
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm
new file mode 100644
index 000000000..67042e77a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfiguration.pm
@@ -0,0 +1,171 @@
+package ONVIF::Analytics::Types::OSDTextConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %DateFormat_of :ATTR(:get<DateFormat>);
+my %TimeFormat_of :ATTR(:get<TimeFormat>);
+my %FontSize_of :ATTR(:get<FontSize>);
+my %FontColor_of :ATTR(:get<FontColor>);
+my %BackgroundColor_of :ATTR(:get<BackgroundColor>);
+my %PlainText_of :ATTR(:get<PlainText>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        DateFormat
+        TimeFormat
+        FontSize
+        FontColor
+        BackgroundColor
+        PlainText
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'DateFormat' => \%DateFormat_of,
+        'TimeFormat' => \%TimeFormat_of,
+        'FontSize' => \%FontSize_of,
+        'FontColor' => \%FontColor_of,
+        'BackgroundColor' => \%BackgroundColor_of,
+        'PlainText' => \%PlainText_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'DateFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'TimeFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'FontSize' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'FontColor' => 'ONVIF::Analytics::Types::OSDColor',
+        'BackgroundColor' => 'ONVIF::Analytics::Types::OSDColor',
+        'PlainText' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Extension' => 'ONVIF::Analytics::Types::OSDTextConfigurationExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'DateFormat' => 'DateFormat',
+        'TimeFormat' => 'TimeFormat',
+        'FontSize' => 'FontSize',
+        'FontColor' => 'FontColor',
+        'BackgroundColor' => 'BackgroundColor',
+        'PlainText' => 'PlainText',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * DateFormat
+
+
+=item * TimeFormat
+
+
+=item * FontSize
+
+
+=item * FontColor
+
+
+=item * BackgroundColor
+
+
+=item * PlainText
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextConfiguration
+   Type =>  $some_value, # string
+   DateFormat =>  $some_value, # string
+   TimeFormat =>  $some_value, # string
+   FontSize =>  $some_value, # int
+   FontColor =>  { # ONVIF::Analytics::Types::OSDColor
+     Color => ,
+   },
+   BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColor
+     Color => ,
+   },
+   PlainText =>  $some_value, # string
+   Extension =>  { # ONVIF::Analytics::Types::OSDTextConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm
new file mode 100644
index 000000000..060d4e4b7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDTextConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm
new file mode 100644
index 000000000..533602ffe
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptions.pm
@@ -0,0 +1,215 @@
+package ONVIF::Analytics::Types::OSDTextOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %FontSizeRange_of :ATTR(:get<FontSizeRange>);
+my %DateFormat_of :ATTR(:get<DateFormat>);
+my %TimeFormat_of :ATTR(:get<TimeFormat>);
+my %FontColor_of :ATTR(:get<FontColor>);
+my %BackgroundColor_of :ATTR(:get<BackgroundColor>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        FontSizeRange
+        DateFormat
+        TimeFormat
+        FontColor
+        BackgroundColor
+        Extension
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'FontSizeRange' => \%FontSizeRange_of,
+        'DateFormat' => \%DateFormat_of,
+        'TimeFormat' => \%TimeFormat_of,
+        'FontColor' => \%FontColor_of,
+        'BackgroundColor' => \%BackgroundColor_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'FontSizeRange' => 'ONVIF::Analytics::Types::IntRange',
+        'DateFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'TimeFormat' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'FontColor' => 'ONVIF::Analytics::Types::OSDColorOptions',
+        'BackgroundColor' => 'ONVIF::Analytics::Types::OSDColorOptions',
+        'Extension' => 'ONVIF::Analytics::Types::OSDTextOptionsExtension',
+    },
+    {
+
+        'Type' => 'Type',
+        'FontSizeRange' => 'FontSizeRange',
+        'DateFormat' => 'DateFormat',
+        'TimeFormat' => 'TimeFormat',
+        'FontColor' => 'FontColor',
+        'BackgroundColor' => 'BackgroundColor',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * FontSizeRange
+
+
+=item * DateFormat
+
+
+=item * TimeFormat
+
+
+=item * FontColor
+
+
+=item * BackgroundColor
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextOptions
+   Type =>  $some_value, # string
+   FontSizeRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   DateFormat =>  $some_value, # string
+   TimeFormat =>  $some_value, # string
+   FontColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+     Color =>      { # ONVIF::Analytics::Types::ColorOptions
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       ColorList => ,
+       ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+         X =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Y =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Z =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Colorspace =>  $some_value, # anyURI
+       },
+     },
+     Transparent =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+     },
+   },
+   BackgroundColor =>  { # ONVIF::Analytics::Types::OSDColorOptions
+     Color =>      { # ONVIF::Analytics::Types::ColorOptions
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       ColorList => ,
+       ColorspaceRange =>  { # ONVIF::Analytics::Types::ColorspaceRange
+         X =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Y =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Z =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         Colorspace =>  $some_value, # anyURI
+       },
+     },
+     Transparent =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::OSDColorOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::OSDTextOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm
new file mode 100644
index 000000000..875943f5b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDTextOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::OSDTextOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OSDTextOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OSDTextOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OSDTextOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm
new file mode 100644
index 000000000..e1d8bfe71
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OSDType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::OSDType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+OSDType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm
new file mode 100644
index 000000000..7c5925644
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Object.pm
@@ -0,0 +1,173 @@
+package ONVIF::Analytics::Types::Object;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ObjectId);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Appearance_of :ATTR(:get<Appearance>);
+my %Behaviour_of :ATTR(:get<Behaviour>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Appearance
+        Behaviour
+        Extension
+
+    ) ],
+    {
+        'Appearance' => \%Appearance_of,
+        'Behaviour' => \%Behaviour_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Appearance' => 'ONVIF::Analytics::Types::Appearance',
+        'Behaviour' => 'ONVIF::Analytics::Types::Behaviour',
+        'Extension' => 'ONVIF::Analytics::Types::ObjectExtension',
+    },
+    {
+
+        'Appearance' => 'Appearance',
+        'Behaviour' => 'Behaviour',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Object
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Object from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Appearance
+
+
+=item * Behaviour
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Object
+   Appearance =>  { # ONVIF::Analytics::Types::Appearance
+     Transformation =>  { # ONVIF::Analytics::Types::Transformation
+       Translate => ,
+       Scale => ,
+       Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+       },
+     },
+     Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+       BoundingBox => ,
+       CenterOfGravity => ,
+       Polygon =>  { # ONVIF::Analytics::Types::Polygon
+         Point => ,
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+       },
+     },
+     Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+       ColorCluster =>  {
+         Color => ,
+         Weight =>  $some_value, # float
+         Covariance => ,
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+       },
+     },
+     Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+       ClassCandidate =>  {
+         Type => $some_value, # ClassType
+         Likelihood =>  $some_value, # float
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+         OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+           Type =>  $some_value, # string
+           Likelihood =>  $some_value, # float
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+     },
+   },
+   Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+     Removed =>  {
+     },
+     Idle =>  {
+     },
+     Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm
new file mode 100644
index 000000000..7d8cb57fb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ObjectExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ObjectExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm
new file mode 100644
index 000000000..dcea2f434
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectId.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::ObjectId;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::ObjectId::_ObjectId::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::ObjectId::_ObjectId::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %ObjectId_of :ATTR(:get<ObjectId>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        ObjectId
+    ) ],
+    {
+
+        ObjectId => \%ObjectId_of,
+    },
+    {
+        ObjectId => 'SOAP::WSDL::XSD::Typelib::Builtin::integer',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectId
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectId from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::ObjectId::_ObjectId::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * ObjectId
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::integer|SOAP::WSDL::XSD::Typelib::Builtin::integer>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm
new file mode 100644
index 000000000..667a4090f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTree.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::ObjectTree;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rename_of :ATTR(:get<Rename>);
+my %Split_of :ATTR(:get<Split>);
+my %Merge_of :ATTR(:get<Merge>);
+my %Delete_of :ATTR(:get<Delete>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rename
+        Split
+        Merge
+        Delete
+        Extension
+
+    ) ],
+    {
+        'Rename' => \%Rename_of,
+        'Split' => \%Split_of,
+        'Merge' => \%Merge_of,
+        'Delete' => \%Delete_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rename' => 'ONVIF::Analytics::Types::Rename',
+        'Split' => 'ONVIF::Analytics::Types::Split',
+        'Merge' => 'ONVIF::Analytics::Types::Merge',
+        'Delete' => 'ONVIF::Analytics::Types::ObjectId',
+        'Extension' => 'ONVIF::Analytics::Types::ObjectTreeExtension',
+    },
+    {
+
+        'Rename' => 'Rename',
+        'Split' => 'Split',
+        'Merge' => 'Merge',
+        'Delete' => 'Delete',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectTree
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectTree from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rename
+
+
+=item * Split
+
+
+=item * Merge
+
+
+=item * Delete
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ObjectTree
+   Rename =>  { # ONVIF::Analytics::Types::Rename
+     from => ,
+     to => ,
+   },
+   Split =>  { # ONVIF::Analytics::Types::Split
+     from => ,
+     to => ,
+   },
+   Merge =>  { # ONVIF::Analytics::Types::Merge
+     from => ,
+     to => ,
+   },
+   Delete => ,
+   Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm
new file mode 100644
index 000000000..f573a8775
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ObjectTreeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ObjectTreeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ObjectTreeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ObjectTreeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ObjectTreeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm
new file mode 100644
index 000000000..508dc0f75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OnvifVersion.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::OnvifVersion;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Major_of :ATTR(:get<Major>);
+my %Minor_of :ATTR(:get<Minor>);
+
+__PACKAGE__->_factory(
+    [ qw(        Major
+        Minor
+
+    ) ],
+    {
+        'Major' => \%Major_of,
+        'Minor' => \%Minor_of,
+    },
+    {
+        'Major' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Minor' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Major' => 'Major',
+        'Minor' => 'Minor',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OnvifVersion
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OnvifVersion from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Major
+
+
+=item * Minor
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OnvifVersion
+   Major =>  $some_value, # int
+   Minor =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm
new file mode 100644
index 000000000..4d4132965
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/OtherType.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::OtherType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Likelihood_of :ATTR(:get<Likelihood>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Likelihood
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Likelihood' => \%Likelihood_of,
+    },
+    {
+        'Type' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Likelihood' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Type' => 'Type',
+        'Likelihood' => 'Likelihood',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::OtherType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+OtherType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Likelihood
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::OtherType
+   Type =>  $some_value, # string
+   Likelihood =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm
new file mode 100644
index 000000000..1a2b55efb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirection.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::PTControlDirection;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EFlip_of :ATTR(:get<EFlip>);
+my %Reverse_of :ATTR(:get<Reverse>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        EFlip
+        Reverse
+        Extension
+
+    ) ],
+    {
+        'EFlip' => \%EFlip_of,
+        'Reverse' => \%Reverse_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'EFlip' => 'ONVIF::Analytics::Types::EFlip',
+        'Reverse' => 'ONVIF::Analytics::Types::Reverse',
+        'Extension' => 'ONVIF::Analytics::Types::PTControlDirectionExtension',
+    },
+    {
+
+        'EFlip' => 'EFlip',
+        'Reverse' => 'Reverse',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirection
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirection from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EFlip
+
+
+=item * Reverse
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirection
+   EFlip =>  { # ONVIF::Analytics::Types::EFlip
+     Mode => $some_value, # EFlipMode
+   },
+   Reverse =>  { # ONVIF::Analytics::Types::Reverse
+     Mode => $some_value, # ReverseMode
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm
new file mode 100644
index 000000000..e0b3997cd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTControlDirectionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirectionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirectionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirectionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm
new file mode 100644
index 000000000..46f6ee5d3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptions.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::PTControlDirectionOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %EFlip_of :ATTR(:get<EFlip>);
+my %Reverse_of :ATTR(:get<Reverse>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        EFlip
+        Reverse
+        Extension
+
+    ) ],
+    {
+        'EFlip' => \%EFlip_of,
+        'Reverse' => \%Reverse_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'EFlip' => 'ONVIF::Analytics::Types::EFlipOptions',
+        'Reverse' => 'ONVIF::Analytics::Types::ReverseOptions',
+        'Extension' => 'ONVIF::Analytics::Types::PTControlDirectionOptionsExtension',
+    },
+    {
+
+        'EFlip' => 'EFlip',
+        'Reverse' => 'Reverse',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirectionOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirectionOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * EFlip
+
+
+=item * Reverse
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirectionOptions
+   EFlip =>  { # ONVIF::Analytics::Types::EFlipOptions
+     Mode => $some_value, # EFlipMode
+     Extension =>  { # ONVIF::Analytics::Types::EFlipOptionsExtension
+     },
+   },
+   Reverse =>  { # ONVIF::Analytics::Types::ReverseOptions
+     Mode => $some_value, # ReverseMode
+     Extension =>  { # ONVIF::Analytics::Types::ReverseOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm
new file mode 100644
index 000000000..73abb64e0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTControlDirectionOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTControlDirectionOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTControlDirectionOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm
new file mode 100644
index 000000000..c425c9d39
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::PTZCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZCapabilities
+   XAddr =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm
new file mode 100644
index 000000000..1e4198863
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfiguration.pm
@@ -0,0 +1,251 @@
+package ONVIF::Analytics::Types::PTZConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %NodeToken_of :ATTR(:get<NodeToken>);
+my %DefaultAbsolutePantTiltPositionSpace_of :ATTR(:get<DefaultAbsolutePantTiltPositionSpace>);
+my %DefaultAbsoluteZoomPositionSpace_of :ATTR(:get<DefaultAbsoluteZoomPositionSpace>);
+my %DefaultRelativePanTiltTranslationSpace_of :ATTR(:get<DefaultRelativePanTiltTranslationSpace>);
+my %DefaultRelativeZoomTranslationSpace_of :ATTR(:get<DefaultRelativeZoomTranslationSpace>);
+my %DefaultContinuousPanTiltVelocitySpace_of :ATTR(:get<DefaultContinuousPanTiltVelocitySpace>);
+my %DefaultContinuousZoomVelocitySpace_of :ATTR(:get<DefaultContinuousZoomVelocitySpace>);
+my %DefaultPTZSpeed_of :ATTR(:get<DefaultPTZSpeed>);
+my %DefaultPTZTimeout_of :ATTR(:get<DefaultPTZTimeout>);
+my %PanTiltLimits_of :ATTR(:get<PanTiltLimits>);
+my %ZoomLimits_of :ATTR(:get<ZoomLimits>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        NodeToken
+        DefaultAbsolutePantTiltPositionSpace
+        DefaultAbsoluteZoomPositionSpace
+        DefaultRelativePanTiltTranslationSpace
+        DefaultRelativeZoomTranslationSpace
+        DefaultContinuousPanTiltVelocitySpace
+        DefaultContinuousZoomVelocitySpace
+        DefaultPTZSpeed
+        DefaultPTZTimeout
+        PanTiltLimits
+        ZoomLimits
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'NodeToken' => \%NodeToken_of,
+        'DefaultAbsolutePantTiltPositionSpace' => \%DefaultAbsolutePantTiltPositionSpace_of,
+        'DefaultAbsoluteZoomPositionSpace' => \%DefaultAbsoluteZoomPositionSpace_of,
+        'DefaultRelativePanTiltTranslationSpace' => \%DefaultRelativePanTiltTranslationSpace_of,
+        'DefaultRelativeZoomTranslationSpace' => \%DefaultRelativeZoomTranslationSpace_of,
+        'DefaultContinuousPanTiltVelocitySpace' => \%DefaultContinuousPanTiltVelocitySpace_of,
+        'DefaultContinuousZoomVelocitySpace' => \%DefaultContinuousZoomVelocitySpace_of,
+        'DefaultPTZSpeed' => \%DefaultPTZSpeed_of,
+        'DefaultPTZTimeout' => \%DefaultPTZTimeout_of,
+        'PanTiltLimits' => \%PanTiltLimits_of,
+        'ZoomLimits' => \%ZoomLimits_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'NodeToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'DefaultAbsolutePantTiltPositionSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultAbsoluteZoomPositionSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultRelativePanTiltTranslationSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultRelativeZoomTranslationSpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultContinuousPanTiltVelocitySpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultContinuousZoomVelocitySpace' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'DefaultPTZSpeed' => 'ONVIF::Analytics::Types::PTZSpeed',
+        'DefaultPTZTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'PanTiltLimits' => 'ONVIF::Analytics::Types::PanTiltLimits',
+        'ZoomLimits' => 'ONVIF::Analytics::Types::ZoomLimits',
+        'Extension' => 'ONVIF::Analytics::Types::PTZConfigurationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'NodeToken' => 'NodeToken',
+        'DefaultAbsolutePantTiltPositionSpace' => 'DefaultAbsolutePantTiltPositionSpace',
+        'DefaultAbsoluteZoomPositionSpace' => 'DefaultAbsoluteZoomPositionSpace',
+        'DefaultRelativePanTiltTranslationSpace' => 'DefaultRelativePanTiltTranslationSpace',
+        'DefaultRelativeZoomTranslationSpace' => 'DefaultRelativeZoomTranslationSpace',
+        'DefaultContinuousPanTiltVelocitySpace' => 'DefaultContinuousPanTiltVelocitySpace',
+        'DefaultContinuousZoomVelocitySpace' => 'DefaultContinuousZoomVelocitySpace',
+        'DefaultPTZSpeed' => 'DefaultPTZSpeed',
+        'DefaultPTZTimeout' => 'DefaultPTZTimeout',
+        'PanTiltLimits' => 'PanTiltLimits',
+        'ZoomLimits' => 'ZoomLimits',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * NodeToken
+
+
+=item * DefaultAbsolutePantTiltPositionSpace
+
+
+=item * DefaultAbsoluteZoomPositionSpace
+
+
+=item * DefaultRelativePanTiltTranslationSpace
+
+
+=item * DefaultRelativeZoomTranslationSpace
+
+
+=item * DefaultContinuousPanTiltVelocitySpace
+
+
+=item * DefaultContinuousZoomVelocitySpace
+
+
+=item * DefaultPTZSpeed
+
+
+=item * DefaultPTZTimeout
+
+
+=item * PanTiltLimits
+
+
+=item * ZoomLimits
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfiguration
+   NodeToken => $some_value, # ReferenceToken
+   DefaultAbsolutePantTiltPositionSpace =>  $some_value, # anyURI
+   DefaultAbsoluteZoomPositionSpace =>  $some_value, # anyURI
+   DefaultRelativePanTiltTranslationSpace =>  $some_value, # anyURI
+   DefaultRelativeZoomTranslationSpace =>  $some_value, # anyURI
+   DefaultContinuousPanTiltVelocitySpace =>  $some_value, # anyURI
+   DefaultContinuousZoomVelocitySpace =>  $some_value, # anyURI
+   DefaultPTZSpeed =>  { # ONVIF::Analytics::Types::PTZSpeed
+     PanTilt => ,
+     Zoom => ,
+   },
+   DefaultPTZTimeout =>  $some_value, # duration
+   PanTiltLimits =>  { # ONVIF::Analytics::Types::PanTiltLimits
+     Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   ZoomLimits =>  { # ONVIF::Analytics::Types::ZoomLimits
+     Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension
+     PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+       EFlip =>  { # ONVIF::Analytics::Types::EFlip
+         Mode => $some_value, # EFlipMode
+       },
+       Reverse =>  { # ONVIF::Analytics::Types::Reverse
+         Mode => $some_value, # ReverseMode
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm
new file mode 100644
index 000000000..6758f2267
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::PTZConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTControlDirection_of :ATTR(:get<PTControlDirection>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTControlDirection
+        Extension
+
+    ) ],
+    {
+        'PTControlDirection' => \%PTControlDirection_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PTControlDirection' => 'ONVIF::Analytics::Types::PTControlDirection',
+        'Extension' => 'ONVIF::Analytics::Types::PTZConfigurationExtension2',
+    },
+    {
+
+        'PTControlDirection' => 'PTControlDirection',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTControlDirection
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationExtension
+   PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+     EFlip =>  { # ONVIF::Analytics::Types::EFlip
+       Mode => $some_value, # EFlipMode
+     },
+     Reverse =>  { # ONVIF::Analytics::Types::Reverse
+       Mode => $some_value, # ReverseMode
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm
new file mode 100644
index 000000000..43dbc7870
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm
new file mode 100644
index 000000000..a9304fbee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions.pm
@@ -0,0 +1,218 @@
+package ONVIF::Analytics::Types::PTZConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Spaces_of :ATTR(:get<Spaces>);
+my %PTZTimeout_of :ATTR(:get<PTZTimeout>);
+my %PTControlDirection_of :ATTR(:get<PTControlDirection>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Spaces
+        PTZTimeout
+        PTControlDirection
+        Extension
+
+    ) ],
+    {
+        'Spaces' => \%Spaces_of,
+        'PTZTimeout' => \%PTZTimeout_of,
+        'PTControlDirection' => \%PTControlDirection_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Spaces' => 'ONVIF::Analytics::Types::PTZSpaces',
+        'PTZTimeout' => 'ONVIF::Analytics::Types::DurationRange',
+        'PTControlDirection' => 'ONVIF::Analytics::Types::PTControlDirectionOptions',
+        'Extension' => 'ONVIF::Analytics::Types::PTZConfigurationOptions2',
+    },
+    {
+
+        'Spaces' => 'Spaces',
+        'PTZTimeout' => 'PTZTimeout',
+        'PTControlDirection' => 'PTControlDirection',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Spaces
+
+
+=item * PTZTimeout
+
+
+=item * PTControlDirection
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationOptions
+   Spaces =>  { # ONVIF::Analytics::Types::PTZSpaces
+     AbsolutePanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     AbsoluteZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativePanTiltTranslationSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativeZoomTranslationSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousPanTiltVelocitySpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousZoomVelocitySpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     PanTiltSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ZoomSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZSpacesExtension
+     },
+   },
+   PTZTimeout =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+   PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirectionOptions
+     EFlip =>  { # ONVIF::Analytics::Types::EFlipOptions
+       Mode => $some_value, # EFlipMode
+       Extension =>  { # ONVIF::Analytics::Types::EFlipOptionsExtension
+       },
+     },
+     Reverse =>  { # ONVIF::Analytics::Types::ReverseOptions
+       Mode => $some_value, # ReverseMode
+       Extension =>  { # ONVIF::Analytics::Types::ReverseOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationOptions2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm
new file mode 100644
index 000000000..aa768d92f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZConfigurationOptions2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZConfigurationOptions2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZConfigurationOptions2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZConfigurationOptions2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZConfigurationOptions2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm
new file mode 100644
index 000000000..29a368678
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZFilter.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Status_of :ATTR(:get<Status>);
+my %Position_of :ATTR(:get<Position>);
+
+__PACKAGE__->_factory(
+    [ qw(        Status
+        Position
+
+    ) ],
+    {
+        'Status' => \%Status_of,
+        'Position' => \%Position_of,
+    },
+    {
+        'Status' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Position' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Status' => 'Status',
+        'Position' => 'Position',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Status
+
+
+=item * Position
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZFilter
+   Status =>  $some_value, # boolean
+   Position =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm
new file mode 100644
index 000000000..3b545bdcf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZMoveStatus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZMoveStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTilt_of :ATTR(:get<PanTilt>);
+my %Zoom_of :ATTR(:get<Zoom>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTilt
+        Zoom
+
+    ) ],
+    {
+        'PanTilt' => \%PanTilt_of,
+        'Zoom' => \%Zoom_of,
+    },
+    {
+        'PanTilt' => 'ONVIF::Analytics::Types::MoveStatus',
+        'Zoom' => 'ONVIF::Analytics::Types::MoveStatus',
+    },
+    {
+
+        'PanTilt' => 'PanTilt',
+        'Zoom' => 'Zoom',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZMoveStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZMoveStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTilt
+
+
+=item * Zoom
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZMoveStatus
+   PanTilt => $some_value, # MoveStatus
+   Zoom => $some_value, # MoveStatus
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm
new file mode 100644
index 000000000..6facb5026
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNode.pm
@@ -0,0 +1,278 @@
+package ONVIF::Analytics::Types::PTZNode;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::PTZNode::_PTZNode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %SupportedPTZSpaces_of :ATTR(:get<SupportedPTZSpaces>);
+my %MaximumNumberOfPresets_of :ATTR(:get<MaximumNumberOfPresets>);
+my %HomeSupported_of :ATTR(:get<HomeSupported>);
+my %AuxiliaryCommands_of :ATTR(:get<AuxiliaryCommands>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        SupportedPTZSpaces
+        MaximumNumberOfPresets
+        HomeSupported
+        AuxiliaryCommands
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'SupportedPTZSpaces' => \%SupportedPTZSpaces_of,
+        'MaximumNumberOfPresets' => \%MaximumNumberOfPresets_of,
+        'HomeSupported' => \%HomeSupported_of,
+        'AuxiliaryCommands' => \%AuxiliaryCommands_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'SupportedPTZSpaces' => 'ONVIF::Analytics::Types::PTZSpaces',
+        'MaximumNumberOfPresets' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'HomeSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AuxiliaryCommands' => 'ONVIF::Analytics::Types::AuxiliaryData',
+        'Extension' => 'ONVIF::Analytics::Types::PTZNodeExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'SupportedPTZSpaces' => 'SupportedPTZSpaces',
+        'MaximumNumberOfPresets' => 'MaximumNumberOfPresets',
+        'HomeSupported' => 'HomeSupported',
+        'AuxiliaryCommands' => 'AuxiliaryCommands',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::PTZNode::_PTZNode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %FixedHomePosition_of :ATTR(:get<FixedHomePosition>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        FixedHomePosition
+    ) ],
+    {
+
+        FixedHomePosition => \%FixedHomePosition_of,
+    },
+    {
+        FixedHomePosition => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZNode
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZNode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * SupportedPTZSpaces
+
+
+=item * MaximumNumberOfPresets
+
+
+=item * HomeSupported
+
+
+=item * AuxiliaryCommands
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZNode
+   Name => $some_value, # Name
+   SupportedPTZSpaces =>  { # ONVIF::Analytics::Types::PTZSpaces
+     AbsolutePanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     AbsoluteZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativePanTiltTranslationSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     RelativeZoomTranslationSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousPanTiltVelocitySpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ContinuousZoomVelocitySpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     PanTiltSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ZoomSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZSpacesExtension
+     },
+   },
+   MaximumNumberOfPresets =>  $some_value, # int
+   HomeSupported =>  $some_value, # boolean
+   AuxiliaryCommands => $some_value, # AuxiliaryData
+   Extension =>  { # ONVIF::Analytics::Types::PTZNodeExtension
+     SupportedPresetTour =>  { # ONVIF::Analytics::Types::PTZPresetTourSupported
+       MaximumNumberOfPresetTours =>  $some_value, # int
+       PTZPresetTourOperation => $some_value, # PTZPresetTourOperation
+       Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZNodeExtension2
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::PTZNode::_PTZNode::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * FixedHomePosition
+
+ Indication whether the HomePosition of a Node is fixed or it can be changed via the SetHomePosition command. 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm
new file mode 100644
index 000000000..adc8820a4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::PTZNodeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SupportedPresetTour_of :ATTR(:get<SupportedPresetTour>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SupportedPresetTour
+        Extension
+
+    ) ],
+    {
+        'SupportedPresetTour' => \%SupportedPresetTour_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'SupportedPresetTour' => 'ONVIF::Analytics::Types::PTZPresetTourSupported',
+        'Extension' => 'ONVIF::Analytics::Types::PTZNodeExtension2',
+    },
+    {
+
+        'SupportedPresetTour' => 'SupportedPresetTour',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZNodeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZNodeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SupportedPresetTour
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZNodeExtension
+   SupportedPresetTour =>  { # ONVIF::Analytics::Types::PTZPresetTourSupported
+     MaximumNumberOfPresetTours =>  $some_value, # int
+     PTZPresetTourOperation => $some_value, # PTZPresetTourOperation
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZNodeExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm
new file mode 100644
index 000000000..61ebb3156
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZNodeExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZNodeExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZNodeExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZNodeExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZNodeExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm
new file mode 100644
index 000000000..ed1e087f7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPositionFilter.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::PTZPositionFilter;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MinPosition_of :ATTR(:get<MinPosition>);
+my %MaxPosition_of :ATTR(:get<MaxPosition>);
+my %EnterOrExit_of :ATTR(:get<EnterOrExit>);
+
+__PACKAGE__->_factory(
+    [ qw(        MinPosition
+        MaxPosition
+        EnterOrExit
+
+    ) ],
+    {
+        'MinPosition' => \%MinPosition_of,
+        'MaxPosition' => \%MaxPosition_of,
+        'EnterOrExit' => \%EnterOrExit_of,
+    },
+    {
+        'MinPosition' => 'ONVIF::Analytics::Types::PTZVector',
+        'MaxPosition' => 'ONVIF::Analytics::Types::PTZVector',
+        'EnterOrExit' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'MinPosition' => 'MinPosition',
+        'MaxPosition' => 'MaxPosition',
+        'EnterOrExit' => 'EnterOrExit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPositionFilter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPositionFilter from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MinPosition
+
+
+=item * MaxPosition
+
+
+=item * EnterOrExit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPositionFilter
+   MinPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   MaxPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   EnterOrExit =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm
new file mode 100644
index 000000000..a0f3b3eab
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPreset.pm
@@ -0,0 +1,162 @@
+package ONVIF::Analytics::Types::PTZPreset;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::PTZPreset::_PTZPreset::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %PTZPosition_of :ATTR(:get<PTZPosition>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        PTZPosition
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'PTZPosition' => \%PTZPosition_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'PTZPosition' => 'ONVIF::Analytics::Types::PTZVector',
+    },
+    {
+
+        'Name' => 'Name',
+        'PTZPosition' => 'PTZPosition',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::PTZPreset::_PTZPreset::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPreset
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPreset from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * PTZPosition
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPreset
+   Name => $some_value, # Name
+   PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::PTZPreset::_PTZPreset::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+  
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm
new file mode 100644
index 000000000..8740b6cf4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourDirection.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PTZPresetTourDirection;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PTZPresetTourDirection from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm
new file mode 100644
index 000000000..ce0ac2a20
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm
new file mode 100644
index 000000000..009b6bdcd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOperation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PTZPresetTourOperation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PTZPresetTourOperation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm
new file mode 100644
index 000000000..e9f13635e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourOptions.pm
@@ -0,0 +1,162 @@
+package ONVIF::Analytics::Types::PTZPresetTourOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AutoStart_of :ATTR(:get<AutoStart>);
+my %StartingCondition_of :ATTR(:get<StartingCondition>);
+my %TourSpot_of :ATTR(:get<TourSpot>);
+
+__PACKAGE__->_factory(
+    [ qw(        AutoStart
+        StartingCondition
+        TourSpot
+
+    ) ],
+    {
+        'AutoStart' => \%AutoStart_of,
+        'StartingCondition' => \%StartingCondition_of,
+        'TourSpot' => \%TourSpot_of,
+    },
+    {
+        'AutoStart' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'StartingCondition' => 'ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions',
+        'TourSpot' => 'ONVIF::Analytics::Types::PTZPresetTourSpotOptions',
+    },
+    {
+
+        'AutoStart' => 'AutoStart',
+        'StartingCondition' => 'StartingCondition',
+        'TourSpot' => 'TourSpot',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AutoStart
+
+
+=item * StartingCondition
+
+
+=item * TourSpot
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourOptions
+   AutoStart =>  $some_value, # boolean
+   StartingCondition =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions
+     RecurringTime =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     RecurringDuration =>  { # ONVIF::Analytics::Types::DurationRange
+       Min =>  $some_value, # duration
+       Max =>  $some_value, # duration
+     },
+     Direction => $some_value, # PTZPresetTourDirection
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+     },
+   },
+   TourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotOptions
+     PresetDetail =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+       PresetToken => $some_value, # ReferenceToken
+       Home =>  $some_value, # boolean
+       PanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         YRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+       ZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+       },
+     },
+     StayTime =>  { # ONVIF::Analytics::Types::DurationRange
+       Min =>  $some_value, # duration
+       Max =>  $some_value, # duration
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm
new file mode 100644
index 000000000..f8e0c4128
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetail.pm
@@ -0,0 +1,136 @@
+package ONVIF::Analytics::Types::PTZPresetTourPresetDetail;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetToken_of :ATTR(:get<PresetToken>);
+my %Home_of :ATTR(:get<Home>);
+my %PTZPosition_of :ATTR(:get<PTZPosition>);
+my %TypeExtension_of :ATTR(:get<TypeExtension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetToken
+        Home
+        PTZPosition
+        TypeExtension
+
+    ) ],
+    {
+        'PresetToken' => \%PresetToken_of,
+        'Home' => \%Home_of,
+        'PTZPosition' => \%PTZPosition_of,
+        'TypeExtension' => \%TypeExtension_of,
+    },
+    {
+        'PresetToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Home' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'PTZPosition' => 'ONVIF::Analytics::Types::PTZVector',
+        'TypeExtension' => 'ONVIF::Analytics::Types::PTZPresetTourTypeExtension',
+    },
+    {
+
+        'PresetToken' => 'PresetToken',
+        'Home' => 'Home',
+        'PTZPosition' => 'PTZPosition',
+        'TypeExtension' => 'TypeExtension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourPresetDetail from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetToken
+
+
+=item * Home
+
+
+=item * PTZPosition
+
+
+=item * TypeExtension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   PresetToken => $some_value, # ReferenceToken
+   Home =>  $some_value, # boolean
+   PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm
new file mode 100644
index 000000000..6d8bbefdd
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptions.pm
@@ -0,0 +1,156 @@
+package ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetToken_of :ATTR(:get<PresetToken>);
+my %Home_of :ATTR(:get<Home>);
+my %PanTiltPositionSpace_of :ATTR(:get<PanTiltPositionSpace>);
+my %ZoomPositionSpace_of :ATTR(:get<ZoomPositionSpace>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetToken
+        Home
+        PanTiltPositionSpace
+        ZoomPositionSpace
+        Extension
+
+    ) ],
+    {
+        'PresetToken' => \%PresetToken_of,
+        'Home' => \%Home_of,
+        'PanTiltPositionSpace' => \%PanTiltPositionSpace_of,
+        'ZoomPositionSpace' => \%ZoomPositionSpace_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PresetToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Home' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'PanTiltPositionSpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'ZoomPositionSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension',
+    },
+    {
+
+        'PresetToken' => 'PresetToken',
+        'Home' => 'Home',
+        'PanTiltPositionSpace' => 'PanTiltPositionSpace',
+        'ZoomPositionSpace' => 'ZoomPositionSpace',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourPresetDetailOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetToken
+
+
+=item * Home
+
+
+=item * PanTiltPositionSpace
+
+
+=item * ZoomPositionSpace
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+   PresetToken => $some_value, # ReferenceToken
+   Home =>  $some_value, # boolean
+   PanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm
new file mode 100644
index 000000000..599d19346
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourPresetDetailOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourPresetDetailOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm
new file mode 100644
index 000000000..d7cdb6d61
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpot.pm
@@ -0,0 +1,145 @@
+package ONVIF::Analytics::Types::PTZPresetTourSpot;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetDetail_of :ATTR(:get<PresetDetail>);
+my %Speed_of :ATTR(:get<Speed>);
+my %StayTime_of :ATTR(:get<StayTime>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetDetail
+        Speed
+        StayTime
+        Extension
+
+    ) ],
+    {
+        'PresetDetail' => \%PresetDetail_of,
+        'Speed' => \%Speed_of,
+        'StayTime' => \%StayTime_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PresetDetail' => 'ONVIF::Analytics::Types::PTZPresetTourPresetDetail',
+        'Speed' => 'ONVIF::Analytics::Types::PTZSpeed',
+        'StayTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourSpotExtension',
+    },
+    {
+
+        'PresetDetail' => 'PresetDetail',
+        'Speed' => 'Speed',
+        'StayTime' => 'StayTime',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSpot
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSpot from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetDetail
+
+
+=item * Speed
+
+
+=item * StayTime
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSpot
+   PresetDetail =>    { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+     # One of the following elements.
+     # No occurance checks yet, so be sure to pass just one...
+     PresetToken => $some_value, # ReferenceToken
+     Home =>  $some_value, # boolean
+     PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+     TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+     },
+   },
+   Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+     PanTilt => ,
+     Zoom => ,
+   },
+   StayTime =>  $some_value, # duration
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm
new file mode 100644
index 000000000..b9481d85c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourSpotExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSpotExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm
new file mode 100644
index 000000000..b3749ff54
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSpotOptions.pm
@@ -0,0 +1,138 @@
+package ONVIF::Analytics::Types::PTZPresetTourSpotOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PresetDetail_of :ATTR(:get<PresetDetail>);
+my %StayTime_of :ATTR(:get<StayTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        PresetDetail
+        StayTime
+
+    ) ],
+    {
+        'PresetDetail' => \%PresetDetail_of,
+        'StayTime' => \%StayTime_of,
+    },
+    {
+        'PresetDetail' => 'ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions',
+        'StayTime' => 'ONVIF::Analytics::Types::DurationRange',
+    },
+    {
+
+        'PresetDetail' => 'PresetDetail',
+        'StayTime' => 'StayTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSpotOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSpotOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PresetDetail
+
+
+=item * StayTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSpotOptions
+   PresetDetail =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptions
+     PresetToken => $some_value, # ReferenceToken
+     Home =>  $some_value, # boolean
+     PanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+       YRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     ZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+       URI =>  $some_value, # anyURI
+       XRange =>  { # ONVIF::Analytics::Types::FloatRange
+         Min =>  $some_value, # float
+         Max =>  $some_value, # float
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourPresetDetailOptionsExtension
+     },
+   },
+   StayTime =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm
new file mode 100644
index 000000000..d9a5d928d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingCondition.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingCondition;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecurringTime_of :ATTR(:get<RecurringTime>);
+my %RecurringDuration_of :ATTR(:get<RecurringDuration>);
+my %Direction_of :ATTR(:get<Direction>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecurringTime
+        RecurringDuration
+        Direction
+        Extension
+
+    ) ],
+    {
+        'RecurringTime' => \%RecurringTime_of,
+        'RecurringDuration' => \%RecurringDuration_of,
+        'Direction' => \%Direction_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecurringTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RecurringDuration' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'Direction' => 'ONVIF::Analytics::Types::PTZPresetTourDirection',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension',
+    },
+    {
+
+        'RecurringTime' => 'RecurringTime',
+        'RecurringDuration' => 'RecurringDuration',
+        'Direction' => 'Direction',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingCondition
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingCondition from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecurringTime
+
+
+=item * RecurringDuration
+
+
+=item * Direction
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingCondition
+   RecurringTime =>  $some_value, # int
+   RecurringDuration =>  $some_value, # duration
+   Direction => $some_value, # PTZPresetTourDirection
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm
new file mode 100644
index 000000000..9d3896e27
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingConditionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm
new file mode 100644
index 000000000..ebd2c75c3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptions.pm
@@ -0,0 +1,137 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecurringTime_of :ATTR(:get<RecurringTime>);
+my %RecurringDuration_of :ATTR(:get<RecurringDuration>);
+my %Direction_of :ATTR(:get<Direction>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecurringTime
+        RecurringDuration
+        Direction
+        Extension
+
+    ) ],
+    {
+        'RecurringTime' => \%RecurringTime_of,
+        'RecurringDuration' => \%RecurringDuration_of,
+        'Direction' => \%Direction_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecurringTime' => 'ONVIF::Analytics::Types::IntRange',
+        'RecurringDuration' => 'ONVIF::Analytics::Types::DurationRange',
+        'Direction' => 'ONVIF::Analytics::Types::PTZPresetTourDirection',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension',
+    },
+    {
+
+        'RecurringTime' => 'RecurringTime',
+        'RecurringDuration' => 'RecurringDuration',
+        'Direction' => 'Direction',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingConditionOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecurringTime
+
+
+=item * RecurringDuration
+
+
+=item * Direction
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptions
+   RecurringTime =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   RecurringDuration =>  { # ONVIF::Analytics::Types::DurationRange
+     Min =>  $some_value, # duration
+     Max =>  $some_value, # duration
+   },
+   Direction => $some_value, # PTZPresetTourDirection
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm
new file mode 100644
index 000000000..26b76f243
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStartingConditionOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStartingConditionOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm
new file mode 100644
index 000000000..9d5117059
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PTZPresetTourState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PTZPresetTourState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm
new file mode 100644
index 000000000..2058e86f7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatus.pm
@@ -0,0 +1,142 @@
+package ONVIF::Analytics::Types::PTZPresetTourStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %State_of :ATTR(:get<State>);
+my %CurrentTourSpot_of :ATTR(:get<CurrentTourSpot>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        State
+        CurrentTourSpot
+        Extension
+
+    ) ],
+    {
+        'State' => \%State_of,
+        'CurrentTourSpot' => \%CurrentTourSpot_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'State' => 'ONVIF::Analytics::Types::PTZPresetTourState',
+        'CurrentTourSpot' => 'ONVIF::Analytics::Types::PTZPresetTourSpot',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourStatusExtension',
+    },
+    {
+
+        'State' => 'State',
+        'CurrentTourSpot' => 'CurrentTourSpot',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * State
+
+
+=item * CurrentTourSpot
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStatus
+   State => $some_value, # PTZPresetTourState
+   CurrentTourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpot
+     PresetDetail =>      { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       PresetToken => $some_value, # ReferenceToken
+       Home =>  $some_value, # boolean
+       PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+       },
+     },
+     Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+       PanTilt => ,
+       Zoom => ,
+     },
+     StayTime =>  $some_value, # duration
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm
new file mode 100644
index 000000000..8c390f236
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourStatusExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourStatusExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourStatusExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm
new file mode 100644
index 000000000..4245f4878
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupported.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::PTZPresetTourSupported;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumberOfPresetTours_of :ATTR(:get<MaximumNumberOfPresetTours>);
+my %PTZPresetTourOperation_of :ATTR(:get<PTZPresetTourOperation>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumberOfPresetTours
+        PTZPresetTourOperation
+        Extension
+
+    ) ],
+    {
+        'MaximumNumberOfPresetTours' => \%MaximumNumberOfPresetTours_of,
+        'PTZPresetTourOperation' => \%PTZPresetTourOperation_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'MaximumNumberOfPresetTours' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'PTZPresetTourOperation' => 'ONVIF::Analytics::Types::PTZPresetTourOperation',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourSupportedExtension',
+    },
+    {
+
+        'MaximumNumberOfPresetTours' => 'MaximumNumberOfPresetTours',
+        'PTZPresetTourOperation' => 'PTZPresetTourOperation',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSupported
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSupported from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumberOfPresetTours
+
+
+=item * PTZPresetTourOperation
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSupported
+   MaximumNumberOfPresetTours =>  $some_value, # int
+   PTZPresetTourOperation => $some_value, # PTZPresetTourOperation
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm
new file mode 100644
index 000000000..6456b9d09
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourSupportedExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourSupportedExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourSupportedExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourSupportedExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm
new file mode 100644
index 000000000..74247cbfc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZPresetTourTypeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZPresetTourTypeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZPresetTourTypeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm
new file mode 100644
index 000000000..ae25e0cc4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpaces.pm
@@ -0,0 +1,236 @@
+package ONVIF::Analytics::Types::PTZSpaces;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AbsolutePanTiltPositionSpace_of :ATTR(:get<AbsolutePanTiltPositionSpace>);
+my %AbsoluteZoomPositionSpace_of :ATTR(:get<AbsoluteZoomPositionSpace>);
+my %RelativePanTiltTranslationSpace_of :ATTR(:get<RelativePanTiltTranslationSpace>);
+my %RelativeZoomTranslationSpace_of :ATTR(:get<RelativeZoomTranslationSpace>);
+my %ContinuousPanTiltVelocitySpace_of :ATTR(:get<ContinuousPanTiltVelocitySpace>);
+my %ContinuousZoomVelocitySpace_of :ATTR(:get<ContinuousZoomVelocitySpace>);
+my %PanTiltSpeedSpace_of :ATTR(:get<PanTiltSpeedSpace>);
+my %ZoomSpeedSpace_of :ATTR(:get<ZoomSpeedSpace>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AbsolutePanTiltPositionSpace
+        AbsoluteZoomPositionSpace
+        RelativePanTiltTranslationSpace
+        RelativeZoomTranslationSpace
+        ContinuousPanTiltVelocitySpace
+        ContinuousZoomVelocitySpace
+        PanTiltSpeedSpace
+        ZoomSpeedSpace
+        Extension
+
+    ) ],
+    {
+        'AbsolutePanTiltPositionSpace' => \%AbsolutePanTiltPositionSpace_of,
+        'AbsoluteZoomPositionSpace' => \%AbsoluteZoomPositionSpace_of,
+        'RelativePanTiltTranslationSpace' => \%RelativePanTiltTranslationSpace_of,
+        'RelativeZoomTranslationSpace' => \%RelativeZoomTranslationSpace_of,
+        'ContinuousPanTiltVelocitySpace' => \%ContinuousPanTiltVelocitySpace_of,
+        'ContinuousZoomVelocitySpace' => \%ContinuousZoomVelocitySpace_of,
+        'PanTiltSpeedSpace' => \%PanTiltSpeedSpace_of,
+        'ZoomSpeedSpace' => \%ZoomSpeedSpace_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AbsolutePanTiltPositionSpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'AbsoluteZoomPositionSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'RelativePanTiltTranslationSpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'RelativeZoomTranslationSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'ContinuousPanTiltVelocitySpace' => 'ONVIF::Analytics::Types::Space2DDescription',
+        'ContinuousZoomVelocitySpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'PanTiltSpeedSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'ZoomSpeedSpace' => 'ONVIF::Analytics::Types::Space1DDescription',
+        'Extension' => 'ONVIF::Analytics::Types::PTZSpacesExtension',
+    },
+    {
+
+        'AbsolutePanTiltPositionSpace' => 'AbsolutePanTiltPositionSpace',
+        'AbsoluteZoomPositionSpace' => 'AbsoluteZoomPositionSpace',
+        'RelativePanTiltTranslationSpace' => 'RelativePanTiltTranslationSpace',
+        'RelativeZoomTranslationSpace' => 'RelativeZoomTranslationSpace',
+        'ContinuousPanTiltVelocitySpace' => 'ContinuousPanTiltVelocitySpace',
+        'ContinuousZoomVelocitySpace' => 'ContinuousZoomVelocitySpace',
+        'PanTiltSpeedSpace' => 'PanTiltSpeedSpace',
+        'ZoomSpeedSpace' => 'ZoomSpeedSpace',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZSpaces
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZSpaces from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AbsolutePanTiltPositionSpace
+
+
+=item * AbsoluteZoomPositionSpace
+
+
+=item * RelativePanTiltTranslationSpace
+
+
+=item * RelativeZoomTranslationSpace
+
+
+=item * ContinuousPanTiltVelocitySpace
+
+
+=item * ContinuousZoomVelocitySpace
+
+
+=item * PanTiltSpeedSpace
+
+
+=item * ZoomSpeedSpace
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZSpaces
+   AbsolutePanTiltPositionSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   AbsoluteZoomPositionSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   RelativePanTiltTranslationSpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   RelativeZoomTranslationSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ContinuousPanTiltVelocitySpace =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ContinuousZoomVelocitySpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   PanTiltSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   ZoomSpeedSpace =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZSpacesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm
new file mode 100644
index 000000000..cb439a62b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpacesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZSpacesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZSpacesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZSpacesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZSpacesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm
new file mode 100644
index 000000000..414e7028d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZSpeed.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZSpeed;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTilt_of :ATTR(:get<PanTilt>);
+my %Zoom_of :ATTR(:get<Zoom>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTilt
+        Zoom
+
+    ) ],
+    {
+        'PanTilt' => \%PanTilt_of,
+        'Zoom' => \%Zoom_of,
+    },
+    {
+        'PanTilt' => 'ONVIF::Analytics::Types::Vector2D',
+        'Zoom' => 'ONVIF::Analytics::Types::Vector1D',
+    },
+    {
+
+        'PanTilt' => 'PanTilt',
+        'Zoom' => 'Zoom',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZSpeed
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZSpeed from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTilt
+
+
+=item * Zoom
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZSpeed
+   PanTilt => ,
+   Zoom => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm
new file mode 100644
index 000000000..8958f747b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatus.pm
@@ -0,0 +1,136 @@
+package ONVIF::Analytics::Types::PTZStatus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Position_of :ATTR(:get<Position>);
+my %MoveStatus_of :ATTR(:get<MoveStatus>);
+my %Error_of :ATTR(:get<Error>);
+my %UtcTime_of :ATTR(:get<UtcTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Position
+        MoveStatus
+        Error
+        UtcTime
+
+    ) ],
+    {
+        'Position' => \%Position_of,
+        'MoveStatus' => \%MoveStatus_of,
+        'Error' => \%Error_of,
+        'UtcTime' => \%UtcTime_of,
+    },
+    {
+        'Position' => 'ONVIF::Analytics::Types::PTZVector',
+        'MoveStatus' => 'ONVIF::Analytics::Types::PTZMoveStatus',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'UtcTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'Position' => 'Position',
+        'MoveStatus' => 'MoveStatus',
+        'Error' => 'Error',
+        'UtcTime' => 'UtcTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStatus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Position
+
+
+=item * MoveStatus
+
+
+=item * Error
+
+
+=item * UtcTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStatus
+   Position =>  { # ONVIF::Analytics::Types::PTZVector
+     PanTilt => ,
+     Zoom => ,
+   },
+   MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+     PanTilt => $some_value, # MoveStatus
+     Zoom => $some_value, # MoveStatus
+   },
+   Error =>  $some_value, # string
+   UtcTime =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm
new file mode 100644
index 000000000..b56b650d2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptions.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::PTZStatusFilterOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTiltStatusSupported_of :ATTR(:get<PanTiltStatusSupported>);
+my %ZoomStatusSupported_of :ATTR(:get<ZoomStatusSupported>);
+my %PanTiltPositionSupported_of :ATTR(:get<PanTiltPositionSupported>);
+my %ZoomPositionSupported_of :ATTR(:get<ZoomPositionSupported>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTiltStatusSupported
+        ZoomStatusSupported
+        PanTiltPositionSupported
+        ZoomPositionSupported
+        Extension
+
+    ) ],
+    {
+        'PanTiltStatusSupported' => \%PanTiltStatusSupported_of,
+        'ZoomStatusSupported' => \%ZoomStatusSupported_of,
+        'PanTiltPositionSupported' => \%PanTiltPositionSupported_of,
+        'ZoomPositionSupported' => \%ZoomPositionSupported_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PanTiltStatusSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ZoomStatusSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'PanTiltPositionSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'ZoomPositionSupported' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension',
+    },
+    {
+
+        'PanTiltStatusSupported' => 'PanTiltStatusSupported',
+        'ZoomStatusSupported' => 'ZoomStatusSupported',
+        'PanTiltPositionSupported' => 'PanTiltPositionSupported',
+        'ZoomPositionSupported' => 'ZoomPositionSupported',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStatusFilterOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStatusFilterOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTiltStatusSupported
+
+
+=item * ZoomStatusSupported
+
+
+=item * PanTiltPositionSupported
+
+
+=item * ZoomPositionSupported
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStatusFilterOptions
+   PanTiltStatusSupported =>  $some_value, # boolean
+   ZoomStatusSupported =>  $some_value, # boolean
+   PanTiltPositionSupported =>  $some_value, # boolean
+   ZoomPositionSupported =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm
new file mode 100644
index 000000000..96362c006
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStatusFilterOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStatusFilterOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStatusFilterOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm
new file mode 100644
index 000000000..a717d6a1c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStream.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::PTZStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PTZStatus_of :ATTR(:get<PTZStatus>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        PTZStatus
+        Extension
+
+    ) ],
+    {
+        'PTZStatus' => \%PTZStatus_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'PTZStatus' => 'ONVIF::Analytics::Types::PTZStatus',
+        'Extension' => 'ONVIF::Analytics::Types::PTZStreamExtension',
+    },
+    {
+
+        'PTZStatus' => 'PTZStatus',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PTZStatus
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+     Position =>  { # ONVIF::Analytics::Types::PTZVector
+       PanTilt => ,
+       Zoom => ,
+     },
+     MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+       PanTilt => $some_value, # MoveStatus
+       Zoom => $some_value, # MoveStatus
+     },
+     Error =>  $some_value, # string
+     UtcTime =>  $some_value, # dateTime
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZStreamExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm
new file mode 100644
index 000000000..2e7c13340
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PTZStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm
new file mode 100644
index 000000000..08b3c6f9b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PTZVector.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PTZVector;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PanTilt_of :ATTR(:get<PanTilt>);
+my %Zoom_of :ATTR(:get<Zoom>);
+
+__PACKAGE__->_factory(
+    [ qw(        PanTilt
+        Zoom
+
+    ) ],
+    {
+        'PanTilt' => \%PanTilt_of,
+        'Zoom' => \%Zoom_of,
+    },
+    {
+        'PanTilt' => 'ONVIF::Analytics::Types::Vector2D',
+        'Zoom' => 'ONVIF::Analytics::Types::Vector1D',
+    },
+    {
+
+        'PanTilt' => 'PanTilt',
+        'Zoom' => 'Zoom',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PTZVector
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PTZVector from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PanTilt
+
+
+=item * Zoom
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PTZVector
+   PanTilt => ,
+   Zoom => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm
new file mode 100644
index 000000000..8ff07059f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PanTiltLimits.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::PanTiltLimits;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Range_of :ATTR(:get<Range>);
+
+__PACKAGE__->_factory(
+    [ qw(        Range
+
+    ) ],
+    {
+        'Range' => \%Range_of,
+    },
+    {
+        'Range' => 'ONVIF::Analytics::Types::Space2DDescription',
+    },
+    {
+
+        'Range' => 'Range',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PanTiltLimits
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PanTiltLimits from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Range
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PanTiltLimits
+   Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+     YRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm
new file mode 100644
index 000000000..f3522da41
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneConfiguration.pm
@@ -0,0 +1,163 @@
+package ONVIF::Analytics::Types::PaneConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PaneName_of :ATTR(:get<PaneName>);
+my %AudioOutputToken_of :ATTR(:get<AudioOutputToken>);
+my %AudioSourceToken_of :ATTR(:get<AudioSourceToken>);
+my %AudioEncoderConfiguration_of :ATTR(:get<AudioEncoderConfiguration>);
+my %ReceiverToken_of :ATTR(:get<ReceiverToken>);
+my %Token_of :ATTR(:get<Token>);
+
+__PACKAGE__->_factory(
+    [ qw(        PaneName
+        AudioOutputToken
+        AudioSourceToken
+        AudioEncoderConfiguration
+        ReceiverToken
+        Token
+
+    ) ],
+    {
+        'PaneName' => \%PaneName_of,
+        'AudioOutputToken' => \%AudioOutputToken_of,
+        'AudioSourceToken' => \%AudioSourceToken_of,
+        'AudioEncoderConfiguration' => \%AudioEncoderConfiguration_of,
+        'ReceiverToken' => \%ReceiverToken_of,
+        'Token' => \%Token_of,
+    },
+    {
+        'PaneName' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'AudioOutputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AudioSourceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'AudioEncoderConfiguration' => 'ONVIF::Analytics::Types::AudioEncoderConfiguration',
+        'ReceiverToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'PaneName' => 'PaneName',
+        'AudioOutputToken' => 'AudioOutputToken',
+        'AudioSourceToken' => 'AudioSourceToken',
+        'AudioEncoderConfiguration' => 'AudioEncoderConfiguration',
+        'ReceiverToken' => 'ReceiverToken',
+        'Token' => 'Token',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+Configuration of the streaming and coding settings of a Video window.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PaneName
+
+
+=item * AudioOutputToken
+
+
+=item * AudioSourceToken
+
+
+=item * AudioEncoderConfiguration
+
+
+=item * ReceiverToken
+
+
+=item * Token
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneConfiguration
+   PaneName =>  $some_value, # string
+   AudioOutputToken => $some_value, # ReferenceToken
+   AudioSourceToken => $some_value, # ReferenceToken
+   AudioEncoderConfiguration =>  { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+     Encoding => $some_value, # AudioEncoding
+     Bitrate =>  $some_value, # int
+     SampleRate =>  $some_value, # int
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   ReceiverToken => $some_value, # ReferenceToken
+   Token => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm
new file mode 100644
index 000000000..fe5d98bee
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayout.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PaneLayout;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Pane_of :ATTR(:get<Pane>);
+my %Area_of :ATTR(:get<Area>);
+
+__PACKAGE__->_factory(
+    [ qw(        Pane
+        Area
+
+    ) ],
+    {
+        'Pane' => \%Pane_of,
+        'Area' => \%Area_of,
+    },
+    {
+        'Pane' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Area' => 'ONVIF::Analytics::Types::Rectangle',
+    },
+    {
+
+        'Pane' => 'Pane',
+        'Area' => 'Area',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneLayout
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneLayout from the namespace http://www.onvif.org/ver10/schema.
+
+A pane layout describes one Video window of a display. It links a pane configuration to a region of the screen.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Pane
+
+
+=item * Area
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneLayout
+   Pane => $some_value, # ReferenceToken
+   Area => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm
new file mode 100644
index 000000000..c00fdf10c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneLayoutOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::PaneLayoutOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Area_of :ATTR(:get<Area>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Area
+        Extension
+
+    ) ],
+    {
+        'Area' => \%Area_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Area' => 'ONVIF::Analytics::Types::Rectangle',
+        'Extension' => 'ONVIF::Analytics::Types::PaneOptionExtension',
+    },
+    {
+
+        'Area' => 'Area',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneLayoutOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneLayoutOptions from the namespace http://www.onvif.org/ver10/schema.
+
+Description of a pane layout describing a complete display layout.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Area
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneLayoutOptions
+   Area => ,
+   Extension =>  { # ONVIF::Analytics::Types::PaneOptionExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm
new file mode 100644
index 000000000..9f7b8bc0d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PaneOptionExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PaneOptionExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PaneOptionExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PaneOptionExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PaneOptionExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm
new file mode 100644
index 000000000..4b2978611
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Polygon.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Polygon;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Point_of :ATTR(:get<Point>);
+
+__PACKAGE__->_factory(
+    [ qw(        Point
+
+    ) ],
+    {
+        'Point' => \%Point_of,
+    },
+    {
+        'Point' => 'ONVIF::Analytics::Types::Vector',
+    },
+    {
+
+        'Point' => 'Point',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Polygon
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Polygon from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Point
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polygon
+   Point => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm
new file mode 100644
index 000000000..8d7bc386d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolygonConfiguration.pm
@@ -0,0 +1,105 @@
+package ONVIF::Analytics::Types::PolygonConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Polygon_of :ATTR(:get<Polygon>);
+
+__PACKAGE__->_factory(
+    [ qw(        Polygon
+
+    ) ],
+    {
+        'Polygon' => \%Polygon_of,
+    },
+    {
+        'Polygon' => 'ONVIF::Analytics::Types::Polygon',
+    },
+    {
+
+        'Polygon' => 'Polygon',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolygonConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolygonConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Polygon
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolygonConfiguration
+   Polygon =>  { # ONVIF::Analytics::Types::Polygon
+     Point => ,
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm
new file mode 100644
index 000000000..0bf44cd46
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Polyline.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Polyline;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Point_of :ATTR(:get<Point>);
+
+__PACKAGE__->_factory(
+    [ qw(        Point
+
+    ) ],
+    {
+        'Point' => \%Point_of,
+    },
+    {
+        'Point' => 'ONVIF::Analytics::Types::Vector',
+    },
+    {
+
+        'Point' => 'Point',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Polyline
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Polyline from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Point
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Polyline
+   Point => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm
new file mode 100644
index 000000000..cec5deb4e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArray.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::PolylineArray;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Segment_of :ATTR(:get<Segment>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Segment
+        Extension
+
+    ) ],
+    {
+        'Segment' => \%Segment_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Segment' => 'ONVIF::Analytics::Types::Polyline',
+        'Extension' => 'ONVIF::Analytics::Types::PolylineArrayExtension',
+    },
+    {
+
+        'Segment' => 'Segment',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolylineArray
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolylineArray from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Segment
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolylineArray
+   Segment =>  { # ONVIF::Analytics::Types::Polyline
+     Point => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PolylineArrayExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm
new file mode 100644
index 000000000..2682aa621
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayConfiguration.pm
@@ -0,0 +1,109 @@
+package ONVIF::Analytics::Types::PolylineArrayConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PolylineArray_of :ATTR(:get<PolylineArray>);
+
+__PACKAGE__->_factory(
+    [ qw(        PolylineArray
+
+    ) ],
+    {
+        'PolylineArray' => \%PolylineArray_of,
+    },
+    {
+        'PolylineArray' => 'ONVIF::Analytics::Types::PolylineArray',
+    },
+    {
+
+        'PolylineArray' => 'PolylineArray',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolylineArrayConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolylineArrayConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PolylineArray
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolylineArrayConfiguration
+   PolylineArray =>  { # ONVIF::Analytics::Types::PolylineArray
+     Segment =>  { # ONVIF::Analytics::Types::Polyline
+       Point => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PolylineArrayExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm
new file mode 100644
index 000000000..4bff09a76
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PolylineArrayExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::PolylineArrayExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PolylineArrayExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PolylineArrayExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PolylineArrayExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm
new file mode 100644
index 000000000..68f378577
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv4Address.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PrefixedIPv4Address;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %PrefixLength_of :ATTR(:get<PrefixLength>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        PrefixLength
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'PrefixLength' => \%PrefixLength_of,
+    },
+    {
+        'Address' => 'ONVIF::Analytics::Types::IPv4Address',
+        'PrefixLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Address' => 'Address',
+        'PrefixLength' => 'PrefixLength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PrefixedIPv4Address
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PrefixedIPv4Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * PrefixLength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PrefixedIPv4Address
+   Address => $some_value, # IPv4Address
+   PrefixLength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm
new file mode 100644
index 000000000..82a554151
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PrefixedIPv6Address.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::PrefixedIPv6Address;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %PrefixLength_of :ATTR(:get<PrefixLength>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        PrefixLength
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'PrefixLength' => \%PrefixLength_of,
+    },
+    {
+        'Address' => 'ONVIF::Analytics::Types::IPv6Address',
+        'PrefixLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Address' => 'Address',
+        'PrefixLength' => 'PrefixLength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PrefixedIPv6Address
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PrefixedIPv6Address from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * PrefixLength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PrefixedIPv6Address
+   Address => $some_value, # IPv6Address
+   PrefixLength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm
new file mode 100644
index 000000000..e084452c2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PresetTour.pm
@@ -0,0 +1,247 @@
+package ONVIF::Analytics::Types::PresetTour;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::PresetTour::_PresetTour::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Status_of :ATTR(:get<Status>);
+my %AutoStart_of :ATTR(:get<AutoStart>);
+my %StartingCondition_of :ATTR(:get<StartingCondition>);
+my %TourSpot_of :ATTR(:get<TourSpot>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Status
+        AutoStart
+        StartingCondition
+        TourSpot
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Status' => \%Status_of,
+        'AutoStart' => \%AutoStart_of,
+        'StartingCondition' => \%StartingCondition_of,
+        'TourSpot' => \%TourSpot_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'Status' => 'ONVIF::Analytics::Types::PTZPresetTourStatus',
+        'AutoStart' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'StartingCondition' => 'ONVIF::Analytics::Types::PTZPresetTourStartingCondition',
+        'TourSpot' => 'ONVIF::Analytics::Types::PTZPresetTourSpot',
+        'Extension' => 'ONVIF::Analytics::Types::PTZPresetTourExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'Status' => 'Status',
+        'AutoStart' => 'AutoStart',
+        'StartingCondition' => 'StartingCondition',
+        'TourSpot' => 'TourSpot',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::PresetTour::_PresetTour::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+    ) ],
+    {
+
+        token => \%token_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::PresetTour
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PresetTour from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Status
+
+
+=item * AutoStart
+
+
+=item * StartingCondition
+
+
+=item * TourSpot
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::PresetTour
+   Name => $some_value, # Name
+   Status =>  { # ONVIF::Analytics::Types::PTZPresetTourStatus
+     State => $some_value, # PTZPresetTourState
+     CurrentTourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpot
+       PresetDetail =>        { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+         # One of the following elements.
+         # No occurance checks yet, so be sure to pass just one...
+         PresetToken => $some_value, # ReferenceToken
+         Home =>  $some_value, # boolean
+         PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+           PanTilt => ,
+           Zoom => ,
+         },
+         TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+         },
+       },
+       Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+         PanTilt => ,
+         Zoom => ,
+       },
+       StayTime =>  $some_value, # duration
+       Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStatusExtension
+     },
+   },
+   AutoStart =>  $some_value, # boolean
+   StartingCondition =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingCondition
+     RecurringTime =>  $some_value, # int
+     RecurringDuration =>  $some_value, # duration
+     Direction => $some_value, # PTZPresetTourDirection
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourStartingConditionExtension
+     },
+   },
+   TourSpot =>  { # ONVIF::Analytics::Types::PTZPresetTourSpot
+     PresetDetail =>      { # ONVIF::Analytics::Types::PTZPresetTourPresetDetail
+       # One of the following elements.
+       # No occurance checks yet, so be sure to pass just one...
+       PresetToken => $some_value, # ReferenceToken
+       Home =>  $some_value, # boolean
+       PTZPosition =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       TypeExtension =>  { # ONVIF::Analytics::Types::PTZPresetTourTypeExtension
+       },
+     },
+     Speed =>  { # ONVIF::Analytics::Types::PTZSpeed
+       PanTilt => ,
+       Zoom => ,
+     },
+     StayTime =>  $some_value, # duration
+     Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourSpotExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::PTZPresetTourExtension
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::PresetTour::_PresetTour::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Unique identifier of this preset tour.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm
new file mode 100644
index 000000000..bff819dfc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Profile.pm
@@ -0,0 +1,414 @@
+package ONVIF::Analytics::Types::Profile;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Profile::_Profile::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %VideoSourceConfiguration_of :ATTR(:get<VideoSourceConfiguration>);
+my %AudioSourceConfiguration_of :ATTR(:get<AudioSourceConfiguration>);
+my %VideoEncoderConfiguration_of :ATTR(:get<VideoEncoderConfiguration>);
+my %AudioEncoderConfiguration_of :ATTR(:get<AudioEncoderConfiguration>);
+my %VideoAnalyticsConfiguration_of :ATTR(:get<VideoAnalyticsConfiguration>);
+my %PTZConfiguration_of :ATTR(:get<PTZConfiguration>);
+my %MetadataConfiguration_of :ATTR(:get<MetadataConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        VideoSourceConfiguration
+        AudioSourceConfiguration
+        VideoEncoderConfiguration
+        AudioEncoderConfiguration
+        VideoAnalyticsConfiguration
+        PTZConfiguration
+        MetadataConfiguration
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'VideoSourceConfiguration' => \%VideoSourceConfiguration_of,
+        'AudioSourceConfiguration' => \%AudioSourceConfiguration_of,
+        'VideoEncoderConfiguration' => \%VideoEncoderConfiguration_of,
+        'AudioEncoderConfiguration' => \%AudioEncoderConfiguration_of,
+        'VideoAnalyticsConfiguration' => \%VideoAnalyticsConfiguration_of,
+        'PTZConfiguration' => \%PTZConfiguration_of,
+        'MetadataConfiguration' => \%MetadataConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'VideoSourceConfiguration' => 'ONVIF::Analytics::Types::VideoSourceConfiguration',
+        'AudioSourceConfiguration' => 'ONVIF::Analytics::Types::AudioSourceConfiguration',
+        'VideoEncoderConfiguration' => 'ONVIF::Analytics::Types::VideoEncoderConfiguration',
+        'AudioEncoderConfiguration' => 'ONVIF::Analytics::Types::AudioEncoderConfiguration',
+        'VideoAnalyticsConfiguration' => 'ONVIF::Analytics::Types::VideoAnalyticsConfiguration',
+        'PTZConfiguration' => 'ONVIF::Analytics::Types::PTZConfiguration',
+        'MetadataConfiguration' => 'ONVIF::Analytics::Types::MetadataConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::ProfileExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'VideoSourceConfiguration' => 'VideoSourceConfiguration',
+        'AudioSourceConfiguration' => 'AudioSourceConfiguration',
+        'VideoEncoderConfiguration' => 'VideoEncoderConfiguration',
+        'AudioEncoderConfiguration' => 'AudioEncoderConfiguration',
+        'VideoAnalyticsConfiguration' => 'VideoAnalyticsConfiguration',
+        'PTZConfiguration' => 'PTZConfiguration',
+        'MetadataConfiguration' => 'MetadataConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::Profile::_Profile::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %token_of :ATTR(:get<token>);
+my %fixed_of :ATTR(:get<fixed>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        token
+        fixed
+    ) ],
+    {
+
+        token => \%token_of,
+
+        fixed => \%fixed_of,
+    },
+    {
+        token => 'ONVIF::Analytics::Types::ReferenceToken',
+        fixed => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Profile
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Profile from the namespace http://www.onvif.org/ver10/schema.
+
+A profile consists of a set of interconnected configuration entities. Configurations are provided by the NVT and can be either static or created dynamically by the NVT. For example, the dynamic configurations can be created by the NVT depending on current available encoding resources. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * VideoSourceConfiguration
+
+
+=item * AudioSourceConfiguration
+
+
+=item * VideoEncoderConfiguration
+
+
+=item * AudioEncoderConfiguration
+
+
+=item * VideoAnalyticsConfiguration
+
+
+=item * PTZConfiguration
+
+
+=item * MetadataConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Profile
+   Name => $some_value, # Name
+   VideoSourceConfiguration =>  { # ONVIF::Analytics::Types::VideoSourceConfiguration
+     SourceToken => $some_value, # ReferenceToken
+     Bounds => ,
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+       Rotate =>  { # ONVIF::Analytics::Types::Rotate
+         Mode => $some_value, # RotateMode
+         Degree =>  $some_value, # int
+         Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+       },
+     },
+   },
+   AudioSourceConfiguration =>  { # ONVIF::Analytics::Types::AudioSourceConfiguration
+     SourceToken => $some_value, # ReferenceToken
+   },
+   VideoEncoderConfiguration =>  { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+     Encoding => $some_value, # VideoEncoding
+     Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     Quality =>  $some_value, # float
+     RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+       FrameRateLimit =>  $some_value, # int
+       EncodingInterval =>  $some_value, # int
+       BitrateLimit =>  $some_value, # int
+     },
+     MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+       GovLength =>  $some_value, # int
+       Mpeg4Profile => $some_value, # Mpeg4Profile
+     },
+     H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+       GovLength =>  $some_value, # int
+       H264Profile => $some_value, # H264Profile
+     },
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   AudioEncoderConfiguration =>  { # ONVIF::Analytics::Types::AudioEncoderConfiguration
+     Encoding => $some_value, # AudioEncoding
+     Bitrate =>  $some_value, # int
+     SampleRate =>  $some_value, # int
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+   },
+   VideoAnalyticsConfiguration =>  { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+     AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+       AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+       },
+     },
+     RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+       Rule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+       },
+     },
+   },
+   PTZConfiguration =>  { # ONVIF::Analytics::Types::PTZConfiguration
+     NodeToken => $some_value, # ReferenceToken
+     DefaultAbsolutePantTiltPositionSpace =>  $some_value, # anyURI
+     DefaultAbsoluteZoomPositionSpace =>  $some_value, # anyURI
+     DefaultRelativePanTiltTranslationSpace =>  $some_value, # anyURI
+     DefaultRelativeZoomTranslationSpace =>  $some_value, # anyURI
+     DefaultContinuousPanTiltVelocitySpace =>  $some_value, # anyURI
+     DefaultContinuousZoomVelocitySpace =>  $some_value, # anyURI
+     DefaultPTZSpeed =>  { # ONVIF::Analytics::Types::PTZSpeed
+       PanTilt => ,
+       Zoom => ,
+     },
+     DefaultPTZTimeout =>  $some_value, # duration
+     PanTiltLimits =>  { # ONVIF::Analytics::Types::PanTiltLimits
+       Range =>  { # ONVIF::Analytics::Types::Space2DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+         YRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+     },
+     ZoomLimits =>  { # ONVIF::Analytics::Types::ZoomLimits
+       Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+         URI =>  $some_value, # anyURI
+         XRange =>  { # ONVIF::Analytics::Types::FloatRange
+           Min =>  $some_value, # float
+           Max =>  $some_value, # float
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension
+       PTControlDirection =>  { # ONVIF::Analytics::Types::PTControlDirection
+         EFlip =>  { # ONVIF::Analytics::Types::EFlip
+           Mode => $some_value, # EFlipMode
+         },
+         Reverse =>  { # ONVIF::Analytics::Types::Reverse
+           Mode => $some_value, # ReverseMode
+         },
+         Extension =>  { # ONVIF::Analytics::Types::PTControlDirectionExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::PTZConfigurationExtension2
+       },
+     },
+   },
+   MetadataConfiguration =>  { # ONVIF::Analytics::Types::MetadataConfiguration
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZFilter
+       Status =>  $some_value, # boolean
+       Position =>  $some_value, # boolean
+     },
+     Analytics =>  $some_value, # boolean
+     Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+       Address =>  { # ONVIF::Analytics::Types::IPAddress
+         Type => $some_value, # IPType
+         IPv4Address => $some_value, # IPv4Address
+         IPv6Address => $some_value, # IPv6Address
+       },
+       Port =>  $some_value, # int
+       TTL =>  $some_value, # int
+       AutoStart =>  $some_value, # boolean
+     },
+     SessionTimeout =>  $some_value, # duration
+     AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+       AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+         Parameters =>  { # ONVIF::Analytics::Types::ItemList
+           SimpleItem => ,
+           ElementItem =>  {
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+           },
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::MetadataConfigurationExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ProfileExtension
+     AudioOutputConfiguration =>  { # ONVIF::Analytics::Types::AudioOutputConfiguration
+       OutputToken => $some_value, # ReferenceToken
+       SendPrimacy =>  $some_value, # anyURI
+       OutputLevel =>  $some_value, # int
+     },
+     AudioDecoderConfiguration =>  { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ProfileExtension2
+     },
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Profile::_Profile::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * token
+
+ Unique identifier of the profile.
+
+
+
+This attribute is of type L<ONVIF::Analytics::Types::ReferenceToken|ONVIF::Analytics::Types::ReferenceToken>.
+
+=item * fixed
+
+ A value of true signals that the profile cannot be deleted. Default is false.
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm
new file mode 100644
index 000000000..c923d8461
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ProfileCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumberOfProfiles_of :ATTR(:get<MaximumNumberOfProfiles>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumberOfProfiles
+
+    ) ],
+    {
+        'MaximumNumberOfProfiles' => \%MaximumNumberOfProfiles_of,
+    },
+    {
+        'MaximumNumberOfProfiles' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'MaximumNumberOfProfiles' => 'MaximumNumberOfProfiles',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ProfileCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProfileCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumberOfProfiles
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ProfileCapabilities
+   MaximumNumberOfProfiles =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm
new file mode 100644
index 000000000..fba4940e2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::ProfileExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AudioOutputConfiguration_of :ATTR(:get<AudioOutputConfiguration>);
+my %AudioDecoderConfiguration_of :ATTR(:get<AudioDecoderConfiguration>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AudioOutputConfiguration
+        AudioDecoderConfiguration
+        Extension
+
+    ) ],
+    {
+        'AudioOutputConfiguration' => \%AudioOutputConfiguration_of,
+        'AudioDecoderConfiguration' => \%AudioDecoderConfiguration_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AudioOutputConfiguration' => 'ONVIF::Analytics::Types::AudioOutputConfiguration',
+        'AudioDecoderConfiguration' => 'ONVIF::Analytics::Types::AudioDecoderConfiguration',
+        'Extension' => 'ONVIF::Analytics::Types::ProfileExtension2',
+    },
+    {
+
+        'AudioOutputConfiguration' => 'AudioOutputConfiguration',
+        'AudioDecoderConfiguration' => 'AudioDecoderConfiguration',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ProfileExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProfileExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AudioOutputConfiguration
+
+
+=item * AudioDecoderConfiguration
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ProfileExtension
+   AudioOutputConfiguration =>  { # ONVIF::Analytics::Types::AudioOutputConfiguration
+     OutputToken => $some_value, # ReferenceToken
+     SendPrimacy =>  $some_value, # anyURI
+     OutputLevel =>  $some_value, # int
+   },
+   AudioDecoderConfiguration =>  { # ONVIF::Analytics::Types::AudioDecoderConfiguration
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ProfileExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm
new file mode 100644
index 000000000..29fd174e5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ProfileExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ProfileExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ProfileExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ProfileExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ProfileExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm
new file mode 100644
index 000000000..395b38b58
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/PropertyOperation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::PropertyOperation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+PropertyOperation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm
new file mode 100644
index 000000000..e84341465
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilities.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::RealTimeStreamingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RTPMulticast_of :ATTR(:get<RTPMulticast>);
+my %RTP_TCP_of :ATTR(:get<RTP_TCP>);
+my %RTP_RTSP_TCP_of :ATTR(:get<RTP_RTSP_TCP>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RTPMulticast
+        RTP_TCP
+        RTP_RTSP_TCP
+        Extension
+
+    ) ],
+    {
+        'RTPMulticast' => \%RTPMulticast_of,
+        'RTP_TCP' => \%RTP_TCP_of,
+        'RTP_RTSP_TCP' => \%RTP_RTSP_TCP_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RTPMulticast' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_RTSP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension',
+    },
+    {
+
+        'RTPMulticast' => 'RTPMulticast',
+        'RTP_TCP' => 'RTP_TCP',
+        'RTP_RTSP_TCP' => 'RTP_RTSP_TCP',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RealTimeStreamingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RealTimeStreamingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RTPMulticast
+
+
+=item * RTP_TCP
+
+
+=item * RTP_RTSP_TCP
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RealTimeStreamingCapabilities
+   RTPMulticast =>  $some_value, # boolean
+   RTP_TCP =>  $some_value, # boolean
+   RTP_RTSP_TCP =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm
new file mode 100644
index 000000000..6d569eba1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RealTimeStreamingCapabilitiesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RealTimeStreamingCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RealTimeStreamingCapabilitiesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm
new file mode 100644
index 000000000..b3e0f0edb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Receiver.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::Receiver;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Token_of :ATTR(:get<Token>);
+my %Configuration_of :ATTR(:get<Configuration>);
+
+__PACKAGE__->_factory(
+    [ qw(        Token
+        Configuration
+
+    ) ],
+    {
+        'Token' => \%Token_of,
+        'Configuration' => \%Configuration_of,
+    },
+    {
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Configuration' => 'ONVIF::Analytics::Types::ReceiverConfiguration',
+    },
+    {
+
+        'Token' => 'Token',
+        'Configuration' => 'Configuration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Receiver
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Receiver from the namespace http://www.onvif.org/ver10/schema.
+
+Description of a receiver, including its token and configuration. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Token
+
+
+=item * Configuration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Receiver
+   Token => $some_value, # ReferenceToken
+   Configuration =>  { # ONVIF::Analytics::Types::ReceiverConfiguration
+     Mode => $some_value, # ReceiverMode
+     MediaUri =>  $some_value, # anyURI
+     StreamSetup =>  { # ONVIF::Analytics::Types::StreamSetup
+       Stream => $some_value, # StreamType
+       Transport =>  { # ONVIF::Analytics::Types::Transport
+         Protocol => $some_value, # TransportProtocol
+       },
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm
new file mode 100644
index 000000000..8a27bff2d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverCapabilities.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::ReceiverCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %RTP_Multicast_of :ATTR(:get<RTP_Multicast>);
+my %RTP_TCP_of :ATTR(:get<RTP_TCP>);
+my %RTP_RTSP_TCP_of :ATTR(:get<RTP_RTSP_TCP>);
+my %SupportedReceivers_of :ATTR(:get<SupportedReceivers>);
+my %MaximumRTSPURILength_of :ATTR(:get<MaximumRTSPURILength>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        RTP_Multicast
+        RTP_TCP
+        RTP_RTSP_TCP
+        SupportedReceivers
+        MaximumRTSPURILength
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'RTP_Multicast' => \%RTP_Multicast_of,
+        'RTP_TCP' => \%RTP_TCP_of,
+        'RTP_RTSP_TCP' => \%RTP_RTSP_TCP_of,
+        'SupportedReceivers' => \%SupportedReceivers_of,
+        'MaximumRTSPURILength' => \%MaximumRTSPURILength_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RTP_Multicast' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RTP_RTSP_TCP' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SupportedReceivers' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'MaximumRTSPURILength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'RTP_Multicast' => 'RTP_Multicast',
+        'RTP_TCP' => 'RTP_TCP',
+        'RTP_RTSP_TCP' => 'RTP_RTSP_TCP',
+        'SupportedReceivers' => 'SupportedReceivers',
+        'MaximumRTSPURILength' => 'MaximumRTSPURILength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReceiverCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReceiverCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * RTP_Multicast
+
+
+=item * RTP_TCP
+
+
+=item * RTP_RTSP_TCP
+
+
+=item * SupportedReceivers
+
+
+=item * MaximumRTSPURILength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReceiverCapabilities
+   XAddr =>  $some_value, # anyURI
+   RTP_Multicast =>  $some_value, # boolean
+   RTP_TCP =>  $some_value, # boolean
+   RTP_RTSP_TCP =>  $some_value, # boolean
+   SupportedReceivers =>  $some_value, # int
+   MaximumRTSPURILength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm
new file mode 100644
index 000000000..60d4b4f90
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverConfiguration.pm
@@ -0,0 +1,126 @@
+package ONVIF::Analytics::Types::ReceiverConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %MediaUri_of :ATTR(:get<MediaUri>);
+my %StreamSetup_of :ATTR(:get<StreamSetup>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        MediaUri
+        StreamSetup
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'MediaUri' => \%MediaUri_of,
+        'StreamSetup' => \%StreamSetup_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ReceiverMode',
+        'MediaUri' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'StreamSetup' => 'ONVIF::Analytics::Types::StreamSetup',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'MediaUri' => 'MediaUri',
+        'StreamSetup' => 'StreamSetup',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReceiverConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReceiverConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+Describes the configuration of a receiver. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * MediaUri
+
+
+=item * StreamSetup
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReceiverConfiguration
+   Mode => $some_value, # ReceiverMode
+   MediaUri =>  $some_value, # anyURI
+   StreamSetup =>  { # ONVIF::Analytics::Types::StreamSetup
+     Stream => $some_value, # StreamType
+     Transport =>  { # ONVIF::Analytics::Types::Transport
+       Protocol => $some_value, # TransportProtocol
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm
new file mode 100644
index 000000000..5ccaf84c6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReceiverMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReceiverMode from the namespace http://www.onvif.org/ver10/schema.
+
+Specifies a receiver connection mode. 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm
new file mode 100644
index 000000000..9447dbc2f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReceiverReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReceiverReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm
new file mode 100644
index 000000000..f5e7ad4b8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReceiverState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReceiverState from the namespace http://www.onvif.org/ver10/schema.
+
+Specifies the current connection state of the receiver. 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm
new file mode 100644
index 000000000..6e4b9e588
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReceiverStateInformation.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::ReceiverStateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %State_of :ATTR(:get<State>);
+my %AutoCreated_of :ATTR(:get<AutoCreated>);
+
+__PACKAGE__->_factory(
+    [ qw(        State
+        AutoCreated
+
+    ) ],
+    {
+        'State' => \%State_of,
+        'AutoCreated' => \%AutoCreated_of,
+    },
+    {
+        'State' => 'ONVIF::Analytics::Types::ReceiverState',
+        'AutoCreated' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'State' => 'State',
+        'AutoCreated' => 'AutoCreated',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReceiverStateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReceiverStateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+Contains information about a receiver's current state. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * State
+
+
+=item * AutoCreated
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReceiverStateInformation
+   State => $some_value, # ReceiverState
+   AutoCreated =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm
new file mode 100644
index 000000000..62993cdd2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingCapabilities.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::RecordingCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %ReceiverSource_of :ATTR(:get<ReceiverSource>);
+my %MediaProfileSource_of :ATTR(:get<MediaProfileSource>);
+my %DynamicRecordings_of :ATTR(:get<DynamicRecordings>);
+my %DynamicTracks_of :ATTR(:get<DynamicTracks>);
+my %MaxStringLength_of :ATTR(:get<MaxStringLength>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        ReceiverSource
+        MediaProfileSource
+        DynamicRecordings
+        DynamicTracks
+        MaxStringLength
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'ReceiverSource' => \%ReceiverSource_of,
+        'MediaProfileSource' => \%MediaProfileSource_of,
+        'DynamicRecordings' => \%DynamicRecordings_of,
+        'DynamicTracks' => \%DynamicTracks_of,
+        'MaxStringLength' => \%MaxStringLength_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'ReceiverSource' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'MediaProfileSource' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DynamicRecordings' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DynamicTracks' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'MaxStringLength' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'ReceiverSource' => 'ReceiverSource',
+        'MediaProfileSource' => 'MediaProfileSource',
+        'DynamicRecordings' => 'DynamicRecordings',
+        'DynamicTracks' => 'DynamicTracks',
+        'MaxStringLength' => 'MaxStringLength',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * ReceiverSource
+
+
+=item * MediaProfileSource
+
+
+=item * DynamicRecordings
+
+
+=item * DynamicTracks
+
+
+=item * MaxStringLength
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingCapabilities
+   XAddr =>  $some_value, # anyURI
+   ReceiverSource =>  $some_value, # boolean
+   MediaProfileSource =>  $some_value, # boolean
+   DynamicRecordings =>  $some_value, # boolean
+   DynamicTracks =>  $some_value, # boolean
+   MaxStringLength =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm
new file mode 100644
index 000000000..4ade11780
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingConfiguration.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::RecordingConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Source_of :ATTR(:get<Source>);
+my %Content_of :ATTR(:get<Content>);
+my %MaximumRetentionTime_of :ATTR(:get<MaximumRetentionTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Source
+        Content
+        MaximumRetentionTime
+
+    ) ],
+    {
+        'Source' => \%Source_of,
+        'Content' => \%Content_of,
+        'MaximumRetentionTime' => \%MaximumRetentionTime_of,
+    },
+    {
+        'Source' => 'ONVIF::Analytics::Types::RecordingSourceInformation',
+        'Content' => 'ONVIF::Analytics::Types::Description',
+        'MaximumRetentionTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Source' => 'Source',
+        'Content' => 'Content',
+        'MaximumRetentionTime' => 'MaximumRetentionTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Source
+
+
+=item * Content
+
+
+=item * MaximumRetentionTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingConfiguration
+   Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+     SourceId =>  $some_value, # anyURI
+     Name => $some_value, # Name
+     Location => $some_value, # Description
+     Description => $some_value, # Description
+     Address =>  $some_value, # anyURI
+   },
+   Content => $some_value, # Description
+   MaximumRetentionTime =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm
new file mode 100644
index 000000000..f28a40c8c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingInformation.pm
@@ -0,0 +1,169 @@
+package ONVIF::Analytics::Types::RecordingInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %Source_of :ATTR(:get<Source>);
+my %EarliestRecording_of :ATTR(:get<EarliestRecording>);
+my %LatestRecording_of :ATTR(:get<LatestRecording>);
+my %Content_of :ATTR(:get<Content>);
+my %Track_of :ATTR(:get<Track>);
+my %RecordingStatus_of :ATTR(:get<RecordingStatus>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        Source
+        EarliestRecording
+        LatestRecording
+        Content
+        Track
+        RecordingStatus
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'Source' => \%Source_of,
+        'EarliestRecording' => \%EarliestRecording_of,
+        'LatestRecording' => \%LatestRecording_of,
+        'Content' => \%Content_of,
+        'Track' => \%Track_of,
+        'RecordingStatus' => \%RecordingStatus_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'Source' => 'ONVIF::Analytics::Types::RecordingSourceInformation',
+        'EarliestRecording' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'LatestRecording' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Content' => 'ONVIF::Analytics::Types::Description',
+        'Track' => 'ONVIF::Analytics::Types::TrackInformation',
+        'RecordingStatus' => 'ONVIF::Analytics::Types::RecordingStatus',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'Source' => 'Source',
+        'EarliestRecording' => 'EarliestRecording',
+        'LatestRecording' => 'LatestRecording',
+        'Content' => 'Content',
+        'Track' => 'Track',
+        'RecordingStatus' => 'RecordingStatus',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * Source
+
+
+=item * EarliestRecording
+
+
+=item * LatestRecording
+
+
+=item * Content
+
+
+=item * Track
+
+
+=item * RecordingStatus
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingInformation
+   RecordingToken => $some_value, # RecordingReference
+   Source =>  { # ONVIF::Analytics::Types::RecordingSourceInformation
+     SourceId =>  $some_value, # anyURI
+     Name => $some_value, # Name
+     Location => $some_value, # Description
+     Description => $some_value, # Description
+     Address =>  $some_value, # anyURI
+   },
+   EarliestRecording =>  $some_value, # dateTime
+   LatestRecording =>  $some_value, # dateTime
+   Content => $some_value, # Description
+   Track =>  { # ONVIF::Analytics::Types::TrackInformation
+     TrackToken => $some_value, # TrackReference
+     TrackType => $some_value, # TrackType
+     Description => $some_value, # Description
+     DataFrom =>  $some_value, # dateTime
+     DataTo =>  $some_value, # dateTime
+   },
+   RecordingStatus => $some_value, # RecordingStatus
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm
new file mode 100644
index 000000000..96dee7293
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfiguration.pm
@@ -0,0 +1,151 @@
+package ONVIF::Analytics::Types::RecordingJobConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %Mode_of :ATTR(:get<Mode>);
+my %Priority_of :ATTR(:get<Priority>);
+my %Source_of :ATTR(:get<Source>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        Mode
+        Priority
+        Source
+        Extension
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'Mode' => \%Mode_of,
+        'Priority' => \%Priority_of,
+        'Source' => \%Source_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'Mode' => 'ONVIF::Analytics::Types::RecordingJobMode',
+        'Priority' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Source' => 'ONVIF::Analytics::Types::RecordingJobSource',
+        'Extension' => 'ONVIF::Analytics::Types::RecordingJobConfigurationExtension',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'Mode' => 'Mode',
+        'Priority' => 'Priority',
+        'Source' => 'Source',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * Mode
+
+
+=item * Priority
+
+
+=item * Source
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobConfiguration
+   RecordingToken => $some_value, # RecordingReference
+   Mode => $some_value, # RecordingJobMode
+   Priority =>  $some_value, # int
+   Source =>  { # ONVIF::Analytics::Types::RecordingJobSource
+     SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+       Token => $some_value, # ReferenceToken
+     },
+     AutoCreateReceiver =>  $some_value, # boolean
+     Tracks =>  { # ONVIF::Analytics::Types::RecordingJobTrack
+       SourceTag =>  $some_value, # string
+       Destination => $some_value, # TrackReference
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm
new file mode 100644
index 000000000..36e91245d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RecordingJobConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm
new file mode 100644
index 000000000..947f64438
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingJobMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingJobMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm
new file mode 100644
index 000000000..d11a48e2c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingJobReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingJobReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm
new file mode 100644
index 000000000..b1a49182a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSource.pm
@@ -0,0 +1,136 @@
+package ONVIF::Analytics::Types::RecordingJobSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceToken_of :ATTR(:get<SourceToken>);
+my %AutoCreateReceiver_of :ATTR(:get<AutoCreateReceiver>);
+my %Tracks_of :ATTR(:get<Tracks>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceToken
+        AutoCreateReceiver
+        Tracks
+        Extension
+
+    ) ],
+    {
+        'SourceToken' => \%SourceToken_of,
+        'AutoCreateReceiver' => \%AutoCreateReceiver_of,
+        'Tracks' => \%Tracks_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'SourceToken' => 'ONVIF::Analytics::Types::SourceReference',
+        'AutoCreateReceiver' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Tracks' => 'ONVIF::Analytics::Types::RecordingJobTrack',
+        'Extension' => 'ONVIF::Analytics::Types::RecordingJobSourceExtension',
+    },
+    {
+
+        'SourceToken' => 'SourceToken',
+        'AutoCreateReceiver' => 'AutoCreateReceiver',
+        'Tracks' => 'Tracks',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobSource from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+=item * AutoCreateReceiver
+
+
+=item * Tracks
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobSource
+   SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+     Token => $some_value, # ReferenceToken
+   },
+   AutoCreateReceiver =>  $some_value, # boolean
+   Tracks =>  { # ONVIF::Analytics::Types::RecordingJobTrack
+     SourceTag =>  $some_value, # string
+     Destination => $some_value, # TrackReference
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm
new file mode 100644
index 000000000..f4ba87152
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobSourceExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RecordingJobSourceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobSourceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobSourceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobSourceExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm
new file mode 100644
index 000000000..30a799e3b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingJobState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingJobState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm
new file mode 100644
index 000000000..2c3e60f8a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformation.pm
@@ -0,0 +1,144 @@
+package ONVIF::Analytics::Types::RecordingJobStateInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RecordingToken_of :ATTR(:get<RecordingToken>);
+my %State_of :ATTR(:get<State>);
+my %Sources_of :ATTR(:get<Sources>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RecordingToken
+        State
+        Sources
+        Extension
+
+    ) ],
+    {
+        'RecordingToken' => \%RecordingToken_of,
+        'State' => \%State_of,
+        'Sources' => \%Sources_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RecordingToken' => 'ONVIF::Analytics::Types::RecordingReference',
+        'State' => 'ONVIF::Analytics::Types::RecordingJobState',
+        'Sources' => 'ONVIF::Analytics::Types::RecordingJobStateSource',
+        'Extension' => 'ONVIF::Analytics::Types::RecordingJobStateInformationExtension',
+    },
+    {
+
+        'RecordingToken' => 'RecordingToken',
+        'State' => 'State',
+        'Sources' => 'Sources',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RecordingToken
+
+
+=item * State
+
+
+=item * Sources
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateInformation
+   RecordingToken => $some_value, # RecordingReference
+   State => $some_value, # RecordingJobState
+   Sources =>  { # ONVIF::Analytics::Types::RecordingJobStateSource
+     SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+       Token => $some_value, # ReferenceToken
+     },
+     State => $some_value, # RecordingJobState
+     Tracks =>  { # ONVIF::Analytics::Types::RecordingJobStateTracks
+       Track =>  { # ONVIF::Analytics::Types::RecordingJobStateTrack
+         SourceTag =>  $some_value, # string
+         Destination => $some_value, # TrackReference
+         Error =>  $some_value, # string
+         State => $some_value, # RecordingJobState
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RecordingJobStateInformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm
new file mode 100644
index 000000000..849778fa5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateInformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RecordingJobStateInformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateInformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateInformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateInformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm
new file mode 100644
index 000000000..0c57fe796
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateSource.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::RecordingJobStateSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceToken_of :ATTR(:get<SourceToken>);
+my %State_of :ATTR(:get<State>);
+my %Tracks_of :ATTR(:get<Tracks>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceToken
+        State
+        Tracks
+
+    ) ],
+    {
+        'SourceToken' => \%SourceToken_of,
+        'State' => \%State_of,
+        'Tracks' => \%Tracks_of,
+    },
+    {
+        'SourceToken' => 'ONVIF::Analytics::Types::SourceReference',
+        'State' => 'ONVIF::Analytics::Types::RecordingJobState',
+        'Tracks' => 'ONVIF::Analytics::Types::RecordingJobStateTracks',
+    },
+    {
+
+        'SourceToken' => 'SourceToken',
+        'State' => 'State',
+        'Tracks' => 'Tracks',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateSource from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+=item * State
+
+
+=item * Tracks
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateSource
+   SourceToken =>  { # ONVIF::Analytics::Types::SourceReference
+     Token => $some_value, # ReferenceToken
+   },
+   State => $some_value, # RecordingJobState
+   Tracks =>  { # ONVIF::Analytics::Types::RecordingJobStateTracks
+     Track =>  { # ONVIF::Analytics::Types::RecordingJobStateTrack
+       SourceTag =>  $some_value, # string
+       Destination => $some_value, # TrackReference
+       Error =>  $some_value, # string
+       State => $some_value, # RecordingJobState
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm
new file mode 100644
index 000000000..0fae234e3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTrack.pm
@@ -0,0 +1,130 @@
+package ONVIF::Analytics::Types::RecordingJobStateTrack;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceTag_of :ATTR(:get<SourceTag>);
+my %Destination_of :ATTR(:get<Destination>);
+my %Error_of :ATTR(:get<Error>);
+my %State_of :ATTR(:get<State>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceTag
+        Destination
+        Error
+        State
+
+    ) ],
+    {
+        'SourceTag' => \%SourceTag_of,
+        'Destination' => \%Destination_of,
+        'Error' => \%Error_of,
+        'State' => \%State_of,
+    },
+    {
+        'SourceTag' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Destination' => 'ONVIF::Analytics::Types::TrackReference',
+        'Error' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'State' => 'ONVIF::Analytics::Types::RecordingJobState',
+    },
+    {
+
+        'SourceTag' => 'SourceTag',
+        'Destination' => 'Destination',
+        'Error' => 'Error',
+        'State' => 'State',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateTrack
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateTrack from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceTag
+
+
+=item * Destination
+
+
+=item * Error
+
+
+=item * State
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateTrack
+   SourceTag =>  $some_value, # string
+   Destination => $some_value, # TrackReference
+   Error =>  $some_value, # string
+   State => $some_value, # RecordingJobState
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm
new file mode 100644
index 000000000..e7f1acd98
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobStateTracks.pm
@@ -0,0 +1,108 @@
+package ONVIF::Analytics::Types::RecordingJobStateTracks;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Track_of :ATTR(:get<Track>);
+
+__PACKAGE__->_factory(
+    [ qw(        Track
+
+    ) ],
+    {
+        'Track' => \%Track_of,
+    },
+    {
+        'Track' => 'ONVIF::Analytics::Types::RecordingJobStateTrack',
+    },
+    {
+
+        'Track' => 'Track',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobStateTracks
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobStateTracks from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Track
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobStateTracks
+   Track =>  { # ONVIF::Analytics::Types::RecordingJobStateTrack
+     SourceTag =>  $some_value, # string
+     Destination => $some_value, # TrackReference
+     Error =>  $some_value, # string
+     State => $some_value, # RecordingJobState
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm
new file mode 100644
index 000000000..1c9a13e5b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingJobTrack.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::RecordingJobTrack;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceTag_of :ATTR(:get<SourceTag>);
+my %Destination_of :ATTR(:get<Destination>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceTag
+        Destination
+
+    ) ],
+    {
+        'SourceTag' => \%SourceTag_of,
+        'Destination' => \%Destination_of,
+    },
+    {
+        'SourceTag' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Destination' => 'ONVIF::Analytics::Types::TrackReference',
+    },
+    {
+
+        'SourceTag' => 'SourceTag',
+        'Destination' => 'Destination',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingJobTrack
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingJobTrack from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceTag
+
+
+=item * Destination
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingJobTrack
+   SourceTag =>  $some_value, # string
+   Destination => $some_value, # TrackReference
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm
new file mode 100644
index 000000000..d9a277699
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm
new file mode 100644
index 000000000..b68d50d33
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSourceInformation.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::RecordingSourceInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SourceId_of :ATTR(:get<SourceId>);
+my %Name_of :ATTR(:get<Name>);
+my %Location_of :ATTR(:get<Location>);
+my %Description_of :ATTR(:get<Description>);
+my %Address_of :ATTR(:get<Address>);
+
+__PACKAGE__->_factory(
+    [ qw(        SourceId
+        Name
+        Location
+        Description
+        Address
+
+    ) ],
+    {
+        'SourceId' => \%SourceId_of,
+        'Name' => \%Name_of,
+        'Location' => \%Location_of,
+        'Description' => \%Description_of,
+        'Address' => \%Address_of,
+    },
+    {
+        'SourceId' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'Location' => 'ONVIF::Analytics::Types::Description',
+        'Description' => 'ONVIF::Analytics::Types::Description',
+        'Address' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'SourceId' => 'SourceId',
+        'Name' => 'Name',
+        'Location' => 'Location',
+        'Description' => 'Description',
+        'Address' => 'Address',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingSourceInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingSourceInformation from the namespace http://www.onvif.org/ver10/schema.
+
+A set of informative desciptions of a data source. The Search searvice allows a client to filter on recordings based on information in this structure. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceId
+
+
+=item * Name
+
+
+=item * Location
+
+
+=item * Description
+
+
+=item * Address
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingSourceInformation
+   SourceId =>  $some_value, # anyURI
+   Name => $some_value, # Name
+   Location => $some_value, # Description
+   Description => $some_value, # Description
+   Address =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm
new file mode 100644
index 000000000..7ba3fed1f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingStatus.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RecordingStatus;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RecordingStatus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm
new file mode 100644
index 000000000..c53b402ce
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RecordingSummary.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RecordingSummary;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DataFrom_of :ATTR(:get<DataFrom>);
+my %DataUntil_of :ATTR(:get<DataUntil>);
+my %NumberRecordings_of :ATTR(:get<NumberRecordings>);
+
+__PACKAGE__->_factory(
+    [ qw(        DataFrom
+        DataUntil
+        NumberRecordings
+
+    ) ],
+    {
+        'DataFrom' => \%DataFrom_of,
+        'DataUntil' => \%DataUntil_of,
+        'NumberRecordings' => \%NumberRecordings_of,
+    },
+    {
+        'DataFrom' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'DataUntil' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'NumberRecordings' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'DataFrom' => 'DataFrom',
+        'DataUntil' => 'DataUntil',
+        'NumberRecordings' => 'NumberRecordings',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RecordingSummary
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RecordingSummary from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DataFrom
+
+
+=item * DataUntil
+
+
+=item * NumberRecordings
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RecordingSummary
+   DataFrom =>  $some_value, # dateTime
+   DataUntil =>  $some_value, # dateTime
+   NumberRecordings =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm
new file mode 100644
index 000000000..180c2081b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Rectangle.pm
@@ -0,0 +1,155 @@
+package ONVIF::Analytics::Types::Rectangle;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Rectangle::_Rectangle::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Rectangle::_Rectangle::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %bottom_of :ATTR(:get<bottom>);
+my %top_of :ATTR(:get<top>);
+my %right_of :ATTR(:get<right>);
+my %left_of :ATTR(:get<left>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        bottom
+        top
+        right
+        left
+    ) ],
+    {
+
+        bottom => \%bottom_of,
+
+        top => \%top_of,
+
+        right => \%right_of,
+
+        left => \%left_of,
+    },
+    {
+        bottom => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        top => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        right => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        left => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Rectangle
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Rectangle from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Rectangle::_Rectangle::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * bottom
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * top
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * right
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * left
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm
new file mode 100644
index 000000000..b77ccfd7c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReferenceToken.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReferenceToken;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReferenceToken from the namespace http://www.onvif.org/ver10/schema.
+
+Unique identifier for a physical or logical resource. Tokens should be assigned such that they are unique within a device. Tokens must be at least unique within its class. Length up to 64 characters.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm
new file mode 100644
index 000000000..a111f5d6a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocus.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::RelativeFocus;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Distance_of :ATTR(:get<Distance>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Distance
+        Speed
+
+    ) ],
+    {
+        'Distance' => \%Distance_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Distance' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Speed' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Distance' => 'Distance',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelativeFocus
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelativeFocus from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Distance
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelativeFocus
+   Distance =>  $some_value, # float
+   Speed =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm
new file mode 100644
index 000000000..47ba1237d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::RelativeFocusOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Distance_of :ATTR(:get<Distance>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Distance
+        Speed
+
+    ) ],
+    {
+        'Distance' => \%Distance_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Distance' => 'ONVIF::Analytics::Types::FloatRange',
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Distance' => 'Distance',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelativeFocusOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelativeFocusOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Distance
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelativeFocusOptions
+   Distance =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm
new file mode 100644
index 000000000..81e706fab
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelativeFocusOptions20.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::RelativeFocusOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Distance_of :ATTR(:get<Distance>);
+my %Speed_of :ATTR(:get<Speed>);
+
+__PACKAGE__->_factory(
+    [ qw(        Distance
+        Speed
+
+    ) ],
+    {
+        'Distance' => \%Distance_of,
+        'Speed' => \%Speed_of,
+    },
+    {
+        'Distance' => 'ONVIF::Analytics::Types::FloatRange',
+        'Speed' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Distance' => 'Distance',
+        'Speed' => 'Speed',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelativeFocusOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelativeFocusOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Distance
+
+
+=item * Speed
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelativeFocusOptions20
+   Distance =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Speed =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm
new file mode 100644
index 000000000..b59b35f86
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayIdleState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RelayIdleState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelayIdleState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm
new file mode 100644
index 000000000..14e4a2776
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayLogicalState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RelayLogicalState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelayLogicalState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm
new file mode 100644
index 000000000..67cb69d00
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RelayMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelayMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm
new file mode 100644
index 000000000..da73c5508
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutput.pm
@@ -0,0 +1,110 @@
+package ONVIF::Analytics::Types::RelayOutput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Properties_of :ATTR(:get<Properties>);
+
+__PACKAGE__->_factory(
+    [ qw(        Properties
+
+    ) ],
+    {
+        'Properties' => \%Properties_of,
+    },
+    {
+        'Properties' => 'ONVIF::Analytics::Types::RelayOutputSettings',
+    },
+    {
+
+        'Properties' => 'Properties',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelayOutput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelayOutput from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Properties
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelayOutput
+   Properties =>  { # ONVIF::Analytics::Types::RelayOutputSettings
+     Mode => $some_value, # RelayMode
+     DelayTime =>  $some_value, # duration
+     IdleState => $some_value, # RelayIdleState
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm
new file mode 100644
index 000000000..b0b942587
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RelayOutputSettings.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RelayOutputSettings;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %DelayTime_of :ATTR(:get<DelayTime>);
+my %IdleState_of :ATTR(:get<IdleState>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        DelayTime
+        IdleState
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'DelayTime' => \%DelayTime_of,
+        'IdleState' => \%IdleState_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::RelayMode',
+        'DelayTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+        'IdleState' => 'ONVIF::Analytics::Types::RelayIdleState',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'DelayTime' => 'DelayTime',
+        'IdleState' => 'IdleState',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RelayOutputSettings
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RelayOutputSettings from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * DelayTime
+
+
+=item * IdleState
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RelayOutputSettings
+   Mode => $some_value, # RelayMode
+   DelayTime =>  $some_value, # duration
+   IdleState => $some_value, # RelayIdleState
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm
new file mode 100644
index 000000000..5d4ee46c7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RemoteUser.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RemoteUser;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Username_of :ATTR(:get<Username>);
+my %Password_of :ATTR(:get<Password>);
+my %UseDerivedPassword_of :ATTR(:get<UseDerivedPassword>);
+
+__PACKAGE__->_factory(
+    [ qw(        Username
+        Password
+        UseDerivedPassword
+
+    ) ],
+    {
+        'Username' => \%Username_of,
+        'Password' => \%Password_of,
+        'UseDerivedPassword' => \%UseDerivedPassword_of,
+    },
+    {
+        'Username' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Password' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'UseDerivedPassword' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Username' => 'Username',
+        'Password' => 'Password',
+        'UseDerivedPassword' => 'UseDerivedPassword',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RemoteUser
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RemoteUser from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Username
+
+
+=item * Password
+
+
+=item * UseDerivedPassword
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RemoteUser
+   Username =>  $some_value, # string
+   Password =>  $some_value, # string
+   UseDerivedPassword =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm
new file mode 100644
index 000000000..07c215e38
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Rename.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Rename;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %from_of :ATTR(:get<from>);
+my %to_of :ATTR(:get<to>);
+
+__PACKAGE__->_factory(
+    [ qw(        from
+        to
+
+    ) ],
+    {
+        'from' => \%from_of,
+        'to' => \%to_of,
+    },
+    {
+        'from' => 'ONVIF::Analytics::Types::ObjectId',
+        'to' => 'ONVIF::Analytics::Types::ObjectId',
+    },
+    {
+
+        'from' => 'from',
+        'to' => 'to',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Rename
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Rename from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * from
+
+
+=item * to
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Rename
+   from => ,
+   to => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm
new file mode 100644
index 000000000..94c73655a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayCapabilities.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ReplayCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReplayCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReplayCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReplayCapabilities
+   XAddr =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm
new file mode 100644
index 000000000..9ae67956e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReplayConfiguration.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::ReplayConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        SessionTimeout
+
+    ) ],
+    {
+        'SessionTimeout' => \%SessionTimeout_of,
+    },
+    {
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'SessionTimeout' => 'SessionTimeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReplayConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReplayConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+Configuration parameters for the replay service. 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SessionTimeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReplayConfiguration
+   SessionTimeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm
new file mode 100644
index 000000000..54e9fe9f5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Reverse.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Reverse;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ReverseMode',
+    },
+    {
+
+        'Mode' => 'Mode',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Reverse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Reverse from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Reverse
+   Mode => $some_value, # ReverseMode
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm
new file mode 100644
index 000000000..4380cfb3a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ReverseMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ReverseMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm
new file mode 100644
index 000000000..ba4cc93f1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptions.pm
@@ -0,0 +1,113 @@
+package ONVIF::Analytics::Types::ReverseOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::ReverseMode',
+        'Extension' => 'ONVIF::Analytics::Types::ReverseOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReverseOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReverseOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReverseOptions
+   Mode => $some_value, # ReverseMode
+   Extension =>  { # ONVIF::Analytics::Types::ReverseOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm
new file mode 100644
index 000000000..540fabd6c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ReverseOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ReverseOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ReverseOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReverseOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ReverseOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm
new file mode 100644
index 000000000..801082f56
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Rotate.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::Rotate;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Degree_of :ATTR(:get<Degree>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Degree
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Degree' => \%Degree_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::RotateMode',
+        'Degree' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Extension' => 'ONVIF::Analytics::Types::RotateExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Degree' => 'Degree',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Rotate
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Rotate from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Degree
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Rotate
+   Mode => $some_value, # RotateMode
+   Degree =>  $some_value, # int
+   Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm
new file mode 100644
index 000000000..8fe572d08
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RotateExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RotateExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RotateExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RotateExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm
new file mode 100644
index 000000000..f6f09f30b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::RotateMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RotateMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm
new file mode 100644
index 000000000..3af81f8a2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptions.pm
@@ -0,0 +1,124 @@
+package ONVIF::Analytics::Types::RotateOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %DegreeList_of :ATTR(:get<DegreeList>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        DegreeList
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'DegreeList' => \%DegreeList_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::RotateMode',
+        'DegreeList' => 'ONVIF::Analytics::Types::IntList',
+        'Extension' => 'ONVIF::Analytics::Types::RotateOptionsExtension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'DegreeList' => 'DegreeList',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RotateOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RotateOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * DegreeList
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RotateOptions
+   Mode => $some_value, # RotateMode
+   DegreeList =>  { # ONVIF::Analytics::Types::IntList
+     Items =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RotateOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm
new file mode 100644
index 000000000..6f12f5898
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RotateOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RotateOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RotateOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RotateOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RotateOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm
new file mode 100644
index 000000000..9a2ddcfc3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfiguration.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::RuleEngineConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rule_of :ATTR(:get<Rule>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rule
+        Extension
+
+    ) ],
+    {
+        'Rule' => \%Rule_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rule' => 'ONVIF::Analytics::Types::Config',
+        'Extension' => 'ONVIF::Analytics::Types::RuleEngineConfigurationExtension',
+    },
+    {
+
+        'Rule' => 'Rule',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RuleEngineConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RuleEngineConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rule
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RuleEngineConfiguration
+   Rule =>  { # ONVIF::Analytics::Types::Config
+     Parameters =>  { # ONVIF::Analytics::Types::ItemList
+       SimpleItem => ,
+       ElementItem =>  {
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm
new file mode 100644
index 000000000..6664059e1
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/RuleEngineConfigurationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::RuleEngineConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RuleEngineConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm
new file mode 100644
index 000000000..9976def16
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Scope.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Scope;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ScopeDef_of :ATTR(:get<ScopeDef>);
+my %ScopeItem_of :ATTR(:get<ScopeItem>);
+
+__PACKAGE__->_factory(
+    [ qw(        ScopeDef
+        ScopeItem
+
+    ) ],
+    {
+        'ScopeDef' => \%ScopeDef_of,
+        'ScopeItem' => \%ScopeItem_of,
+    },
+    {
+        'ScopeDef' => 'ONVIF::Analytics::Types::ScopeDefinition',
+        'ScopeItem' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'ScopeDef' => 'ScopeDef',
+        'ScopeItem' => 'ScopeItem',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Scope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Scope from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ScopeDef
+
+
+=item * ScopeItem
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Scope
+   ScopeDef => $some_value, # ScopeDefinition
+   ScopeItem =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm
new file mode 100644
index 000000000..947a12244
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ScopeDefinition.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::ScopeDefinition;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ScopeDefinition from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm
new file mode 100644
index 000000000..dac0bff4a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchCapabilities.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::SearchCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %XAddr_of :ATTR(:get<XAddr>);
+my %MetadataSearch_of :ATTR(:get<MetadataSearch>);
+
+__PACKAGE__->_factory(
+    [ qw(        XAddr
+        MetadataSearch
+
+    ) ],
+    {
+        'XAddr' => \%XAddr_of,
+        'MetadataSearch' => \%MetadataSearch_of,
+    },
+    {
+        'XAddr' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'MetadataSearch' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'XAddr' => 'XAddr',
+        'MetadataSearch' => 'MetadataSearch',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SearchCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SearchCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * XAddr
+
+
+=item * MetadataSearch
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SearchCapabilities
+   XAddr =>  $some_value, # anyURI
+   MetadataSearch =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm
new file mode 100644
index 000000000..c46182384
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScope.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::SearchScope;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %IncludedSources_of :ATTR(:get<IncludedSources>);
+my %IncludedRecordings_of :ATTR(:get<IncludedRecordings>);
+my %RecordingInformationFilter_of :ATTR(:get<RecordingInformationFilter>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        IncludedSources
+        IncludedRecordings
+        RecordingInformationFilter
+        Extension
+
+    ) ],
+    {
+        'IncludedSources' => \%IncludedSources_of,
+        'IncludedRecordings' => \%IncludedRecordings_of,
+        'RecordingInformationFilter' => \%RecordingInformationFilter_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'IncludedSources' => 'ONVIF::Analytics::Types::SourceReference',
+        'IncludedRecordings' => 'ONVIF::Analytics::Types::RecordingReference',
+        'RecordingInformationFilter' => 'ONVIF::Analytics::Types::XPathExpression',
+        'Extension' => 'ONVIF::Analytics::Types::SearchScopeExtension',
+    },
+    {
+
+        'IncludedSources' => 'IncludedSources',
+        'IncludedRecordings' => 'IncludedRecordings',
+        'RecordingInformationFilter' => 'RecordingInformationFilter',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SearchScope
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SearchScope from the namespace http://www.onvif.org/ver10/schema.
+
+A structure for defining a limited scope when searching in recorded data.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * IncludedSources
+
+
+=item * IncludedRecordings
+
+
+=item * RecordingInformationFilter
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SearchScope
+   IncludedSources =>  { # ONVIF::Analytics::Types::SourceReference
+     Token => $some_value, # ReferenceToken
+   },
+   IncludedRecordings => $some_value, # RecordingReference
+   RecordingInformationFilter => $some_value, # XPathExpression
+   Extension =>  { # ONVIF::Analytics::Types::SearchScopeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm
new file mode 100644
index 000000000..44678bce2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchScopeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SearchScopeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SearchScopeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SearchScopeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SearchScopeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm
new file mode 100644
index 000000000..f5e52a857
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SearchState.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::SearchState;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SearchState from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm
new file mode 100644
index 000000000..88206f48a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilities.pm
@@ -0,0 +1,200 @@
+package ONVIF::Analytics::Types::SecurityCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TLS1__1_of :ATTR(:get<TLS1__1>);
+my %TLS1__2_of :ATTR(:get<TLS1__2>);
+my %OnboardKeyGeneration_of :ATTR(:get<OnboardKeyGeneration>);
+my %AccessPolicyConfig_of :ATTR(:get<AccessPolicyConfig>);
+my %X__509Token_of :ATTR(:get<X__509Token>);
+my %SAMLToken_of :ATTR(:get<SAMLToken>);
+my %KerberosToken_of :ATTR(:get<KerberosToken>);
+my %RELToken_of :ATTR(:get<RELToken>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TLS1__1
+        TLS1__2
+        OnboardKeyGeneration
+        AccessPolicyConfig
+        X__509Token
+        SAMLToken
+        KerberosToken
+        RELToken
+        Extension
+
+    ) ],
+    {
+        'TLS1__1' => \%TLS1__1_of,
+        'TLS1__2' => \%TLS1__2_of,
+        'OnboardKeyGeneration' => \%OnboardKeyGeneration_of,
+        'AccessPolicyConfig' => \%AccessPolicyConfig_of,
+        'X__509Token' => \%X__509Token_of,
+        'SAMLToken' => \%SAMLToken_of,
+        'KerberosToken' => \%KerberosToken_of,
+        'RELToken' => \%RELToken_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TLS1__1' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'TLS1__2' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'OnboardKeyGeneration' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'AccessPolicyConfig' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'X__509Token' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SAMLToken' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'KerberosToken' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RELToken' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::SecurityCapabilitiesExtension',
+    },
+    {
+
+        'TLS1__1' => 'TLS1.1',
+        'TLS1__2' => 'TLS1.2',
+        'OnboardKeyGeneration' => 'OnboardKeyGeneration',
+        'AccessPolicyConfig' => 'AccessPolicyConfig',
+        'X__509Token' => 'X.509Token',
+        'SAMLToken' => 'SAMLToken',
+        'KerberosToken' => 'KerberosToken',
+        'RELToken' => 'RELToken',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SecurityCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TLS1__1
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ TLS1.1
+
+
+=item * TLS1__2
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ TLS1.2
+
+
+=item * OnboardKeyGeneration
+
+
+=item * AccessPolicyConfig
+
+
+=item * X__509Token
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ X.509Token
+
+
+=item * SAMLToken
+
+
+=item * KerberosToken
+
+
+=item * RELToken
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SecurityCapabilities
+   TLS1__1 =>  $some_value, # boolean
+   TLS1__2 =>  $some_value, # boolean
+   OnboardKeyGeneration =>  $some_value, # boolean
+   AccessPolicyConfig =>  $some_value, # boolean
+   X__509Token =>  $some_value, # boolean
+   SAMLToken =>  $some_value, # boolean
+   KerberosToken =>  $some_value, # boolean
+   RELToken =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+     TLS1__0 =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+       Dot1X =>  $some_value, # boolean
+       SupportedEAPMethod =>  $some_value, # int
+       RemoteUserHandling =>  $some_value, # boolean
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm
new file mode 100644
index 000000000..5ddfe67d4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::SecurityCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TLS1__0_of :ATTR(:get<TLS1__0>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TLS1__0
+        Extension
+
+    ) ],
+    {
+        'TLS1__0' => \%TLS1__0_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TLS1__0' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::SecurityCapabilitiesExtension2',
+    },
+    {
+
+        'TLS1__0' => 'TLS1.0',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TLS1__0
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ TLS1.0
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension
+   TLS1__0 =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+     Dot1X =>  $some_value, # boolean
+     SupportedEAPMethod =>  $some_value, # int
+     RemoteUserHandling =>  $some_value, # boolean
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm
new file mode 100644
index 000000000..51498a5e6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SecurityCapabilitiesExtension2.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::SecurityCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Dot1X_of :ATTR(:get<Dot1X>);
+my %SupportedEAPMethod_of :ATTR(:get<SupportedEAPMethod>);
+my %RemoteUserHandling_of :ATTR(:get<RemoteUserHandling>);
+
+__PACKAGE__->_factory(
+    [ qw(        Dot1X
+        SupportedEAPMethod
+        RemoteUserHandling
+
+    ) ],
+    {
+        'Dot1X' => \%Dot1X_of,
+        'SupportedEAPMethod' => \%SupportedEAPMethod_of,
+        'RemoteUserHandling' => \%RemoteUserHandling_of,
+    },
+    {
+        'Dot1X' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SupportedEAPMethod' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'RemoteUserHandling' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    },
+    {
+
+        'Dot1X' => 'Dot1X',
+        'SupportedEAPMethod' => 'SupportedEAPMethod',
+        'RemoteUserHandling' => 'RemoteUserHandling',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SecurityCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Dot1X
+
+
+=item * SupportedEAPMethod
+
+
+=item * RemoteUserHandling
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SecurityCapabilitiesExtension2
+   Dot1X =>  $some_value, # boolean
+   SupportedEAPMethod =>  $some_value, # int
+   RemoteUserHandling =>  $some_value, # boolean
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm
new file mode 100644
index 000000000..c1e2add46
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SetDateTimeType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::SetDateTimeType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SetDateTimeType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm
new file mode 100644
index 000000000..a974ed995
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptor.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::ShapeDescriptor;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundingBox_of :ATTR(:get<BoundingBox>);
+my %CenterOfGravity_of :ATTR(:get<CenterOfGravity>);
+my %Polygon_of :ATTR(:get<Polygon>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundingBox
+        CenterOfGravity
+        Polygon
+        Extension
+
+    ) ],
+    {
+        'BoundingBox' => \%BoundingBox_of,
+        'CenterOfGravity' => \%CenterOfGravity_of,
+        'Polygon' => \%Polygon_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundingBox' => 'ONVIF::Analytics::Types::Rectangle',
+        'CenterOfGravity' => 'ONVIF::Analytics::Types::Vector',
+        'Polygon' => 'ONVIF::Analytics::Types::Polygon',
+        'Extension' => 'ONVIF::Analytics::Types::ShapeDescriptorExtension',
+    },
+    {
+
+        'BoundingBox' => 'BoundingBox',
+        'CenterOfGravity' => 'CenterOfGravity',
+        'Polygon' => 'Polygon',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ShapeDescriptor
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ShapeDescriptor from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundingBox
+
+
+=item * CenterOfGravity
+
+
+=item * Polygon
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ShapeDescriptor
+   BoundingBox => ,
+   CenterOfGravity => ,
+   Polygon =>  { # ONVIF::Analytics::Types::Polygon
+     Point => ,
+   },
+   Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm
new file mode 100644
index 000000000..5d1f7aca0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ShapeDescriptorExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::ShapeDescriptorExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ShapeDescriptorExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ShapeDescriptorExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm
new file mode 100644
index 000000000..b7374df75
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentification.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::SourceIdentification;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %Token_of :ATTR(:get<Token>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        Token
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'Token' => \%Token_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::SourceIdentificationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'Token' => 'Token',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SourceIdentification
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SourceIdentification from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Name
+
+
+=item * Token
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SourceIdentification
+   Name =>  $some_value, # string
+   Token => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::SourceIdentificationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm
new file mode 100644
index 000000000..df00c4a61
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceIdentificationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SourceIdentificationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SourceIdentificationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SourceIdentificationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SourceIdentificationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm
new file mode 100644
index 000000000..4944eedd9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SourceReference.pm
@@ -0,0 +1,148 @@
+package ONVIF::Analytics::Types::SourceReference;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::SourceReference::_SourceReference::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Token_of :ATTR(:get<Token>);
+
+__PACKAGE__->_factory(
+    [ qw(        Token
+
+    ) ],
+    {
+        'Token' => \%Token_of,
+    },
+    {
+        'Token' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'Token' => 'Token',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package ONVIF::Analytics::Types::SourceReference::_SourceReference::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Type
+    ) ],
+    {
+
+        Type => \%Type_of,
+    },
+    {
+        Type => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SourceReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SourceReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Token
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SourceReference
+   Token => $some_value, # ReferenceToken
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::SourceReference::_SourceReference::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Type
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm
new file mode 100644
index 000000000..1b602d932
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Space1DDescription.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::Space1DDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %URI_of :ATTR(:get<URI>);
+my %XRange_of :ATTR(:get<XRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        URI
+        XRange
+
+    ) ],
+    {
+        'URI' => \%URI_of,
+        'XRange' => \%XRange_of,
+    },
+    {
+        'URI' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'XRange' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'URI' => 'URI',
+        'XRange' => 'XRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Space1DDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Space1DDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * URI
+
+
+=item * XRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Space1DDescription
+   URI =>  $some_value, # anyURI
+   XRange =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm
new file mode 100644
index 000000000..c8a4bceea
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Space2DDescription.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::Space2DDescription;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %URI_of :ATTR(:get<URI>);
+my %XRange_of :ATTR(:get<XRange>);
+my %YRange_of :ATTR(:get<YRange>);
+
+__PACKAGE__->_factory(
+    [ qw(        URI
+        XRange
+        YRange
+
+    ) ],
+    {
+        'URI' => \%URI_of,
+        'XRange' => \%XRange_of,
+        'YRange' => \%YRange_of,
+    },
+    {
+        'URI' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'XRange' => 'ONVIF::Analytics::Types::FloatRange',
+        'YRange' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'URI' => 'URI',
+        'XRange' => 'XRange',
+        'YRange' => 'YRange',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Space2DDescription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Space2DDescription from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * URI
+
+
+=item * XRange
+
+
+=item * YRange
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Space2DDescription
+   URI =>  $some_value, # anyURI
+   XRange =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   YRange =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm
new file mode 100644
index 000000000..afc0d186e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Split.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::Split;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %from_of :ATTR(:get<from>);
+my %to_of :ATTR(:get<to>);
+
+__PACKAGE__->_factory(
+    [ qw(        from
+        to
+
+    ) ],
+    {
+        'from' => \%from_of,
+        'to' => \%to_of,
+    },
+    {
+        'from' => 'ONVIF::Analytics::Types::ObjectId',
+        'to' => 'ONVIF::Analytics::Types::ObjectId',
+    },
+    {
+
+        'from' => 'from',
+        'to' => 'to',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Split
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Split from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * from
+
+
+=item * to
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Split
+   from => ,
+   to => ,
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm
new file mode 100644
index 000000000..f466bff11
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamSetup.pm
@@ -0,0 +1,114 @@
+package ONVIF::Analytics::Types::StreamSetup;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Stream_of :ATTR(:get<Stream>);
+my %Transport_of :ATTR(:get<Transport>);
+
+__PACKAGE__->_factory(
+    [ qw(        Stream
+        Transport
+
+    ) ],
+    {
+        'Stream' => \%Stream_of,
+        'Transport' => \%Transport_of,
+    },
+    {
+        'Stream' => 'ONVIF::Analytics::Types::StreamType',
+        'Transport' => 'ONVIF::Analytics::Types::Transport',
+    },
+    {
+
+        'Stream' => 'Stream',
+        'Transport' => 'Transport',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::StreamSetup
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+StreamSetup from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Stream
+
+
+=item * Transport
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::StreamSetup
+   Stream => $some_value, # StreamType
+   Transport =>  { # ONVIF::Analytics::Types::Transport
+     Protocol => $some_value, # TransportProtocol
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm
new file mode 100644
index 000000000..c61236c97
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/StreamType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::StreamType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+StreamType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm
new file mode 100644
index 000000000..2443b43ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/StringAttrList.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::StringAttrList;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+StringAttrList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm
new file mode 100644
index 000000000..85006a054
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportInformation.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::SupportInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Binary_of :ATTR(:get<Binary>);
+my %String_of :ATTR(:get<String>);
+
+__PACKAGE__->_factory(
+    [ qw(        Binary
+        String
+
+    ) ],
+    {
+        'Binary' => \%Binary_of,
+        'String' => \%String_of,
+    },
+    {
+        'Binary' => 'ONVIF::Analytics::Types::AttachmentData',
+        'String' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Binary' => 'Binary',
+        'String' => 'String',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Binary
+
+
+=item * String
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportInformation
+   Binary =>  { # ONVIF::Analytics::Types::AttachmentData
+     Include =>  { # ONVIF::Analytics::Types::Include
+     },
+   },
+   String =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm
new file mode 100644
index 000000000..3ac211144
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModules.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::SupportedAnalyticsModules;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %AnalyticsModuleContentSchemaLocation_of :ATTR(:get<AnalyticsModuleContentSchemaLocation>);
+my %AnalyticsModuleDescription_of :ATTR(:get<AnalyticsModuleDescription>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        AnalyticsModuleContentSchemaLocation
+        AnalyticsModuleDescription
+        Extension
+
+    ) ],
+    {
+        'AnalyticsModuleContentSchemaLocation' => \%AnalyticsModuleContentSchemaLocation_of,
+        'AnalyticsModuleDescription' => \%AnalyticsModuleDescription_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'AnalyticsModuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'AnalyticsModuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+        'Extension' => 'ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension',
+    },
+    {
+
+        'AnalyticsModuleContentSchemaLocation' => 'AnalyticsModuleContentSchemaLocation',
+        'AnalyticsModuleDescription' => 'AnalyticsModuleDescription',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedAnalyticsModules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedAnalyticsModules from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsModuleContentSchemaLocation
+
+
+=item * AnalyticsModuleDescription
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedAnalyticsModules
+   AnalyticsModuleContentSchemaLocation =>  $some_value, # anyURI
+   AnalyticsModuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+     Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+       SimpleItemDescription => ,
+       ElementItemDescription => ,
+       Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+       },
+     },
+     Messages =>  {
+       ParentTopic =>  $some_value, # string
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm
new file mode 100644
index 000000000..1d2054c36
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedAnalyticsModulesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedAnalyticsModulesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedAnalyticsModulesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm
new file mode 100644
index 000000000..41555c585
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRules.pm
@@ -0,0 +1,134 @@
+package ONVIF::Analytics::Types::SupportedRules;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %RuleContentSchemaLocation_of :ATTR(:get<RuleContentSchemaLocation>);
+my %RuleDescription_of :ATTR(:get<RuleDescription>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        RuleContentSchemaLocation
+        RuleDescription
+        Extension
+
+    ) ],
+    {
+        'RuleContentSchemaLocation' => \%RuleContentSchemaLocation_of,
+        'RuleDescription' => \%RuleDescription_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'RuleContentSchemaLocation' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        'RuleDescription' => 'ONVIF::Analytics::Types::ConfigDescription',
+        'Extension' => 'ONVIF::Analytics::Types::SupportedRulesExtension',
+    },
+    {
+
+        'RuleContentSchemaLocation' => 'RuleContentSchemaLocation',
+        'RuleDescription' => 'RuleDescription',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedRules
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedRules from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * RuleContentSchemaLocation
+
+
+=item * RuleDescription
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedRules
+   RuleContentSchemaLocation =>  $some_value, # anyURI
+   RuleDescription =>  { # ONVIF::Analytics::Types::ConfigDescription
+     Parameters =>  { # ONVIF::Analytics::Types::ItemListDescription
+       SimpleItemDescription => ,
+       ElementItemDescription => ,
+       Extension =>  { # ONVIF::Analytics::Types::ItemListDescriptionExtension
+       },
+     },
+     Messages =>  {
+       ParentTopic =>  $some_value, # string
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ConfigDescriptionExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SupportedRulesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm
new file mode 100644
index 000000000..6d3f89691
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SupportedRulesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SupportedRulesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SupportedRulesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SupportedRulesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SupportedRulesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm
new file mode 100644
index 000000000..e3f34aca3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilities.pm
@@ -0,0 +1,176 @@
+package ONVIF::Analytics::Types::SystemCapabilities;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DiscoveryResolve_of :ATTR(:get<DiscoveryResolve>);
+my %DiscoveryBye_of :ATTR(:get<DiscoveryBye>);
+my %RemoteDiscovery_of :ATTR(:get<RemoteDiscovery>);
+my %SystemBackup_of :ATTR(:get<SystemBackup>);
+my %SystemLogging_of :ATTR(:get<SystemLogging>);
+my %FirmwareUpgrade_of :ATTR(:get<FirmwareUpgrade>);
+my %SupportedVersions_of :ATTR(:get<SupportedVersions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        DiscoveryResolve
+        DiscoveryBye
+        RemoteDiscovery
+        SystemBackup
+        SystemLogging
+        FirmwareUpgrade
+        SupportedVersions
+        Extension
+
+    ) ],
+    {
+        'DiscoveryResolve' => \%DiscoveryResolve_of,
+        'DiscoveryBye' => \%DiscoveryBye_of,
+        'RemoteDiscovery' => \%RemoteDiscovery_of,
+        'SystemBackup' => \%SystemBackup_of,
+        'SystemLogging' => \%SystemLogging_of,
+        'FirmwareUpgrade' => \%FirmwareUpgrade_of,
+        'SupportedVersions' => \%SupportedVersions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'DiscoveryResolve' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'DiscoveryBye' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'RemoteDiscovery' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SystemBackup' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SystemLogging' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'FirmwareUpgrade' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'SupportedVersions' => 'ONVIF::Analytics::Types::OnvifVersion',
+        'Extension' => 'ONVIF::Analytics::Types::SystemCapabilitiesExtension',
+    },
+    {
+
+        'DiscoveryResolve' => 'DiscoveryResolve',
+        'DiscoveryBye' => 'DiscoveryBye',
+        'RemoteDiscovery' => 'RemoteDiscovery',
+        'SystemBackup' => 'SystemBackup',
+        'SystemLogging' => 'SystemLogging',
+        'FirmwareUpgrade' => 'FirmwareUpgrade',
+        'SupportedVersions' => 'SupportedVersions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemCapabilities
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemCapabilities from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DiscoveryResolve
+
+
+=item * DiscoveryBye
+
+
+=item * RemoteDiscovery
+
+
+=item * SystemBackup
+
+
+=item * SystemLogging
+
+
+=item * FirmwareUpgrade
+
+
+=item * SupportedVersions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemCapabilities
+   DiscoveryResolve =>  $some_value, # boolean
+   DiscoveryBye =>  $some_value, # boolean
+   RemoteDiscovery =>  $some_value, # boolean
+   SystemBackup =>  $some_value, # boolean
+   SystemLogging =>  $some_value, # boolean
+   FirmwareUpgrade =>  $some_value, # boolean
+   SupportedVersions =>  { # ONVIF::Analytics::Types::OnvifVersion
+     Major =>  $some_value, # int
+     Minor =>  $some_value, # int
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension
+     HttpFirmwareUpgrade =>  $some_value, # boolean
+     HttpSystemBackup =>  $some_value, # boolean
+     HttpSystemLogging =>  $some_value, # boolean
+     HttpSupportInformation =>  $some_value, # boolean
+     Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm
new file mode 100644
index 000000000..4bf5cc0c6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension.pm
@@ -0,0 +1,140 @@
+package ONVIF::Analytics::Types::SystemCapabilitiesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %HttpFirmwareUpgrade_of :ATTR(:get<HttpFirmwareUpgrade>);
+my %HttpSystemBackup_of :ATTR(:get<HttpSystemBackup>);
+my %HttpSystemLogging_of :ATTR(:get<HttpSystemLogging>);
+my %HttpSupportInformation_of :ATTR(:get<HttpSupportInformation>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        HttpFirmwareUpgrade
+        HttpSystemBackup
+        HttpSystemLogging
+        HttpSupportInformation
+        Extension
+
+    ) ],
+    {
+        'HttpFirmwareUpgrade' => \%HttpFirmwareUpgrade_of,
+        'HttpSystemBackup' => \%HttpSystemBackup_of,
+        'HttpSystemLogging' => \%HttpSystemLogging_of,
+        'HttpSupportInformation' => \%HttpSupportInformation_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'HttpFirmwareUpgrade' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'HttpSystemBackup' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'HttpSystemLogging' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'HttpSupportInformation' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'Extension' => 'ONVIF::Analytics::Types::SystemCapabilitiesExtension2',
+    },
+    {
+
+        'HttpFirmwareUpgrade' => 'HttpFirmwareUpgrade',
+        'HttpSystemBackup' => 'HttpSystemBackup',
+        'HttpSystemLogging' => 'HttpSystemLogging',
+        'HttpSupportInformation' => 'HttpSupportInformation',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemCapabilitiesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemCapabilitiesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * HttpFirmwareUpgrade
+
+
+=item * HttpSystemBackup
+
+
+=item * HttpSystemLogging
+
+
+=item * HttpSupportInformation
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemCapabilitiesExtension
+   HttpFirmwareUpgrade =>  $some_value, # boolean
+   HttpSystemBackup =>  $some_value, # boolean
+   HttpSystemLogging =>  $some_value, # boolean
+   HttpSupportInformation =>  $some_value, # boolean
+   Extension =>  { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm
new file mode 100644
index 000000000..1067d599f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemCapabilitiesExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SystemCapabilitiesExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemCapabilitiesExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemCapabilitiesExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm
new file mode 100644
index 000000000..12d9cef01
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTime.pm
@@ -0,0 +1,173 @@
+package ONVIF::Analytics::Types::SystemDateTime;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %DateTimeType_of :ATTR(:get<DateTimeType>);
+my %DaylightSavings_of :ATTR(:get<DaylightSavings>);
+my %TimeZone_of :ATTR(:get<TimeZone>);
+my %UTCDateTime_of :ATTR(:get<UTCDateTime>);
+my %LocalDateTime_of :ATTR(:get<LocalDateTime>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        DateTimeType
+        DaylightSavings
+        TimeZone
+        UTCDateTime
+        LocalDateTime
+        Extension
+
+    ) ],
+    {
+        'DateTimeType' => \%DateTimeType_of,
+        'DaylightSavings' => \%DaylightSavings_of,
+        'TimeZone' => \%TimeZone_of,
+        'UTCDateTime' => \%UTCDateTime_of,
+        'LocalDateTime' => \%LocalDateTime_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'DateTimeType' => 'ONVIF::Analytics::Types::SetDateTimeType',
+        'DaylightSavings' => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+        'TimeZone' => 'ONVIF::Analytics::Types::TimeZone',
+        'UTCDateTime' => 'ONVIF::Analytics::Types::DateTime',
+        'LocalDateTime' => 'ONVIF::Analytics::Types::DateTime',
+        'Extension' => 'ONVIF::Analytics::Types::SystemDateTimeExtension',
+    },
+    {
+
+        'DateTimeType' => 'DateTimeType',
+        'DaylightSavings' => 'DaylightSavings',
+        'TimeZone' => 'TimeZone',
+        'UTCDateTime' => 'UTCDateTime',
+        'LocalDateTime' => 'LocalDateTime',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemDateTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemDateTime from the namespace http://www.onvif.org/ver10/schema.
+
+General date time inforamtion returned by the GetSystemDateTime method.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * DateTimeType
+
+
+=item * DaylightSavings
+
+
+=item * TimeZone
+
+
+=item * UTCDateTime
+
+
+=item * LocalDateTime
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemDateTime
+   DateTimeType => $some_value, # SetDateTimeType
+   DaylightSavings =>  $some_value, # boolean
+   TimeZone =>  { # ONVIF::Analytics::Types::TimeZone
+     TZ =>  $some_value, # token
+   },
+   UTCDateTime =>  { # ONVIF::Analytics::Types::DateTime
+     Time =>  { # ONVIF::Analytics::Types::Time
+       Hour =>  $some_value, # int
+       Minute =>  $some_value, # int
+       Second =>  $some_value, # int
+     },
+     Date =>  { # ONVIF::Analytics::Types::Date
+       Year =>  $some_value, # int
+       Month =>  $some_value, # int
+       Day =>  $some_value, # int
+     },
+   },
+   LocalDateTime =>  { # ONVIF::Analytics::Types::DateTime
+     Time =>  { # ONVIF::Analytics::Types::Time
+       Hour =>  $some_value, # int
+       Minute =>  $some_value, # int
+       Second =>  $some_value, # int
+     },
+     Date =>  { # ONVIF::Analytics::Types::Date
+       Year =>  $some_value, # int
+       Month =>  $some_value, # int
+       Day =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::SystemDateTimeExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm
new file mode 100644
index 000000000..646dc5ceb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemDateTimeExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::SystemDateTimeExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemDateTimeExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemDateTimeExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemDateTimeExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm
new file mode 100644
index 000000000..93670c674
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLog.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::SystemLog;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Binary_of :ATTR(:get<Binary>);
+my %String_of :ATTR(:get<String>);
+
+__PACKAGE__->_factory(
+    [ qw(        Binary
+        String
+
+    ) ],
+    {
+        'Binary' => \%Binary_of,
+        'String' => \%String_of,
+    },
+    {
+        'Binary' => 'ONVIF::Analytics::Types::AttachmentData',
+        'String' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+    },
+    {
+
+        'Binary' => 'Binary',
+        'String' => 'String',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemLog
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemLog from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Binary
+
+
+=item * String
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemLog
+   Binary =>  { # ONVIF::Analytics::Types::AttachmentData
+     Include =>  { # ONVIF::Analytics::Types::Include
+     },
+   },
+   String =>  $some_value, # string
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm
new file mode 100644
index 000000000..22b7f6fd0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::SystemLogType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SystemLogType from the namespace http://www.onvif.org/ver10/schema.
+
+Enumeration describing the available system log modes.
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm
new file mode 100644
index 000000000..8f01e4703
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUri.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::SystemLogUri;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Type_of :ATTR(:get<Type>);
+my %Uri_of :ATTR(:get<Uri>);
+
+__PACKAGE__->_factory(
+    [ qw(        Type
+        Uri
+
+    ) ],
+    {
+        'Type' => \%Type_of,
+        'Uri' => \%Uri_of,
+    },
+    {
+        'Type' => 'ONVIF::Analytics::Types::SystemLogType',
+        'Uri' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    },
+    {
+
+        'Type' => 'Type',
+        'Uri' => 'Uri',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemLogUri
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemLogUri from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Type
+
+
+=item * Uri
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemLogUri
+   Type => $some_value, # SystemLogType
+   Uri =>  $some_value, # anyURI
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm
new file mode 100644
index 000000000..01dd73bc6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/SystemLogUriList.pm
@@ -0,0 +1,106 @@
+package ONVIF::Analytics::Types::SystemLogUriList;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SystemLog_of :ATTR(:get<SystemLog>);
+
+__PACKAGE__->_factory(
+    [ qw(        SystemLog
+
+    ) ],
+    {
+        'SystemLog' => \%SystemLog_of,
+    },
+    {
+        'SystemLog' => 'ONVIF::Analytics::Types::SystemLogUri',
+    },
+    {
+
+        'SystemLog' => 'SystemLog',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::SystemLogUriList
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SystemLogUriList from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SystemLog
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::SystemLogUriList
+   SystemLog =>  { # ONVIF::Analytics::Types::SystemLogUri
+     Type => $some_value, # SystemLogType
+     Uri =>  $some_value, # anyURI
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm
new file mode 100644
index 000000000..9114975ac
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TLSConfiguration.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::TLSConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %CertificateID_of :ATTR(:get<CertificateID>);
+
+__PACKAGE__->_factory(
+    [ qw(        CertificateID
+
+    ) ],
+    {
+        'CertificateID' => \%CertificateID_of,
+    },
+    {
+        'CertificateID' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+    },
+    {
+
+        'CertificateID' => 'CertificateID',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TLSConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TLSConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * CertificateID
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TLSConfiguration
+   CertificateID =>  $some_value, # token
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm
new file mode 100644
index 000000000..fe87c8c6b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Time.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::Time;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Hour_of :ATTR(:get<Hour>);
+my %Minute_of :ATTR(:get<Minute>);
+my %Second_of :ATTR(:get<Second>);
+
+__PACKAGE__->_factory(
+    [ qw(        Hour
+        Minute
+        Second
+
+    ) ],
+    {
+        'Hour' => \%Hour_of,
+        'Minute' => \%Minute_of,
+        'Second' => \%Second_of,
+    },
+    {
+        'Hour' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Minute' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Second' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Hour' => 'Hour',
+        'Minute' => 'Minute',
+        'Second' => 'Second',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Time
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Time from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Hour
+
+
+=item * Minute
+
+
+=item * Second
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Time
+   Hour =>  $some_value, # int
+   Minute =>  $some_value, # int
+   Second =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm
new file mode 100644
index 000000000..670e61144
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TimeZone.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::TimeZone;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TZ_of :ATTR(:get<TZ>);
+
+__PACKAGE__->_factory(
+    [ qw(        TZ
+
+    ) ],
+    {
+        'TZ' => \%TZ_of,
+    },
+    {
+        'TZ' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+    },
+    {
+
+        'TZ' => 'TZ',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TimeZone
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TimeZone from the namespace http://www.onvif.org/ver10/schema.
+
+ 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TZ
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TimeZone
+   TZ =>  $some_value, # token
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm
new file mode 100644
index 000000000..2b1584c2b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TopicNamespaceLocation.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TopicNamespaceLocation;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TopicNamespaceLocation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm
new file mode 100644
index 000000000..839b10857
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributes.pm
@@ -0,0 +1,160 @@
+package ONVIF::Analytics::Types::TrackAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackInformation_of :ATTR(:get<TrackInformation>);
+my %VideoAttributes_of :ATTR(:get<VideoAttributes>);
+my %AudioAttributes_of :ATTR(:get<AudioAttributes>);
+my %MetadataAttributes_of :ATTR(:get<MetadataAttributes>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackInformation
+        VideoAttributes
+        AudioAttributes
+        MetadataAttributes
+        Extension
+
+    ) ],
+    {
+        'TrackInformation' => \%TrackInformation_of,
+        'VideoAttributes' => \%VideoAttributes_of,
+        'AudioAttributes' => \%AudioAttributes_of,
+        'MetadataAttributes' => \%MetadataAttributes_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'TrackInformation' => 'ONVIF::Analytics::Types::TrackInformation',
+        'VideoAttributes' => 'ONVIF::Analytics::Types::VideoAttributes',
+        'AudioAttributes' => 'ONVIF::Analytics::Types::AudioAttributes',
+        'MetadataAttributes' => 'ONVIF::Analytics::Types::MetadataAttributes',
+        'Extension' => 'ONVIF::Analytics::Types::TrackAttributesExtension',
+    },
+    {
+
+        'TrackInformation' => 'TrackInformation',
+        'VideoAttributes' => 'VideoAttributes',
+        'AudioAttributes' => 'AudioAttributes',
+        'MetadataAttributes' => 'MetadataAttributes',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackInformation
+
+
+=item * VideoAttributes
+
+
+=item * AudioAttributes
+
+
+=item * MetadataAttributes
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackAttributes
+   TrackInformation =>  { # ONVIF::Analytics::Types::TrackInformation
+     TrackToken => $some_value, # TrackReference
+     TrackType => $some_value, # TrackType
+     Description => $some_value, # Description
+     DataFrom =>  $some_value, # dateTime
+     DataTo =>  $some_value, # dateTime
+   },
+   VideoAttributes =>  { # ONVIF::Analytics::Types::VideoAttributes
+     Bitrate =>  $some_value, # int
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+     Encoding => $some_value, # VideoEncoding
+     Framerate =>  $some_value, # float
+   },
+   AudioAttributes =>  { # ONVIF::Analytics::Types::AudioAttributes
+     Bitrate =>  $some_value, # int
+     Encoding => $some_value, # AudioEncoding
+     Samplerate =>  $some_value, # int
+   },
+   MetadataAttributes =>  { # ONVIF::Analytics::Types::MetadataAttributes
+     CanContainPTZ =>  $some_value, # boolean
+     CanContainAnalytics =>  $some_value, # boolean
+     CanContainNotifications =>  $some_value, # boolean
+   },
+   Extension =>  { # ONVIF::Analytics::Types::TrackAttributesExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm
new file mode 100644
index 000000000..c526555cf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackAttributesExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::TrackAttributesExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackAttributesExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackAttributesExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackAttributesExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm
new file mode 100644
index 000000000..ec6254467
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackConfiguration.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::TrackConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackType_of :ATTR(:get<TrackType>);
+my %Description_of :ATTR(:get<Description>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackType
+        Description
+
+    ) ],
+    {
+        'TrackType' => \%TrackType_of,
+        'Description' => \%Description_of,
+    },
+    {
+        'TrackType' => 'ONVIF::Analytics::Types::TrackType',
+        'Description' => 'ONVIF::Analytics::Types::Description',
+    },
+    {
+
+        'TrackType' => 'TrackType',
+        'Description' => 'Description',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackType
+
+
+=item * Description
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackConfiguration
+   TrackType => $some_value, # TrackType
+   Description => $some_value, # Description
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm
new file mode 100644
index 000000000..9423157b3
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackInformation.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::TrackInformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TrackToken_of :ATTR(:get<TrackToken>);
+my %TrackType_of :ATTR(:get<TrackType>);
+my %Description_of :ATTR(:get<Description>);
+my %DataFrom_of :ATTR(:get<DataFrom>);
+my %DataTo_of :ATTR(:get<DataTo>);
+
+__PACKAGE__->_factory(
+    [ qw(        TrackToken
+        TrackType
+        Description
+        DataFrom
+        DataTo
+
+    ) ],
+    {
+        'TrackToken' => \%TrackToken_of,
+        'TrackType' => \%TrackType_of,
+        'Description' => \%Description_of,
+        'DataFrom' => \%DataFrom_of,
+        'DataTo' => \%DataTo_of,
+    },
+    {
+        'TrackToken' => 'ONVIF::Analytics::Types::TrackReference',
+        'TrackType' => 'ONVIF::Analytics::Types::TrackType',
+        'Description' => 'ONVIF::Analytics::Types::Description',
+        'DataFrom' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'DataTo' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'TrackToken' => 'TrackToken',
+        'TrackType' => 'TrackType',
+        'Description' => 'Description',
+        'DataFrom' => 'DataFrom',
+        'DataTo' => 'DataTo',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TrackInformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TrackInformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TrackToken
+
+
+=item * TrackType
+
+
+=item * Description
+
+
+=item * DataFrom
+
+
+=item * DataTo
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TrackInformation
+   TrackToken => $some_value, # TrackReference
+   TrackType => $some_value, # TrackType
+   Description => $some_value, # Description
+   DataFrom =>  $some_value, # dateTime
+   DataTo =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm
new file mode 100644
index 000000000..3be509164
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackReference.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TrackReference;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    ONVIF::Analytics::Types::ReferenceToken);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TrackReference from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   ONVIF::Analytics::Types::ReferenceToken
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm
new file mode 100644
index 000000000..a88e3a2ef
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TrackType.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TrackType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TrackType from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm
new file mode 100644
index 000000000..0cd060e79
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Transformation.pm
@@ -0,0 +1,122 @@
+package ONVIF::Analytics::Types::Transformation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Translate_of :ATTR(:get<Translate>);
+my %Scale_of :ATTR(:get<Scale>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Translate
+        Scale
+        Extension
+
+    ) ],
+    {
+        'Translate' => \%Translate_of,
+        'Scale' => \%Scale_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Translate' => 'ONVIF::Analytics::Types::Vector',
+        'Scale' => 'ONVIF::Analytics::Types::Vector',
+        'Extension' => 'ONVIF::Analytics::Types::TransformationExtension',
+    },
+    {
+
+        'Translate' => 'Translate',
+        'Scale' => 'Scale',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Transformation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Transformation from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Translate
+
+
+=item * Scale
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Transformation
+   Translate => ,
+   Scale => ,
+   Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm
new file mode 100644
index 000000000..f2d990123
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TransformationExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::TransformationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::TransformationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TransformationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::TransformationExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm
new file mode 100644
index 000000000..fed1f6666
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Transport.pm
@@ -0,0 +1,103 @@
+package ONVIF::Analytics::Types::Transport;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Protocol_of :ATTR(:get<Protocol>);
+
+__PACKAGE__->_factory(
+    [ qw(        Protocol
+
+    ) ],
+    {
+        'Protocol' => \%Protocol_of,
+    },
+    {
+        'Protocol' => 'ONVIF::Analytics::Types::TransportProtocol',
+    },
+    {
+
+        'Protocol' => 'Protocol',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Transport
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Transport from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Protocol
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::Transport
+   Protocol => $some_value, # TransportProtocol
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm
new file mode 100644
index 000000000..77be9dac9
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/TransportProtocol.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::TransportProtocol;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+TransportProtocol from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/User.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/User.pm
new file mode 100644
index 000000000..b16cb4f65
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/User.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::User;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Username_of :ATTR(:get<Username>);
+my %Password_of :ATTR(:get<Password>);
+my %UserLevel_of :ATTR(:get<UserLevel>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Username
+        Password
+        UserLevel
+        Extension
+
+    ) ],
+    {
+        'Username' => \%Username_of,
+        'Password' => \%Password_of,
+        'UserLevel' => \%UserLevel_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Username' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'Password' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+        'UserLevel' => 'ONVIF::Analytics::Types::UserLevel',
+        'Extension' => 'ONVIF::Analytics::Types::UserExtension',
+    },
+    {
+
+        'Username' => 'Username',
+        'Password' => 'Password',
+        'UserLevel' => 'UserLevel',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::User
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+User from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Username
+
+
+=item * Password
+
+
+=item * UserLevel
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::User
+   Username =>  $some_value, # string
+   Password =>  $some_value, # string
+   UserLevel => $some_value, # UserLevel
+   Extension =>  { # ONVIF::Analytics::Types::UserExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm
new file mode 100644
index 000000000..a82566bb0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/UserExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::UserExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::UserExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UserExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::UserExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm
new file mode 100644
index 000000000..391914793
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/UserLevel.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::UserLevel;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+UserLevel from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm
new file mode 100644
index 000000000..cc3438d95
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector.pm
@@ -0,0 +1,133 @@
+package ONVIF::Analytics::Types::Vector;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Vector::_Vector::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Vector::_Vector::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %y_of :ATTR(:get<y>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        y
+    ) ],
+    {
+
+        x => \%x_of,
+
+        y => \%y_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        y => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Vector
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Vector from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Vector::_Vector::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm
new file mode 100644
index 000000000..ab497c64a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector1D.pm
@@ -0,0 +1,135 @@
+package ONVIF::Analytics::Types::Vector1D;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Vector1D::_Vector1D::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Vector1D::_Vector1D::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %space_of :ATTR(:get<space>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        space
+    ) ],
+    {
+
+        x => \%x_of,
+
+        space => \%space_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        space => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Vector1D
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Vector1D from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Vector1D::_Vector1D::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * space
+
+ http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm
new file mode 100644
index 000000000..d6b0899d2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/Vector2D.pm
@@ -0,0 +1,146 @@
+package ONVIF::Analytics::Types::Vector2D;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::Vector2D::_Vector2D::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package ONVIF::Analytics::Types::Vector2D::_Vector2D::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %x_of :ATTR(:get<x>);
+my %y_of :ATTR(:get<y>);
+my %space_of :ATTR(:get<space>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        x
+        y
+        space
+    ) ],
+    {
+
+        x => \%x_of,
+
+        y => \%y_of,
+
+        space => \%space_of,
+    },
+    {
+        x => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        y => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        space => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::Vector2D
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Vector2D from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::Vector2D::_Vector2D::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * x
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * y
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::float|SOAP::WSDL::XSD::Typelib::Builtin::float>.
+
+=item * space
+
+ http://www.onvif.org/ver10/tptz/PanTiltSpaces/GenericSpeedSpace 
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm
new file mode 100644
index 000000000..3f5307054
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsConfiguration.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::VideoAnalyticsConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %AnalyticsEngineConfiguration_of :ATTR(:get<AnalyticsEngineConfiguration>);
+my %RuleEngineConfiguration_of :ATTR(:get<RuleEngineConfiguration>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        AnalyticsEngineConfiguration
+        RuleEngineConfiguration
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'AnalyticsEngineConfiguration' => \%AnalyticsEngineConfiguration_of,
+        'RuleEngineConfiguration' => \%RuleEngineConfiguration_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'AnalyticsEngineConfiguration' => 'ONVIF::Analytics::Types::AnalyticsEngineConfiguration',
+        'RuleEngineConfiguration' => 'ONVIF::Analytics::Types::RuleEngineConfiguration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'AnalyticsEngineConfiguration' => 'AnalyticsEngineConfiguration',
+        'RuleEngineConfiguration' => 'RuleEngineConfiguration',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAnalyticsConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * AnalyticsEngineConfiguration
+
+
+=item * RuleEngineConfiguration
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsConfiguration
+   AnalyticsEngineConfiguration =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfiguration
+     AnalyticsModule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::AnalyticsEngineConfigurationExtension
+     },
+   },
+   RuleEngineConfiguration =>  { # ONVIF::Analytics::Types::RuleEngineConfiguration
+     Rule =>  { # ONVIF::Analytics::Types::Config
+       Parameters =>  { # ONVIF::Analytics::Types::ItemList
+         SimpleItem => ,
+         ElementItem =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ItemListExtension
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RuleEngineConfigurationExtension
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm
new file mode 100644
index 000000000..d5cadba4f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStream.pm
@@ -0,0 +1,211 @@
+package ONVIF::Analytics::Types::VideoAnalyticsStream;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Frame_of :ATTR(:get<Frame>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Frame
+        Extension
+
+    ) ],
+    {
+        'Frame' => \%Frame_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Frame' => 'ONVIF::Analytics::Types::Frame',
+        'Extension' => 'ONVIF::Analytics::Types::VideoAnalyticsStreamExtension',
+    },
+    {
+
+        'Frame' => 'Frame',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAnalyticsStream
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAnalyticsStream from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Frame
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsStream
+   # One of the following elements.
+   # No occurance checks yet, so be sure to pass just one...
+   Frame =>  { # ONVIF::Analytics::Types::Frame
+     PTZStatus =>  { # ONVIF::Analytics::Types::PTZStatus
+       Position =>  { # ONVIF::Analytics::Types::PTZVector
+         PanTilt => ,
+         Zoom => ,
+       },
+       MoveStatus =>  { # ONVIF::Analytics::Types::PTZMoveStatus
+         PanTilt => $some_value, # MoveStatus
+         Zoom => $some_value, # MoveStatus
+       },
+       Error =>  $some_value, # string
+       UtcTime =>  $some_value, # dateTime
+     },
+     Transformation =>  { # ONVIF::Analytics::Types::Transformation
+       Translate => ,
+       Scale => ,
+       Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+       },
+     },
+     Object =>  { # ONVIF::Analytics::Types::Object
+       Appearance =>  { # ONVIF::Analytics::Types::Appearance
+         Transformation =>  { # ONVIF::Analytics::Types::Transformation
+           Translate => ,
+           Scale => ,
+           Extension =>  { # ONVIF::Analytics::Types::TransformationExtension
+           },
+         },
+         Shape =>  { # ONVIF::Analytics::Types::ShapeDescriptor
+           BoundingBox => ,
+           CenterOfGravity => ,
+           Polygon =>  { # ONVIF::Analytics::Types::Polygon
+             Point => ,
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ShapeDescriptorExtension
+           },
+         },
+         Color =>  { # ONVIF::Analytics::Types::ColorDescriptor
+           ColorCluster =>  {
+             Color => ,
+             Weight =>  $some_value, # float
+             Covariance => ,
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ColorDescriptorExtension
+           },
+         },
+         Class =>  { # ONVIF::Analytics::Types::ClassDescriptor
+           ClassCandidate =>  {
+             Type => $some_value, # ClassType
+             Likelihood =>  $some_value, # float
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension
+             OtherTypes =>  { # ONVIF::Analytics::Types::OtherType
+               Type =>  $some_value, # string
+               Likelihood =>  $some_value, # float
+             },
+             Extension =>  { # ONVIF::Analytics::Types::ClassDescriptorExtension2
+             },
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::AppearanceExtension
+         },
+       },
+       Behaviour =>  { # ONVIF::Analytics::Types::Behaviour
+         Removed =>  {
+         },
+         Idle =>  {
+         },
+         Extension =>  { # ONVIF::Analytics::Types::BehaviourExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ObjectExtension
+       },
+     },
+     ObjectTree =>  { # ONVIF::Analytics::Types::ObjectTree
+       Rename =>  { # ONVIF::Analytics::Types::Rename
+         from => ,
+         to => ,
+       },
+       Split =>  { # ONVIF::Analytics::Types::Split
+         from => ,
+         to => ,
+       },
+       Merge =>  { # ONVIF::Analytics::Types::Merge
+         from => ,
+         to => ,
+       },
+       Delete => ,
+       Extension =>  { # ONVIF::Analytics::Types::ObjectTreeExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::FrameExtension
+       MotionInCells =>  { # ONVIF::Analytics::Types::MotionInCells
+       },
+       Extension =>  { # ONVIF::Analytics::Types::FrameExtension2
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm
new file mode 100644
index 000000000..fe1ea75a8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAnalyticsStreamExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoAnalyticsStreamExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAnalyticsStreamExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAnalyticsStreamExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm
new file mode 100644
index 000000000..ced5fe09f
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoAttributes.pm
@@ -0,0 +1,139 @@
+package ONVIF::Analytics::Types::VideoAttributes;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Bitrate_of :ATTR(:get<Bitrate>);
+my %Width_of :ATTR(:get<Width>);
+my %Height_of :ATTR(:get<Height>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Framerate_of :ATTR(:get<Framerate>);
+
+__PACKAGE__->_factory(
+    [ qw(        Bitrate
+        Width
+        Height
+        Encoding
+        Framerate
+
+    ) ],
+    {
+        'Bitrate' => \%Bitrate_of,
+        'Width' => \%Width_of,
+        'Height' => \%Height_of,
+        'Encoding' => \%Encoding_of,
+        'Framerate' => \%Framerate_of,
+    },
+    {
+        'Bitrate' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Width' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Height' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::VideoEncoding',
+        'Framerate' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Bitrate' => 'Bitrate',
+        'Width' => 'Width',
+        'Height' => 'Height',
+        'Encoding' => 'Encoding',
+        'Framerate' => 'Framerate',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoAttributes
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoAttributes from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Bitrate
+
+
+=item * Width
+
+
+=item * Height
+
+
+=item * Encoding
+
+
+=item * Framerate
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoAttributes
+   Bitrate =>  $some_value, # int
+   Width =>  $some_value, # int
+   Height =>  $some_value, # int
+   Encoding => $some_value, # VideoEncoding
+   Framerate =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm
new file mode 100644
index 000000000..7b3db81bc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptions.pm
@@ -0,0 +1,172 @@
+package ONVIF::Analytics::Types::VideoDecoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %JpegDecOptions_of :ATTR(:get<JpegDecOptions>);
+my %H264DecOptions_of :ATTR(:get<H264DecOptions>);
+my %Mpeg4DecOptions_of :ATTR(:get<Mpeg4DecOptions>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        JpegDecOptions
+        H264DecOptions
+        Mpeg4DecOptions
+        Extension
+
+    ) ],
+    {
+        'JpegDecOptions' => \%JpegDecOptions_of,
+        'H264DecOptions' => \%H264DecOptions_of,
+        'Mpeg4DecOptions' => \%Mpeg4DecOptions_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'JpegDecOptions' => 'ONVIF::Analytics::Types::JpegDecOptions',
+        'H264DecOptions' => 'ONVIF::Analytics::Types::H264DecOptions',
+        'Mpeg4DecOptions' => 'ONVIF::Analytics::Types::Mpeg4DecOptions',
+        'Extension' => 'ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension',
+    },
+    {
+
+        'JpegDecOptions' => 'JpegDecOptions',
+        'H264DecOptions' => 'H264DecOptions',
+        'Mpeg4DecOptions' => 'Mpeg4DecOptions',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoDecoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoDecoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * JpegDecOptions
+
+
+=item * H264DecOptions
+
+
+=item * Mpeg4DecOptions
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptions
+   JpegDecOptions =>  { # ONVIF::Analytics::Types::JpegDecOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   H264DecOptions =>  { # ONVIF::Analytics::Types::H264DecOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     SupportedH264Profiles => $some_value, # H264Profile
+     SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   Mpeg4DecOptions =>  { # ONVIF::Analytics::Types::Mpeg4DecOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     SupportedMpeg4Profiles => $some_value, # Mpeg4Profile
+     SupportedInputBitrate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     SupportedFrameRate =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..15a183231
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoDecoderConfigurationOptionsExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoDecoderConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoDecoderConfigurationOptionsExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm
new file mode 100644
index 000000000..ed1bd6795
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfiguration.pm
@@ -0,0 +1,201 @@
+package ONVIF::Analytics::Types::VideoEncoderConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %Encoding_of :ATTR(:get<Encoding>);
+my %Resolution_of :ATTR(:get<Resolution>);
+my %Quality_of :ATTR(:get<Quality>);
+my %RateControl_of :ATTR(:get<RateControl>);
+my %MPEG4_of :ATTR(:get<MPEG4>);
+my %H264_of :ATTR(:get<H264>);
+my %Multicast_of :ATTR(:get<Multicast>);
+my %SessionTimeout_of :ATTR(:get<SessionTimeout>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        Encoding
+        Resolution
+        Quality
+        RateControl
+        MPEG4
+        H264
+        Multicast
+        SessionTimeout
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'Encoding' => \%Encoding_of,
+        'Resolution' => \%Resolution_of,
+        'Quality' => \%Quality_of,
+        'RateControl' => \%RateControl_of,
+        'MPEG4' => \%MPEG4_of,
+        'H264' => \%H264_of,
+        'Multicast' => \%Multicast_of,
+        'SessionTimeout' => \%SessionTimeout_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Encoding' => 'ONVIF::Analytics::Types::VideoEncoding',
+        'Resolution' => 'ONVIF::Analytics::Types::VideoResolution',
+        'Quality' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'RateControl' => 'ONVIF::Analytics::Types::VideoRateControl',
+        'MPEG4' => 'ONVIF::Analytics::Types::Mpeg4Configuration',
+        'H264' => 'ONVIF::Analytics::Types::H264Configuration',
+        'Multicast' => 'ONVIF::Analytics::Types::MulticastConfiguration',
+        'SessionTimeout' => 'SOAP::WSDL::XSD::Typelib::Builtin::duration',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'Encoding' => 'Encoding',
+        'Resolution' => 'Resolution',
+        'Quality' => 'Quality',
+        'RateControl' => 'RateControl',
+        'MPEG4' => 'MPEG4',
+        'H264' => 'H264',
+        'Multicast' => 'Multicast',
+        'SessionTimeout' => 'SessionTimeout',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Encoding
+
+
+=item * Resolution
+
+
+=item * Quality
+
+
+=item * RateControl
+
+
+=item * MPEG4
+
+
+=item * H264
+
+
+=item * Multicast
+
+
+=item * SessionTimeout
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderConfiguration
+   Encoding => $some_value, # VideoEncoding
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   Quality =>  $some_value, # float
+   RateControl =>  { # ONVIF::Analytics::Types::VideoRateControl
+     FrameRateLimit =>  $some_value, # int
+     EncodingInterval =>  $some_value, # int
+     BitrateLimit =>  $some_value, # int
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Configuration
+     GovLength =>  $some_value, # int
+     Mpeg4Profile => $some_value, # Mpeg4Profile
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Configuration
+     GovLength =>  $some_value, # int
+     H264Profile => $some_value, # H264Profile
+   },
+   Multicast =>  { # ONVIF::Analytics::Types::MulticastConfiguration
+     Address =>  { # ONVIF::Analytics::Types::IPAddress
+       Type => $some_value, # IPType
+       IPv4Address => $some_value, # IPv4Address
+       IPv6Address => $some_value, # IPv6Address
+     },
+     Port =>  $some_value, # int
+     TTL =>  $some_value, # int
+     AutoStart =>  $some_value, # boolean
+   },
+   SessionTimeout =>  $some_value, # duration
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm
new file mode 100644
index 000000000..40079729e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderConfigurationOptions.pm
@@ -0,0 +1,212 @@
+package ONVIF::Analytics::Types::VideoEncoderConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %QualityRange_of :ATTR(:get<QualityRange>);
+my %JPEG_of :ATTR(:get<JPEG>);
+my %MPEG4_of :ATTR(:get<MPEG4>);
+my %H264_of :ATTR(:get<H264>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        QualityRange
+        JPEG
+        MPEG4
+        H264
+        Extension
+
+    ) ],
+    {
+        'QualityRange' => \%QualityRange_of,
+        'JPEG' => \%JPEG_of,
+        'MPEG4' => \%MPEG4_of,
+        'H264' => \%H264_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'QualityRange' => 'ONVIF::Analytics::Types::IntRange',
+        'JPEG' => 'ONVIF::Analytics::Types::JpegOptions',
+        'MPEG4' => 'ONVIF::Analytics::Types::Mpeg4Options',
+        'H264' => 'ONVIF::Analytics::Types::H264Options',
+        'Extension' => 'ONVIF::Analytics::Types::VideoEncoderOptionsExtension',
+    },
+    {
+
+        'QualityRange' => 'QualityRange',
+        'JPEG' => 'JPEG',
+        'MPEG4' => 'MPEG4',
+        'H264' => 'H264',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * QualityRange
+
+
+=item * JPEG
+
+
+=item * MPEG4
+
+
+=item * H264
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderConfigurationOptions
+   QualityRange =>  { # ONVIF::Analytics::Types::IntRange
+     Min =>  $some_value, # int
+     Max =>  $some_value, # int
+   },
+   JPEG =>  { # ONVIF::Analytics::Types::JpegOptions
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Options
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     Mpeg4ProfilesSupported => $some_value, # Mpeg4Profile
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Options
+     ResolutionsAvailable =>  { # ONVIF::Analytics::Types::VideoResolution
+       Width =>  $some_value, # int
+       Height =>  $some_value, # int
+     },
+     GovLengthRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     FrameRateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     EncodingIntervalRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     H264ProfilesSupported => $some_value, # H264Profile
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension
+     JPEG =>  { # ONVIF::Analytics::Types::JpegOptions2
+       BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Options2
+       BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     H264 =>  { # ONVIF::Analytics::Types::H264Options2
+       BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+         Min =>  $some_value, # int
+         Max =>  $some_value, # int
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm
new file mode 100644
index 000000000..9fc237041
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension.pm
@@ -0,0 +1,146 @@
+package ONVIF::Analytics::Types::VideoEncoderOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %JPEG_of :ATTR(:get<JPEG>);
+my %MPEG4_of :ATTR(:get<MPEG4>);
+my %H264_of :ATTR(:get<H264>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        JPEG
+        MPEG4
+        H264
+        Extension
+
+    ) ],
+    {
+        'JPEG' => \%JPEG_of,
+        'MPEG4' => \%MPEG4_of,
+        'H264' => \%H264_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'JPEG' => 'ONVIF::Analytics::Types::JpegOptions2',
+        'MPEG4' => 'ONVIF::Analytics::Types::Mpeg4Options2',
+        'H264' => 'ONVIF::Analytics::Types::H264Options2',
+        'Extension' => 'ONVIF::Analytics::Types::VideoEncoderOptionsExtension2',
+    },
+    {
+
+        'JPEG' => 'JPEG',
+        'MPEG4' => 'MPEG4',
+        'H264' => 'H264',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * JPEG
+
+
+=item * MPEG4
+
+
+=item * H264
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension
+   JPEG =>  { # ONVIF::Analytics::Types::JpegOptions2
+     BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   MPEG4 =>  { # ONVIF::Analytics::Types::Mpeg4Options2
+     BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   H264 =>  { # ONVIF::Analytics::Types::H264Options2
+     BitrateRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm
new file mode 100644
index 000000000..8cc11bb64
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoderOptionsExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoEncoderOptionsExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoEncoderOptionsExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoEncoderOptionsExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm
new file mode 100644
index 000000000..a34c45189
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoEncoding.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::VideoEncoding;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+VideoEncoding from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm
new file mode 100644
index 000000000..a6bdbcd5e
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutput.pm
@@ -0,0 +1,153 @@
+package ONVIF::Analytics::Types::VideoOutput;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Layout_of :ATTR(:get<Layout>);
+my %Resolution_of :ATTR(:get<Resolution>);
+my %RefreshRate_of :ATTR(:get<RefreshRate>);
+my %AspectRatio_of :ATTR(:get<AspectRatio>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Layout
+        Resolution
+        RefreshRate
+        AspectRatio
+        Extension
+
+    ) ],
+    {
+        'Layout' => \%Layout_of,
+        'Resolution' => \%Resolution_of,
+        'RefreshRate' => \%RefreshRate_of,
+        'AspectRatio' => \%AspectRatio_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Layout' => 'ONVIF::Analytics::Types::Layout',
+        'Resolution' => 'ONVIF::Analytics::Types::VideoResolution',
+        'RefreshRate' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'AspectRatio' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::VideoOutputExtension',
+    },
+    {
+
+        'Layout' => 'Layout',
+        'Resolution' => 'Resolution',
+        'RefreshRate' => 'RefreshRate',
+        'AspectRatio' => 'AspectRatio',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutput
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutput from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical video outputs.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Layout
+
+
+=item * Resolution
+
+
+=item * RefreshRate
+
+
+=item * AspectRatio
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutput
+   Layout =>  { # ONVIF::Analytics::Types::Layout
+     PaneLayout =>  { # ONVIF::Analytics::Types::PaneLayout
+       Pane => $some_value, # ReferenceToken
+       Area => ,
+     },
+     Extension =>  { # ONVIF::Analytics::Types::LayoutExtension
+     },
+   },
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   RefreshRate =>  $some_value, # float
+   AspectRatio =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::VideoOutputExtension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm
new file mode 100644
index 000000000..cb9256a60
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfiguration.pm
@@ -0,0 +1,116 @@
+package ONVIF::Analytics::Types::VideoOutputConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %OutputToken_of :ATTR(:get<OutputToken>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        OutputToken
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'OutputToken' => \%OutputToken_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'OutputToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'OutputToken' => 'OutputToken',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutputConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutputConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * OutputToken
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutputConfiguration
+   OutputToken => $some_value, # ReferenceToken
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm
new file mode 100644
index 000000000..bd89496f5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputConfigurationOptions.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoOutputConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutputConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutputConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutputConfigurationOptions
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm
new file mode 100644
index 000000000..87c63a16d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoOutputExtension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoOutputExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoOutputExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoOutputExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoOutputExtension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm
new file mode 100644
index 000000000..65124ed50
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoRateControl.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::VideoRateControl;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %FrameRateLimit_of :ATTR(:get<FrameRateLimit>);
+my %EncodingInterval_of :ATTR(:get<EncodingInterval>);
+my %BitrateLimit_of :ATTR(:get<BitrateLimit>);
+
+__PACKAGE__->_factory(
+    [ qw(        FrameRateLimit
+        EncodingInterval
+        BitrateLimit
+
+    ) ],
+    {
+        'FrameRateLimit' => \%FrameRateLimit_of,
+        'EncodingInterval' => \%EncodingInterval_of,
+        'BitrateLimit' => \%BitrateLimit_of,
+    },
+    {
+        'FrameRateLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'EncodingInterval' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'BitrateLimit' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'FrameRateLimit' => 'FrameRateLimit',
+        'EncodingInterval' => 'EncodingInterval',
+        'BitrateLimit' => 'BitrateLimit',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoRateControl
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoRateControl from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * FrameRateLimit
+
+
+=item * EncodingInterval
+
+
+=item * BitrateLimit
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoRateControl
+   FrameRateLimit =>  $some_value, # int
+   EncodingInterval =>  $some_value, # int
+   BitrateLimit =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm
new file mode 100644
index 000000000..5d33ca894
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoResolution.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::VideoResolution;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Width_of :ATTR(:get<Width>);
+my %Height_of :ATTR(:get<Height>);
+
+__PACKAGE__->_factory(
+    [ qw(        Width
+        Height
+
+    ) ],
+    {
+        'Width' => \%Width_of,
+        'Height' => \%Height_of,
+    },
+    {
+        'Width' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'Height' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+    },
+    {
+
+        'Width' => 'Width',
+        'Height' => 'Height',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoResolution
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoResolution from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Width
+
+
+=item * Height
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoResolution
+   Width =>  $some_value, # int
+   Height =>  $some_value, # int
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm
new file mode 100644
index 000000000..7cb3363e2
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSource.pm
@@ -0,0 +1,243 @@
+package ONVIF::Analytics::Types::VideoSource;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::DeviceEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Framerate_of :ATTR(:get<Framerate>);
+my %Resolution_of :ATTR(:get<Resolution>);
+my %Imaging_of :ATTR(:get<Imaging>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Framerate
+        Resolution
+        Imaging
+        Extension
+
+    ) ],
+    {
+        'Framerate' => \%Framerate_of,
+        'Resolution' => \%Resolution_of,
+        'Imaging' => \%Imaging_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Framerate' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Resolution' => 'ONVIF::Analytics::Types::VideoResolution',
+        'Imaging' => 'ONVIF::Analytics::Types::ImagingSettings',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceExtension',
+    },
+    {
+
+        'Framerate' => 'Framerate',
+        'Resolution' => 'Resolution',
+        'Imaging' => 'Imaging',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSource
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSource from the namespace http://www.onvif.org/ver10/schema.
+
+Representation of a physical video input.
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Framerate
+
+
+=item * Resolution
+
+
+=item * Imaging
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSource
+   Framerate =>  $some_value, # float
+   Resolution =>  { # ONVIF::Analytics::Types::VideoResolution
+     Width =>  $some_value, # int
+     Height =>  $some_value, # int
+   },
+   Imaging =>  { # ONVIF::Analytics::Types::ImagingSettings
+     BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation
+       Mode => $some_value, # BacklightCompensationMode
+       Level =>  $some_value, # float
+     },
+     Brightness =>  $some_value, # float
+     ColorSaturation =>  $some_value, # float
+     Contrast =>  $some_value, # float
+     Exposure =>  { # ONVIF::Analytics::Types::Exposure
+       Mode => $some_value, # ExposureMode
+       Priority => $some_value, # ExposurePriority
+       Window => ,
+       MinExposureTime =>  $some_value, # float
+       MaxExposureTime =>  $some_value, # float
+       MinGain =>  $some_value, # float
+       MaxGain =>  $some_value, # float
+       MinIris =>  $some_value, # float
+       MaxIris =>  $some_value, # float
+       ExposureTime =>  $some_value, # float
+       Gain =>  $some_value, # float
+       Iris =>  $some_value, # float
+     },
+     Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration
+       AutoFocusMode => $some_value, # AutoFocusMode
+       DefaultSpeed =>  $some_value, # float
+       NearLimit =>  $some_value, # float
+       FarLimit =>  $some_value, # float
+     },
+     IrCutFilter => $some_value, # IrCutFilterMode
+     Sharpness =>  $some_value, # float
+     WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange
+       Mode => $some_value, # WideDynamicMode
+       Level =>  $some_value, # float
+     },
+     WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance
+       Mode => $some_value, # WhiteBalanceMode
+       CrGain =>  $some_value, # float
+       CbGain =>  $some_value, # float
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceExtension
+     Imaging =>  { # ONVIF::Analytics::Types::ImagingSettings20
+       BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation20
+         Mode => $some_value, # BacklightCompensationMode
+         Level =>  $some_value, # float
+       },
+       Brightness =>  $some_value, # float
+       ColorSaturation =>  $some_value, # float
+       Contrast =>  $some_value, # float
+       Exposure =>  { # ONVIF::Analytics::Types::Exposure20
+         Mode => $some_value, # ExposureMode
+         Priority => $some_value, # ExposurePriority
+         Window => ,
+         MinExposureTime =>  $some_value, # float
+         MaxExposureTime =>  $some_value, # float
+         MinGain =>  $some_value, # float
+         MaxGain =>  $some_value, # float
+         MinIris =>  $some_value, # float
+         MaxIris =>  $some_value, # float
+         ExposureTime =>  $some_value, # float
+         Gain =>  $some_value, # float
+         Iris =>  $some_value, # float
+       },
+       Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration20
+         AutoFocusMode => $some_value, # AutoFocusMode
+         DefaultSpeed =>  $some_value, # float
+         NearLimit =>  $some_value, # float
+         FarLimit =>  $some_value, # float
+         Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+         },
+       },
+       IrCutFilter => $some_value, # IrCutFilterMode
+       Sharpness =>  $some_value, # float
+       WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange20
+         Mode => $some_value, # WideDynamicMode
+         Level =>  $some_value, # float
+       },
+       WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance20
+         Mode => $some_value, # WhiteBalanceMode
+         CrGain =>  $some_value, # float
+         CbGain =>  $some_value, # float
+         Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+         ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+           Mode => $some_value, # ImageStabilizationMode
+           Level =>  $some_value, # float
+           Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+           IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+             BoundaryType =>  $some_value, # string
+             BoundaryOffset =>  $some_value, # float
+             ResponseTime =>  $some_value, # duration
+             Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+             },
+           },
+           Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+           },
+         },
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm
new file mode 100644
index 000000000..d10cc394c
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfiguration.pm
@@ -0,0 +1,143 @@
+package ONVIF::Analytics::Types::VideoSourceConfiguration;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(ONVIF::Analytics::Types::ConfigurationEntity);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Name_of :ATTR(:get<Name>);
+my %UseCount_of :ATTR(:get<UseCount>);
+my %SourceToken_of :ATTR(:get<SourceToken>);
+my %Bounds_of :ATTR(:get<Bounds>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Name
+        UseCount
+        SourceToken
+        Bounds
+        Extension
+
+    ) ],
+    {
+        'Name' => \%Name_of,
+        'UseCount' => \%UseCount_of,
+        'SourceToken' => \%SourceToken_of,
+        'Bounds' => \%Bounds_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Name' => 'ONVIF::Analytics::Types::Name',
+        'UseCount' => 'SOAP::WSDL::XSD::Typelib::Builtin::int',
+        'SourceToken' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Bounds' => 'ONVIF::Analytics::Types::IntRectangle',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationExtension',
+    },
+    {
+
+        'Name' => 'Name',
+        'UseCount' => 'UseCount',
+        'SourceToken' => 'SourceToken',
+        'Bounds' => 'Bounds',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfiguration
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfiguration from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SourceToken
+
+
+=item * Bounds
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfiguration
+   SourceToken => $some_value, # ReferenceToken
+   Bounds => ,
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+     Rotate =>  { # ONVIF::Analytics::Types::Rotate
+       Mode => $some_value, # RotateMode
+       Degree =>  $some_value, # int
+       Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm
new file mode 100644
index 000000000..8b3705038
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension.pm
@@ -0,0 +1,118 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rotate_of :ATTR(:get<Rotate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rotate
+        Extension
+
+    ) ],
+    {
+        'Rotate' => \%Rotate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rotate' => 'ONVIF::Analytics::Types::Rotate',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationExtension2',
+    },
+    {
+
+        'Rotate' => 'Rotate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rotate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension
+   Rotate =>  { # ONVIF::Analytics::Types::Rotate
+     Mode => $some_value, # RotateMode
+     Degree =>  $some_value, # int
+     Extension =>  { # ONVIF::Analytics::Types::RotateExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm
new file mode 100644
index 000000000..6780c80c4
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm
new file mode 100644
index 000000000..bb61463d7
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptions.pm
@@ -0,0 +1,149 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %BoundsRange_of :ATTR(:get<BoundsRange>);
+my %VideoSourceTokensAvailable_of :ATTR(:get<VideoSourceTokensAvailable>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        BoundsRange
+        VideoSourceTokensAvailable
+        Extension
+
+    ) ],
+    {
+        'BoundsRange' => \%BoundsRange_of,
+        'VideoSourceTokensAvailable' => \%VideoSourceTokensAvailable_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'BoundsRange' => 'ONVIF::Analytics::Types::IntRectangleRange',
+        'VideoSourceTokensAvailable' => 'ONVIF::Analytics::Types::ReferenceToken',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension',
+    },
+    {
+
+        'BoundsRange' => 'BoundsRange',
+        'VideoSourceTokensAvailable' => 'VideoSourceTokensAvailable',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * BoundsRange
+
+
+=item * VideoSourceTokensAvailable
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationOptions
+   BoundsRange =>  { # ONVIF::Analytics::Types::IntRectangleRange
+     XRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     YRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     WidthRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+     HeightRange =>  { # ONVIF::Analytics::Types::IntRange
+       Min =>  $some_value, # int
+       Max =>  $some_value, # int
+     },
+   },
+   VideoSourceTokensAvailable => $some_value, # ReferenceToken
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension
+     Rotate =>  { # ONVIF::Analytics::Types::RotateOptions
+       Mode => $some_value, # RotateMode
+       DegreeList =>  { # ONVIF::Analytics::Types::IntList
+         Items =>  $some_value, # int
+       },
+       Extension =>  { # ONVIF::Analytics::Types::RotateOptionsExtension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm
new file mode 100644
index 000000000..222088d9a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension.pm
@@ -0,0 +1,120 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Rotate_of :ATTR(:get<Rotate>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Rotate
+        Extension
+
+    ) ],
+    {
+        'Rotate' => \%Rotate_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Rotate' => 'ONVIF::Analytics::Types::RotateOptions',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2',
+    },
+    {
+
+        'Rotate' => 'Rotate',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationOptionsExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Rotate
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension
+   Rotate =>  { # ONVIF::Analytics::Types::RotateOptions
+     Mode => $some_value, # RotateMode
+     DegreeList =>  { # ONVIF::Analytics::Types::IntList
+       Items =>  $some_value, # int
+     },
+     Extension =>  { # ONVIF::Analytics::Types::RotateOptionsExtension
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm
new file mode 100644
index 000000000..2167b07fb
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceConfigurationOptionsExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceConfigurationOptionsExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceConfigurationOptionsExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm
new file mode 100644
index 000000000..2086a317d
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension.pm
@@ -0,0 +1,175 @@
+package ONVIF::Analytics::Types::VideoSourceExtension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Imaging_of :ATTR(:get<Imaging>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Imaging
+        Extension
+
+    ) ],
+    {
+        'Imaging' => \%Imaging_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Imaging' => 'ONVIF::Analytics::Types::ImagingSettings20',
+        'Extension' => 'ONVIF::Analytics::Types::VideoSourceExtension2',
+    },
+    {
+
+        'Imaging' => 'Imaging',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceExtension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceExtension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Imaging
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceExtension
+   Imaging =>  { # ONVIF::Analytics::Types::ImagingSettings20
+     BacklightCompensation =>  { # ONVIF::Analytics::Types::BacklightCompensation20
+       Mode => $some_value, # BacklightCompensationMode
+       Level =>  $some_value, # float
+     },
+     Brightness =>  $some_value, # float
+     ColorSaturation =>  $some_value, # float
+     Contrast =>  $some_value, # float
+     Exposure =>  { # ONVIF::Analytics::Types::Exposure20
+       Mode => $some_value, # ExposureMode
+       Priority => $some_value, # ExposurePriority
+       Window => ,
+       MinExposureTime =>  $some_value, # float
+       MaxExposureTime =>  $some_value, # float
+       MinGain =>  $some_value, # float
+       MaxGain =>  $some_value, # float
+       MinIris =>  $some_value, # float
+       MaxIris =>  $some_value, # float
+       ExposureTime =>  $some_value, # float
+       Gain =>  $some_value, # float
+       Iris =>  $some_value, # float
+     },
+     Focus =>  { # ONVIF::Analytics::Types::FocusConfiguration20
+       AutoFocusMode => $some_value, # AutoFocusMode
+       DefaultSpeed =>  $some_value, # float
+       NearLimit =>  $some_value, # float
+       FarLimit =>  $some_value, # float
+       Extension =>  { # ONVIF::Analytics::Types::FocusConfiguration20Extension
+       },
+     },
+     IrCutFilter => $some_value, # IrCutFilterMode
+     Sharpness =>  $some_value, # float
+     WideDynamicRange =>  { # ONVIF::Analytics::Types::WideDynamicRange20
+       Mode => $some_value, # WideDynamicMode
+       Level =>  $some_value, # float
+     },
+     WhiteBalance =>  { # ONVIF::Analytics::Types::WhiteBalance20
+       Mode => $some_value, # WhiteBalanceMode
+       CrGain =>  $some_value, # float
+       CbGain =>  $some_value, # float
+       Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+       },
+     },
+     Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension20
+       ImageStabilization =>  { # ONVIF::Analytics::Types::ImageStabilization
+         Mode => $some_value, # ImageStabilizationMode
+         Level =>  $some_value, # float
+         Extension =>  { # ONVIF::Analytics::Types::ImageStabilizationExtension
+         },
+       },
+       Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension202
+         IrCutFilterAutoAdjustment =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustment
+           BoundaryType =>  $some_value, # string
+           BoundaryOffset =>  $some_value, # float
+           ResponseTime =>  $some_value, # duration
+           Extension =>  { # ONVIF::Analytics::Types::IrCutFilterAutoAdjustmentExtension
+           },
+         },
+         Extension =>  { # ONVIF::Analytics::Types::ImagingSettingsExtension203
+         },
+       },
+     },
+   },
+   Extension =>  { # ONVIF::Analytics::Types::VideoSourceExtension2
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm
new file mode 100644
index 000000000..610bb47a6
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/VideoSourceExtension2.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::VideoSourceExtension2;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::VideoSourceExtension2
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+VideoSourceExtension2 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::VideoSourceExtension2
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm
new file mode 100644
index 000000000..f6eae8d08
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance.pm
@@ -0,0 +1,121 @@
+package ONVIF::Analytics::Types::WhiteBalance;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %CrGain_of :ATTR(:get<CrGain>);
+my %CbGain_of :ATTR(:get<CbGain>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        CrGain
+        CbGain
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'CrGain' => \%CrGain_of,
+        'CbGain' => \%CbGain_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'CrGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'CbGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'CrGain' => 'CrGain',
+        'CbGain' => 'CbGain',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalance
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalance from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * CrGain
+
+
+=item * CbGain
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalance
+   Mode => $some_value, # WhiteBalanceMode
+   CrGain =>  $some_value, # float
+   CbGain =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm
new file mode 100644
index 000000000..ca0ac4fae
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20.pm
@@ -0,0 +1,131 @@
+package ONVIF::Analytics::Types::WhiteBalance20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %CrGain_of :ATTR(:get<CrGain>);
+my %CbGain_of :ATTR(:get<CbGain>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        CrGain
+        CbGain
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'CrGain' => \%CrGain_of,
+        'CbGain' => \%CbGain_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'CrGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'CbGain' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+        'Extension' => 'ONVIF::Analytics::Types::WhiteBalance20Extension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'CrGain' => 'CrGain',
+        'CbGain' => 'CbGain',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalance20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalance20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * CrGain
+
+
+=item * CbGain
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalance20
+   Mode => $some_value, # WhiteBalanceMode
+   CrGain =>  $some_value, # float
+   CbGain =>  $some_value, # float
+   Extension =>  { # ONVIF::Analytics::Types::WhiteBalance20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm
new file mode 100644
index 000000000..ded67ea69
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalance20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::WhiteBalance20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalance20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalance20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalance20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm
new file mode 100644
index 000000000..6f6874644
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::WhiteBalanceMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+WhiteBalanceMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm
new file mode 100644
index 000000000..7338fe9e8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions.pm
@@ -0,0 +1,127 @@
+package ONVIF::Analytics::Types::WhiteBalanceOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %YrGain_of :ATTR(:get<YrGain>);
+my %YbGain_of :ATTR(:get<YbGain>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        YrGain
+        YbGain
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'YrGain' => \%YrGain_of,
+        'YbGain' => \%YbGain_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'YrGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'YbGain' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'YrGain' => 'YrGain',
+        'YbGain' => 'YbGain',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalanceOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalanceOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * YrGain
+
+
+=item * YbGain
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalanceOptions
+   Mode => $some_value, # WhiteBalanceMode
+   YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm
new file mode 100644
index 000000000..0d9c2e07b
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20.pm
@@ -0,0 +1,137 @@
+package ONVIF::Analytics::Types::WhiteBalanceOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %YrGain_of :ATTR(:get<YrGain>);
+my %YbGain_of :ATTR(:get<YbGain>);
+my %Extension_of :ATTR(:get<Extension>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        YrGain
+        YbGain
+        Extension
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'YrGain' => \%YrGain_of,
+        'YbGain' => \%YbGain_of,
+        'Extension' => \%Extension_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WhiteBalanceMode',
+        'YrGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'YbGain' => 'ONVIF::Analytics::Types::FloatRange',
+        'Extension' => 'ONVIF::Analytics::Types::WhiteBalanceOptions20Extension',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'YrGain' => 'YrGain',
+        'YbGain' => 'YbGain',
+        'Extension' => 'Extension',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalanceOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalanceOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * YrGain
+
+
+=item * YbGain
+
+
+=item * Extension
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalanceOptions20
+   Mode => $some_value, # WhiteBalanceMode
+   YrGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   YbGain =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+   Extension =>  { # ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm
new file mode 100644
index 000000000..a52f56ce8
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WhiteBalanceOptions20Extension.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::WhiteBalanceOptions20Extension;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WhiteBalanceOptions20Extension from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WhiteBalanceOptions20Extension
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm
new file mode 100644
index 000000000..458ae39b0
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicMode.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::WideDynamicMode;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+WideDynamicMode from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm
new file mode 100644
index 000000000..34c785541
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::WideDynamicRange;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRange
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRange from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRange
+   Mode => $some_value, # WideDynamicMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm
new file mode 100644
index 000000000..8aa02026a
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRange20.pm
@@ -0,0 +1,112 @@
+package ONVIF::Analytics::Types::WideDynamicRange20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'SOAP::WSDL::XSD::Typelib::Builtin::float',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRange20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRange20 from the namespace http://www.onvif.org/ver10/schema.
+
+Type describing whether WDR mode is enabled or disabled (on/off).
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRange20
+   Mode => $some_value, # WideDynamicMode
+   Level =>  $some_value, # float
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm
new file mode 100644
index 000000000..7e0b20aae
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::WideDynamicRangeOptions;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRangeOptions
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRangeOptions from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRangeOptions
+   Mode => $some_value, # WideDynamicMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm
new file mode 100644
index 000000000..039d219b5
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/WideDynamicRangeOptions20.pm
@@ -0,0 +1,115 @@
+package ONVIF::Analytics::Types::WideDynamicRangeOptions20;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Mode_of :ATTR(:get<Mode>);
+my %Level_of :ATTR(:get<Level>);
+
+__PACKAGE__->_factory(
+    [ qw(        Mode
+        Level
+
+    ) ],
+    {
+        'Mode' => \%Mode_of,
+        'Level' => \%Level_of,
+    },
+    {
+        'Mode' => 'ONVIF::Analytics::Types::WideDynamicMode',
+        'Level' => 'ONVIF::Analytics::Types::FloatRange',
+    },
+    {
+
+        'Mode' => 'Mode',
+        'Level' => 'Level',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::WideDynamicRangeOptions20
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+WideDynamicRangeOptions20 from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Mode
+
+
+=item * Level
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::WideDynamicRangeOptions20
+   Mode => $some_value, # WideDynamicMode
+   Level =>  { # ONVIF::Analytics::Types::FloatRange
+     Min =>  $some_value, # float
+     Max =>  $some_value, # float
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm
new file mode 100644
index 000000000..903dbe9bf
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/XPathExpression.pm
@@ -0,0 +1,65 @@
+package ONVIF::Analytics::Types::XPathExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+XPathExpression from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::string
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm
new file mode 100644
index 000000000..41983d779
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/ZoomLimits.pm
@@ -0,0 +1,109 @@
+package ONVIF::Analytics::Types::ZoomLimits;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.onvif.org/ver10/schema' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Range_of :ATTR(:get<Range>);
+
+__PACKAGE__->_factory(
+    [ qw(        Range
+
+    ) ],
+    {
+        'Range' => \%Range_of,
+    },
+    {
+        'Range' => 'ONVIF::Analytics::Types::Space1DDescription',
+    },
+    {
+
+        'Range' => 'Range',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::ZoomLimits
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ZoomLimits from the namespace http://www.onvif.org/ver10/schema.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Range
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::ZoomLimits
+   Range =>  { # ONVIF::Analytics::Types::Space1DDescription
+     URI =>  $some_value, # anyURI
+     XRange =>  { # ONVIF::Analytics::Types::FloatRange
+       Min =>  $some_value, # float
+       Max =>  $some_value, # float
+     },
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm
new file mode 100644
index 000000000..c571f96cc
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/base64Binary.pm
@@ -0,0 +1,117 @@
+package ONVIF::Analytics::Types::base64Binary;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::base64Binary::_base64Binary::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::base64Binary
+);
+
+package ONVIF::Analytics::Types::base64Binary::_base64Binary::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::base64Binary
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+base64Binary from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::base64Binary::_base64Binary::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm
new file mode 100644
index 000000000..62be02785
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/detail.pm
@@ -0,0 +1,94 @@
+package ONVIF::Analytics::Types::detail;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::detail
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+detail from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # ONVIF::Analytics::Types::detail
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm
new file mode 100644
index 000000000..5603dad00
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/encodingStyle.pm
@@ -0,0 +1,75 @@
+package ONVIF::Analytics::Types::encodingStyle;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/soap/envelope/'};
+
+
+# list derivation
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::list
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+encodingStyle from the namespace http://schemas.xmlsoap.org/soap/envelope/.
+
+'encodingStyle' indicates any canonicalization conventions followed in the contents of the containing element. For example, the value 'http://schemas.xmlsoap.org/soap/encoding/' indicates the pattern described in SOAP specification 
+
+
+
+This clase is derived from
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+.
+
+You may pass the following structure to new():
+
+ [ $value_1, .. $value_n ]
+
+All elements of the list must be of the class' base type (or valid arguments
+to it's constructor).
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm b/onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm
new file mode 100644
index 000000000..d988616ff
--- /dev/null
+++ b/onvif/proxy/lib/ONVIF/Analytics/Types/hexBinary.pm
@@ -0,0 +1,117 @@
+package ONVIF::Analytics::Types::hexBinary;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(1);
+
+sub get_xmlns { 'http://www.w3.org/2005/05/xmlmime' };
+
+our $XML_ATTRIBUTE_CLASS = 'ONVIF::Analytics::Types::hexBinary::_hexBinary::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::hexBinary
+);
+
+package ONVIF::Analytics::Types::hexBinary::_hexBinary::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %contentType_of :ATTR(:get<contentType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        contentType
+    ) ],
+    {
+
+        contentType => \%contentType_of,
+    },
+    {
+
+            contentType => 'ONVIF::Analytics::Attributes::contentType',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+ONVIF::Analytics::Types::hexBinary
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+hexBinary from the namespace http://www.w3.org/2005/05/xmlmime.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class ONVIF::Analytics::Types::hexBinary::_hexBinary::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * contentType
+
+
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm b/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm
index 437ef094c..a9545c41b 100644
--- a/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm
+++ b/onvif/proxy/lib/ONVIF/Media/Types/TopicNamespaceType.pm
@@ -63,7 +63,7 @@ sub __get_attr_class {
 }
 
 
-use base qw(ONVIF::Media::Types::TopicType);
+use base qw(WSNotification::Types::TopicType);
 # Variety: sequence
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
@@ -90,7 +90,7 @@ __PACKAGE__->_factory(
     {
         'documentation' => 'ONVIF::Media::Types::Documentation',
         'MessagePattern' => 'ONVIF::Media::Types::QueryExpressionType',
-        'Topic' => 'ONVIF::Media::Types::TopicType',
+        'Topic' => 'WSNotification::Types::TopicType',
     },
     {
 
diff --git a/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm b/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm
index d5ae7f8d5..ea69830bd 100644
--- a/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm
+++ b/onvif/proxy/lib/ONVIF/PTZ/Types/TopicNamespaceType.pm
@@ -63,7 +63,7 @@ sub __get_attr_class {
 }
 
 
-use base qw(ONVIF::PTZ::Types::TopicType);
+use base qw(WSNotification::Types::TopicType);
 # Variety: sequence
 use Class::Std::Fast::Storable constructor => 'none';
 use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
@@ -90,7 +90,7 @@ __PACKAGE__->_factory(
     {
         'documentation' => 'ONVIF::PTZ::Types::Documentation',
         'MessagePattern' => 'ONVIF::PTZ::Types::QueryExpressionType',
-        'Topic' => 'ONVIF::PTZ::Types::TopicType',
+        'Topic' => 'WSNotification::Types::TopicType',
     },
     {
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
deleted file mode 100644
index 57849ce57..000000000
--- a/onvif/proxy/lib/WSDiscovery/Elements/Resolve.pm
+++ /dev/null
@@ -1,65 +0,0 @@
-
-package WSDiscovery::Elements::Resolve;
-use strict;
-use warnings;
-
-{ # BLOCK to scope variables
-
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
-
-__PACKAGE__->__set_name('Resolve');
-__PACKAGE__->__set_nillable();
-__PACKAGE__->__set_minOccurs();
-__PACKAGE__->__set_maxOccurs();
-__PACKAGE__->__set_ref();
-use base qw(
-    SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ResolveType
-);
-
-}
-
-1;
-
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Elements::Resolve
-
-=head1 DESCRIPTION
-
-Perl data type class for the XML Schema defined element
-Resolve from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
-
-
-
-
-
-
-
-=head1 METHODS
-
-=head2 new
-
- my $element = WSDiscovery::Elements::Resolve->new($data);
-
-Constructor. The following data structure may be passed to new():
-
- { # WSDiscovery::Types::ResolveType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
-     Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
-     },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
-     },
-   },
- },
-
-=head1 AUTHOR
-
-Generated by SOAP::WSDL
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
deleted file mode 100644
index 136550e96..000000000
--- a/onvif/proxy/lib/WSDiscovery/Typemaps/WSDiscovery.pm
+++ /dev/null
@@ -1,59 +0,0 @@
-
-package WSDiscovery::Typemaps::WSDiscovery;
-use strict;
-use warnings;
-
-our $typemap_1 = {
-               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery::Types::UriListType',
-               'ProbeMatches/ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
-               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
-               'ProbeMatches/ProbeMatch/EndpointReference/Metadata' => 'WSDiscovery::Types::MetadataType',
-               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery::Types::ScopesType',
-               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery::Types::AttributedURIType',
-               'Probe/Types' => 'WSDiscovery::Types::QNameListType',
-               'Probe' => 'WSDiscovery::Elements::Probe',
-               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
-               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
-               'Probe/Scopes' => 'WSDiscovery::Types::ScopesType',
-               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
-               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
-               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery::Types::QNameListType',
-               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery::Types::ReferenceParametersType',
-               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery::Types::EndpointReferenceType',
-               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
-               'ProbeMatches' => 'WSDiscovery::Elements::ProbeMatches',
-               'MessageID' => 'WSDiscovery::Elements::MessageID',
-               'RelatesTo' => '__SKIP__',
-               'To' => '__SKIP__',
-               'Action' => '__SKIP__',
-               'AppSequence' => '__SKIP__',
-              }; 
-;
-
-sub get_class {
-  my $name = join '/', @{ $_[1] };
-  return $typemap_1->{ $name };
-}
-
-sub get_typemap {
-    return $typemap_1;
-}
-
-1;
-
-__END__
-
-__END__
-
-=pod
-
-=head1 NAME
-
-WSDiscovery::Typemaps::WSDiscovery - typemap for WSDiscovery
-
-=head1 DESCRIPTION
-
-Typemap created by SOAP::WSDL for map-based SOAP message parsers.
-
-=cut
-
diff --git a/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm b/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
new file mode 100644
index 000000000..84a19fd8c
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Attributes/Action.pm
@@ -0,0 +1,54 @@
+
+package WSDiscovery10::Attributes::Action;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('Action');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Attributes::Action
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+Action from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Attributes::Action->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Attributes/Id.pm b/onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
similarity index 64%
rename from onvif/proxy/lib/WSDiscovery/Attributes/Id.pm
rename to onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
index 56d5115e4..97a3ee603 100644
--- a/onvif/proxy/lib/WSDiscovery/Attributes/Id.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Attributes/Id.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Attributes::Id;
+package WSDiscovery10::Attributes::Id;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Id');
 __PACKAGE__->__set_ref();
@@ -23,12 +23,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Attributes::Id
+WSDiscovery10::Attributes::Id
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined attribute
-Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Id from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -40,7 +40,7 @@ Id from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Attributes::Id->new($data);
+ my $element = WSDiscovery10::Attributes::Id->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
new file mode 100644
index 000000000..141d1d8a9
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Action.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery10::Elements::Action;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('Action');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::AttributedURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::Action
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Action from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::Action->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm b/onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
similarity index 58%
rename from onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
index 63be6d678..d6662e940 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/AppSequence.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/AppSequence.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::AppSequence;
+package WSDiscovery10::Elements::AppSequence;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('AppSequence');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AppSequenceType
+    WSDiscovery10::Types::AppSequenceType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::AppSequence
+WSDiscovery10::Elements::AppSequence
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+AppSequence from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ AppSequence from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/200
 
 =head2 new
 
- my $element = WSDiscovery::Elements::AppSequence->new($data);
+ my $element = WSDiscovery10::Elements::AppSequence->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::AppSequenceType
+ { # WSDiscovery10::Types::AppSequenceType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Bye.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/Bye.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
index a89c3b48c..d5e15b25d 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Bye.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Bye.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Bye;
+package WSDiscovery10::Elements::Bye;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Bye');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ByeType
+    WSDiscovery10::Types::ByeType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Bye
+WSDiscovery10::Elements::Bye
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Bye from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,17 +43,19 @@ Bye from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Bye->new($data);
+ my $element = WSDiscovery10::Elements::Bye->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ByeType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ByeType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm b/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
new file mode 100644
index 000000000..105df00dd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/EndpointReference.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::EndpointReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('EndpointReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::EndpointReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+EndpointReference from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::EndpointReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
new file mode 100644
index 000000000..02235cfb8
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/FaultTo.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::FaultTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('FaultTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::FaultTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FaultTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::FaultTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/From.pm b/onvif/proxy/lib/WSDiscovery10/Elements/From.pm
new file mode 100644
index 000000000..ec56001f6
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/From.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::From;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('From');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::From
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+From from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::From->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Hello.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/Hello.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
index 894f8482d..783e051e0 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Hello.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Hello.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Hello;
+package WSDiscovery10::Elements::Hello;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Hello');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::HelloType
+    WSDiscovery10::Types::HelloType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Hello
+WSDiscovery10::Elements::Hello
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Hello from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,17 +43,19 @@ Hello from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Hello->new($data);
+ my $element = WSDiscovery10::Elements::Hello->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::HelloType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::HelloType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm b/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
new file mode 100644
index 000000000..44ace37cd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/MessageID.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery10::Elements::MessageID;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('MessageID');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::AttributedURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::MessageID
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MessageID from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::MessageID->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm b/onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
similarity index 65%
rename from onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
index acb6c5246..bf56da261 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/MetadataVersion.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/MetadataVersion.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::MetadataVersion;
+package WSDiscovery10::Elements::MetadataVersion;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('MetadataVersion');
 __PACKAGE__->__set_nillable();
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::MetadataVersion
+WSDiscovery10::Elements::MetadataVersion
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+MetadataVersion from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ MetadataVersion from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery
 
 =head2 new
 
- my $element = WSDiscovery::Elements::MetadataVersion->new($data);
+ my $element = WSDiscovery10::Elements::MetadataVersion->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Probe.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Probe.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
index b5b780a24..e07ec2510 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Probe.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Probe.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Probe;
+package WSDiscovery10::Elements::Probe;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Probe');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProbeType
+    WSDiscovery10::Types::ProbeType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Probe
+WSDiscovery10::Elements::Probe
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Probe from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ Probe from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Probe->new($data);
+ my $element = WSDiscovery10::Elements::Probe->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeType
+ { # WSDiscovery10::Types::ProbeType
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
  },
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
index 5cf9f8fac..e64b8de42 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProbeMatches.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ProbeMatches.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::ProbeMatches;
+package WSDiscovery10::Elements::ProbeMatches;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('ProbeMatches');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProbeMatchesType
+    WSDiscovery10::Types::ProbeMatchesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProbeMatches
+WSDiscovery10::Elements::ProbeMatches
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatches from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,18 +43,20 @@ ProbeMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/20
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProbeMatches->new($data);
+ my $element = WSDiscovery10::Elements::ProbeMatches->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchesType
-   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery10::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
new file mode 100644
index 000000000..51cc80a4f
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/RelatesTo.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery10::Elements::RelatesTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('RelatesTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::Relationship
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::RelatesTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RelatesTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::RelatesTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
new file mode 100644
index 000000000..4e0364477
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyAfter.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery10::Elements::ReplyAfter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('ReplyAfter');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::ReplyAfterType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::ReplyAfter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReplyAfter from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::ReplyAfter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
new file mode 100644
index 000000000..4f4f2b496
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ReplyTo.pm
@@ -0,0 +1,65 @@
+
+package WSDiscovery10::Elements::ReplyTo;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('ReplyTo');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::ReplyTo
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ReplyTo from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::ReplyTo->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
new file mode 100644
index 000000000..17c834e4e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Resolve.pm
@@ -0,0 +1,67 @@
+
+package WSDiscovery10::Elements::Resolve;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
+
+__PACKAGE__->__set_name('Resolve');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::ResolveType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::Resolve
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Resolve from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::Resolve->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+     },
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+     },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm b/onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
similarity index 50%
rename from onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
index cfaabc989..c2ebe9979 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ResolveMatches.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/ResolveMatches.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::ResolveMatches;
+package WSDiscovery10::Elements::ResolveMatches;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('ResolveMatches');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ResolveMatchesType
+    WSDiscovery10::Types::ResolveMatchesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ResolveMatches
+WSDiscovery10::Elements::ResolveMatches
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatches from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,18 +43,20 @@ ResolveMatches from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ResolveMatches->new($data);
+ my $element = WSDiscovery10::Elements::ResolveMatches->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchesType
-   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery10::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm b/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
new file mode 100644
index 000000000..8c43deb40
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/RetryAfter.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery10::Elements::RetryAfter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('RetryAfter');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::RetryAfterType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::RetryAfter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RetryAfter from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::RetryAfter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
index 1dde55ce1..9aceeab7c 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Scopes.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Scopes.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Scopes;
+package WSDiscovery10::Elements::Scopes;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Scopes');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ScopesType
+    WSDiscovery10::Types::ScopesType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Scopes
+WSDiscovery10::Elements::Scopes
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Scopes from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ Scopes from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Scopes->new($data);
+ my $element = WSDiscovery10::Elements::Scopes->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Security.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
similarity index 56%
rename from onvif/proxy/lib/WSDiscovery/Elements/Security.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
index f9d4aff4d..6eeb876e7 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Security.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Security.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Security;
+package WSDiscovery10::Elements::Security;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Security');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::SecurityType
+    WSDiscovery10::Types::SecurityType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Security
+WSDiscovery10::Elements::Security
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Security from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,12 +43,12 @@ Security from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/0
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Security->new($data);
+ my $element = WSDiscovery10::Elements::Security->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SecurityType
-   Sig =>  { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SecurityType
+   Sig =>  { # WSDiscovery10::Types::SigType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Sig.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
similarity index 61%
rename from onvif/proxy/lib/WSDiscovery/Elements/Sig.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
index 6ddab0bed..edfa22491 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Sig.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Sig.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Sig;
+package WSDiscovery10::Elements::Sig;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Sig');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::SigType
+    WSDiscovery10::Types::SigType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Sig
+WSDiscovery10::Elements::Sig
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Sig from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,11 +43,11 @@ Sig from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Sig->new($data);
+ my $element = WSDiscovery10::Elements::Sig->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SigType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm b/onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
similarity index 59%
rename from onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
index 908566429..4b45ed553 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/SupportedMatchingRules.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/SupportedMatchingRules.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::SupportedMatchingRules;
+package WSDiscovery10::Elements::SupportedMatchingRules;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('SupportedMatchingRules');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::SupportedMatchingRules
+WSDiscovery10::Elements::SupportedMatchingRules
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SupportedMatchingRules from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ SupportedMatchingRules from the namespace http://docs.oasis-open.org/ws-dd/ns/di
 
 =head2 new
 
- my $element = WSDiscovery::Elements::SupportedMatchingRules->new($data);
+ my $element = WSDiscovery10::Elements::SupportedMatchingRules->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Elements/To.pm b/onvif/proxy/lib/WSDiscovery10/Elements/To.pm
new file mode 100644
index 000000000..52e2b7d1a
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/To.pm
@@ -0,0 +1,57 @@
+
+package WSDiscovery10::Elements::To;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' }
+
+__PACKAGE__->__set_name('To');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSDiscovery10::Types::AttributedURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Elements::To
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+To from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSDiscovery10::Elements::To->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Types.pm b/onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/Types.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
index 15667a3a0..92c821480 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Types.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/Types.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::Types;
+package WSDiscovery10::Elements::Types;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('Types');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::QNameListType
+    WSDiscovery10::Types::QNameListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Types
+WSDiscovery10::Elements::Types
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+Types from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ Types from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Types->new($data);
+ my $element = WSDiscovery10::Elements::Types->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm b/onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm
rename to onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
index bc0c8d998..2a43da505 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/XAddrs.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Elements/XAddrs.pm
@@ -1,11 +1,11 @@
 
-package WSDiscovery::Elements::XAddrs;
+package WSDiscovery10::Elements::XAddrs;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' }
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' }
 
 __PACKAGE__->__set_name('XAddrs');
 __PACKAGE__->__set_nillable();
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::XAddrs
+WSDiscovery10::Elements::XAddrs
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+XAddrs from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -43,7 +43,7 @@ XAddrs from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::XAddrs->new($data);
+ my $element = WSDiscovery10::Elements::XAddrs->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm
rename to onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
index a7dcd3532..d194bbc87 100644
--- a/onvif/proxy/lib/WSDiscovery/Interfaces/WSDiscovery/WSDiscoveryPort.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Interfaces/WSDiscovery/WSDiscoveryPort.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
+package WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
 use strict;
 use warnings;
 use Class::Std::Fast::Storable;
@@ -6,12 +6,12 @@ use Scalar::Util qw(blessed);
 use base qw(SOAP::WSDL::Client::Base);
 
 # only load if it hasn't been loaded before
-require WSDiscovery::Typemaps::WSDiscovery
-    if not WSDiscovery::Typemaps::WSDiscovery->can('get_class');
+require WSDiscovery10::Typemaps::WSDiscovery
+    if not WSDiscovery10::Typemaps::WSDiscovery->can('get_class');
 
 sub START {
     $_[0]->set_proxy('soap.udp://239.255.255.250:3702/') if not $_[2]->{proxy};
-    $_[0]->set_class_resolver('WSDiscovery::Typemaps::WSDiscovery')
+    $_[0]->set_class_resolver('WSDiscovery10::Typemaps::WSDiscovery')
         if not $_[2]->{class_resolver};
 
     $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
@@ -22,7 +22,7 @@ sub ProbeOp {
     die "ProbeOp must be called as object method (\$self is <$self>)" if not blessed($self);
     return $self->SUPER::call({
         operation => 'ProbeOp',
-        soap_action => 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01/Probe',
+        soap_action => 'http://schemas.xmlsoap.org/ws/2005/04/discovery/Probe',
         style => 'document',
         body => {
             
@@ -30,7 +30,7 @@ sub ProbeOp {
            'use'            => 'literal',
             namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
             encodingStyle   => '',
-            parts           =>  [qw( WSDiscovery::Elements::Probe )],
+            parts           =>  [qw( WSDiscovery10::Elements::Probe )],
 
         },
         header => {
@@ -55,12 +55,12 @@ __END__
 
 =head1 NAME
 
-WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
+WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort - SOAP Interface for the WSDiscovery Web Service
 
 =head1 SYNOPSIS
 
- use WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
- my $interface = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new();
+ use WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+ my $interface = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new();
 
  my $response;
  $response = $interface->ProbeOp();
@@ -114,9 +114,9 @@ hash refs. See the respective class' documentation for additional information.
 
 
 
-Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatches> object.
+Returns a L<WSDiscovery10::Elements::ProbeMatches|WSDiscovery10::Elements::ProbeMatches> object.
 
- $response = $interface->ProbeOp( { # WSDiscovery::Types::ProbeType
+ $response = $interface->ProbeOp( { # WSDiscovery10::Types::ProbeType
     Types => $some_value, # QNameListType
     Scopes =>  { value => $some_value },
   },,
@@ -126,6 +126,6 @@ Returns a L<WSDiscovery::Elements::ProbeMatches|WSDiscovery::Elements::ProbeMatc
 
 =head1 AUTHOR
 
-Generated by SOAP::WSDL on Wed Jul  2 11:45:24 2014
+Generated by SOAP::WSDL on Sat Mar 19 18:11:58 2016
 
 =cut
diff --git a/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
new file mode 100644
index 000000000..635a19393
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Typemaps/WSDiscovery.pm
@@ -0,0 +1,56 @@
+
+package WSDiscovery10::Typemaps::WSDiscovery;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'Probe/Types' => 'WSDiscovery10::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceParameters' => 'WSDiscovery10::Types::ReferenceParametersType',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Probe/Scopes' => 'WSDiscovery10::Types::ScopesType',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'ProbeMatches/ProbeMatch' => 'WSDiscovery10::Types::ProbeMatchType',
+               'ProbeMatches/ProbeMatch/MetadataVersion' => 'SOAP::WSDL::XSD::Typelib::Builtin::unsignedInt',
+               'ProbeMatches/ProbeMatch/Scopes' => 'WSDiscovery10::Types::ScopesType',
+               'ProbeMatches' => 'WSDiscovery10::Elements::ProbeMatches',
+               'ProbeMatches/ProbeMatch/EndpointReference/ServiceName' => 'WSDiscovery10::Types::ServiceNameType',
+               'Probe' => 'WSDiscovery10::Elements::Probe',
+               'ProbeMatches/ProbeMatch/EndpointReference/Address' => 'WSDiscovery10::Types::AttributedURI',
+               'ProbeMatches/ProbeMatch/XAddrs' => 'WSDiscovery10::Types::UriListType',
+               'ProbeMatches/ProbeMatch/Types' => 'WSDiscovery10::Types::QNameListType',
+               'ProbeMatches/ProbeMatch/EndpointReference' => 'WSDiscovery10::Types::EndpointReferenceType',
+               'ProbeMatches/ProbeMatch/EndpointReference/ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
+               'ProbeMatches/ProbeMatch/EndpointReference/PortType' => 'WSDiscovery10::Types::AttributedQName'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Typemaps::WSDiscovery - typemap for WSDiscovery
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm b/onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
similarity index 78%
rename from onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
index 18e8ea8c3..d000bba34 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AppSequenceType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AppSequenceType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::AppSequenceType;
+package WSDiscovery10::Types::AppSequenceType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -15,7 +15,7 @@ sub __get_attr_class {
 
 use base qw();
 
-package WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr;
+package WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -57,12 +57,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::AppSequenceType
+WSDiscovery10::Types::AppSequenceType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-AppSequenceType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+AppSequenceType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -87,7 +87,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::AppSequenceType
+ { # WSDiscovery10::Types::AppSequenceType
  },
 
 
@@ -99,7 +99,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::AppSequenceType::_AppSequenceType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::AppSequenceType::_AppSequenceType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm b/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
new file mode 100644
index 000000000..057b02374
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AttributedQName.pm
@@ -0,0 +1,73 @@
+package WSDiscovery10::Types::AttributedQName;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::AttributedQName
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedQName from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm b/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
new file mode 100644
index 000000000..841b730af
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/AttributedURI.pm
@@ -0,0 +1,73 @@
+package WSDiscovery10::Types::AttributedURI;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::AttributedURI
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedURI from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ByeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Types/ByeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
index 9c384fb2a..1cedf9c30 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ByeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ByeType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ByeType;
+package WSDiscovery10::Types::ByeType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ByeType
+WSDiscovery10::Types::ByeType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ByeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ByeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ByeType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ByeType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
new file mode 100644
index 000000000..9a96b103e
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/EndpointReferenceType.pm
@@ -0,0 +1,141 @@
+package WSDiscovery10::Types::EndpointReferenceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Address_of :ATTR(:get<Address>);
+my %ReferenceProperties_of :ATTR(:get<ReferenceProperties>);
+my %ReferenceParameters_of :ATTR(:get<ReferenceParameters>);
+my %PortType_of :ATTR(:get<PortType>);
+my %ServiceName_of :ATTR(:get<ServiceName>);
+
+__PACKAGE__->_factory(
+    [ qw(        Address
+        ReferenceProperties
+        ReferenceParameters
+        PortType
+        ServiceName
+
+    ) ],
+    {
+        'Address' => \%Address_of,
+        'ReferenceProperties' => \%ReferenceProperties_of,
+        'ReferenceParameters' => \%ReferenceParameters_of,
+        'PortType' => \%PortType_of,
+        'ServiceName' => \%ServiceName_of,
+    },
+    {
+        'Address' => 'WSDiscovery10::Types::AttributedURI',
+        'ReferenceProperties' => 'WSDiscovery10::Types::ReferencePropertiesType',
+        'ReferenceParameters' => 'WSDiscovery10::Types::ReferenceParametersType',
+        'PortType' => 'WSDiscovery10::Types::AttributedQName',
+        'ServiceName' => 'WSDiscovery10::Types::ServiceNameType',
+    },
+    {
+
+        'Address' => 'Address',
+        'ReferenceProperties' => 'ReferenceProperties',
+        'ReferenceParameters' => 'ReferenceParameters',
+        'PortType' => 'PortType',
+        'ServiceName' => 'ServiceName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::EndpointReferenceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+EndpointReferenceType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+If "Policy" elements from namespace "http://schemas.xmlsoap.org/ws/2002/12/policy#policy" are used, they must appear first (before any extensibility elements). 
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Address
+
+
+=item * ReferenceProperties
+
+
+=item * ReferenceParameters
+
+
+=item * PortType
+
+
+=item * ServiceName
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
+   },
+   ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
+   },
+   PortType =>  { value => $some_value },
+   ServiceName =>  { value => $some_value },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
similarity index 85%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
index 52f5d2c8f..cd183e240 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeOpenType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeOpenType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodeOpenType;
+package WSDiscovery10::Types::FaultCodeOpenType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by union
 # union is not fully supported yet - value space constraints are not
@@ -31,7 +31,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodeOpenType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+FaultCodeOpenType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
similarity index 80%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
index 4cc63eb8b..13be77bdc 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultCodeType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::FaultCodeType;
+package WSDiscovery10::Types::FaultCodeType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 # derivation by restriction
 use base qw(
@@ -23,7 +23,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-FaultCodeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+FaultCodeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm b/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
new file mode 100644
index 000000000..f49d7d269
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/FaultSubcodeValues.pm
@@ -0,0 +1,65 @@
+package WSDiscovery10::Types::FaultSubcodeValues;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FaultSubcodeValues from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/HelloType.pm b/onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Types/HelloType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
index 1842faf6a..8cca31e90 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/HelloType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/HelloType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::HelloType;
+package WSDiscovery10::Types::HelloType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::HelloType
+WSDiscovery10::Types::HelloType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-HelloType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+HelloType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::HelloType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::HelloType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm b/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
new file mode 100644
index 000000000..45aab20e5
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/OpenRelationshipType.pm
@@ -0,0 +1,76 @@
+package WSDiscovery10::Types::OpenRelationshipType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+OpenRelationshipType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
index c85d98849..19bd18e88 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeMatchType;
+package WSDiscovery10::Types::ProbeMatchType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeMatchType
+WSDiscovery10::Types::ProbeMatchType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatchType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
similarity index 63%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
index 200edc6a4..20f101d03 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeMatchesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeMatchesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeMatchesType;
+package WSDiscovery10::Types::ProbeMatchesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'ProbeMatch' => \%ProbeMatch_of,
     },
     {
-        'ProbeMatch' => 'WSDiscovery::Types::ProbeMatchType',
+        'ProbeMatch' => 'WSDiscovery10::Types::ProbeMatchType',
     },
     {
 
@@ -55,12 +55,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeMatchesType
+WSDiscovery10::Types::ProbeMatchesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeMatchesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -88,14 +88,16 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeMatchesType
-   ProbeMatch =>  { # WSDiscovery::Types::ProbeMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ProbeMatchesType
+   ProbeMatch =>  { # WSDiscovery10::Types::ProbeMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
index 60dfa0bf3..10c290e8e 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProbeType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ProbeType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ProbeType;
+package WSDiscovery10::Types::ProbeType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -34,9 +34,9 @@ __PACKAGE__->_factory(
         'Scopes' => \%Scopes_of,
     },
     {
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
     },
     {
@@ -62,12 +62,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProbeType
+WSDiscovery10::Types::ProbeType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ProbeType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ProbeType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -110,7 +110,7 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProbeType
+ { # WSDiscovery10::Types::ProbeType
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
  },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm b/onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
index fef443675..79cffd694 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/QNameListType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/QNameListType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::QNameListType;
+package WSDiscovery10::Types::QNameListType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 
 # list derivation
@@ -28,7 +28,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-QNameListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+QNameListType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
new file mode 100644
index 000000000..fd5987604
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReferenceParametersType.pm
@@ -0,0 +1,94 @@
+package WSDiscovery10::Types::ReferenceParametersType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::ReferenceParametersType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReferenceParametersType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::ReferenceParametersType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
new file mode 100644
index 000000000..9e3ba9add
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReferencePropertiesType.pm
@@ -0,0 +1,94 @@
+package WSDiscovery10::Types::ReferencePropertiesType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::ReferencePropertiesType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReferencePropertiesType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSDiscovery10::Types::ReferencePropertiesType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm b/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
new file mode 100644
index 000000000..3521517a8
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/Relationship.pm
@@ -0,0 +1,118 @@
+package WSDiscovery10::Types::Relationship;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::Relationship::_Relationship::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+package WSDiscovery10::Types::Relationship::_Relationship::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %RelationshipType_of :ATTR(:get<RelationshipType>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        RelationshipType
+    ) ],
+    {
+
+        RelationshipType => \%RelationshipType_of,
+    },
+    {
+        RelationshipType => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::Relationship
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Relationship from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery10::Types::Relationship::_Relationship::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * RelationshipType
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::QName|SOAP::WSDL::XSD::Typelib::Builtin::QName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
new file mode 100644
index 000000000..b9d902573
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipType.pm
@@ -0,0 +1,65 @@
+package WSDiscovery10::Types::RelationshipType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
new file mode 100644
index 000000000..125c4f2cd
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RelationshipTypeValues.pm
@@ -0,0 +1,65 @@
+package WSDiscovery10::Types::RelationshipTypeValues;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+RelationshipTypeValues from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
new file mode 100644
index 000000000..3f0c3ecf1
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ReplyAfterType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery10::Types::ReplyAfterType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::ReplyAfterType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ReplyAfterType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
index 03216f066..08e885408 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveMatchType;
+package WSDiscovery10::Types::ResolveMatchType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -43,15 +43,15 @@ __PACKAGE__->_factory(
         'MetadataVersion' => \%MetadataVersion_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
-        'Types' => 'WSDiscovery::Elements::Types',
+        'Types' => 'WSDiscovery10::Elements::Types',
 
-        'Scopes' => 'WSDiscovery::Elements::Scopes',
+        'Scopes' => 'WSDiscovery10::Elements::Scopes',
 
-        'XAddrs' => 'WSDiscovery::Elements::XAddrs',
+        'XAddrs' => 'WSDiscovery10::Elements::XAddrs',
 
-        'MetadataVersion' => 'WSDiscovery::Elements::MetadataVersion',
+        'MetadataVersion' => 'WSDiscovery10::Elements::MetadataVersion',
 
     },
     {
@@ -80,12 +80,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveMatchType
+WSDiscovery10::Types::ResolveMatchType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveMatchType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatchType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -155,13 +155,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
    Types => $some_value, # QNameListType
    Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
similarity index 62%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
index 3e0db0619..5ca08a7b1 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveMatchesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveMatchesType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveMatchesType;
+package WSDiscovery10::Types::ResolveMatchesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'ResolveMatch' => \%ResolveMatch_of,
     },
     {
-        'ResolveMatch' => 'WSDiscovery::Types::ResolveMatchType',
+        'ResolveMatch' => 'WSDiscovery10::Types::ResolveMatchType',
     },
     {
 
@@ -55,12 +55,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveMatchesType
+WSDiscovery10::Types::ResolveMatchesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveMatchesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveMatchesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -88,14 +88,16 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveMatchesType
-   ResolveMatch =>  { # WSDiscovery::Types::ResolveMatchType
-     EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveMatchesType
+   ResolveMatch =>  { # WSDiscovery10::Types::ResolveMatchType
+     EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
        Address =>  { value => $some_value },
-       ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+       ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
        },
-       Metadata =>  { # WSDiscovery::Types::MetadataType
+       ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
        },
+       PortType =>  { value => $some_value },
+       ServiceName =>  { value => $some_value },
      },
      Types => $some_value, # QNameListType
      Scopes =>  { value => $some_value },
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
similarity index 66%
rename from onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
index f1ddd13f5..87e8e8dbd 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ResolveType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ResolveType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::ResolveType;
+package WSDiscovery10::Types::ResolveType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'EndpointReference' => \%EndpointReference_of,
     },
     {
-        'EndpointReference' => 'WSDiscovery::Elements::EndpointReference',
+        'EndpointReference' => 'WSDiscovery10::Elements::EndpointReference',
 
     },
     {
@@ -56,12 +56,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ResolveType
+WSDiscovery10::Types::ResolveType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ResolveType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ResolveType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -95,13 +95,15 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ResolveType
-   EndpointReference =>  { # WSDiscovery::Types::EndpointReferenceType
+ { # WSDiscovery10::Types::ResolveType
+   EndpointReference =>  { # WSDiscovery10::Types::EndpointReferenceType
      Address =>  { value => $some_value },
-     ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+     ReferenceProperties =>  { # WSDiscovery10::Types::ReferencePropertiesType
      },
-     Metadata =>  { # WSDiscovery::Types::MetadataType
+     ReferenceParameters =>  { # WSDiscovery10::Types::ReferenceParametersType
      },
+     PortType =>  { value => $some_value },
+     ServiceName =>  { value => $some_value },
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm b/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
new file mode 100644
index 000000000..a878dc46c
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/RetryAfterType.pm
@@ -0,0 +1,73 @@
+package WSDiscovery10::Types::RetryAfterType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger
+);
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::RetryAfterType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+RetryAfterType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
similarity index 73%
rename from onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
index 84cdfa057..c92029bcd 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ScopesType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ScopesType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::ScopesType;
+package WSDiscovery10::Types::ScopesType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -15,10 +15,10 @@ sub __get_attr_class {
 
 use base qw(
     SOAP::WSDL::XSD::Typelib::ComplexType
-    WSDiscovery::Types::UriListType
+    WSDiscovery10::Types::UriListType
 );
 
-package WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr;
+package WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -50,12 +50,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ScopesType
+WSDiscovery10::Types::ScopesType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-ScopesType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+ScopesType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -91,7 +91,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::ScopesType::_ScopesType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::ScopesType::_ScopesType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm b/onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
similarity index 75%
rename from onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
index 968033307..01b18d2df 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/SecurityType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/SecurityType.pm
@@ -1,11 +1,11 @@
-package WSDiscovery::Types::SecurityType;
+package WSDiscovery10::Types::SecurityType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
 our $XML_ATTRIBUTE_CLASS;
 undef $XML_ATTRIBUTE_CLASS;
@@ -31,7 +31,7 @@ __PACKAGE__->_factory(
         'Sig' => \%Sig_of,
     },
     {
-        'Sig' => 'WSDiscovery::Elements::Sig',
+        'Sig' => 'WSDiscovery10::Elements::Sig',
 
     },
     {
@@ -56,12 +56,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::SecurityType
+WSDiscovery10::Types::SecurityType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-SecurityType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SecurityType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -95,8 +95,8 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SecurityType
-   Sig =>  { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SecurityType
+   Sig =>  { # WSDiscovery10::Types::SigType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm b/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
new file mode 100644
index 000000000..d83e40608
--- /dev/null
+++ b/onvif/proxy/lib/WSDiscovery10/Types/ServiceNameType.pm
@@ -0,0 +1,118 @@
+package WSDiscovery10::Types::ServiceNameType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2004/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::QName
+);
+
+package WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %PortName_of :ATTR(:get<PortName>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        PortName
+    ) ],
+    {
+
+        PortName => \%PortName_of,
+    },
+    {
+        PortName => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSDiscovery10::Types::ServiceNameType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ServiceNameType from the namespace http://schemas.xmlsoap.org/ws/2004/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $some_value },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSDiscovery10::Types::ServiceNameType::_ServiceNameType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * PortName
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/SigType.pm b/onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
similarity index 83%
rename from onvif/proxy/lib/WSDiscovery/Types/SigType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
index 71eb613df..3db2ddcc5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/SigType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/SigType.pm
@@ -1,13 +1,13 @@
-package WSDiscovery::Types::SigType;
+package WSDiscovery10::Types::SigType;
 use strict;
 use warnings;
 
 
 __PACKAGE__->_set_element_form_qualified(0);
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01' };
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::SigType::_SigType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSDiscovery10::Types::SigType::_SigType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -38,7 +38,7 @@ __PACKAGE__->_factory(
 
 
 
-package WSDiscovery::Types::SigType::_SigType::XmlAttr;
+package WSDiscovery10::Types::SigType::_SigType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -85,12 +85,12 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::SigType
+WSDiscovery10::Types::SigType
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined complexType
-SigType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+SigType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
@@ -115,7 +115,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::SigType
+ { # WSDiscovery10::Types::SigType
  },
 
 
@@ -127,7 +127,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::SigType::_SigType::XmlAttr.
+attr() returns an object of the class WSDiscovery10::Types::SigType::_SigType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
diff --git a/onvif/proxy/lib/WSDiscovery/Types/UriListType.pm b/onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
similarity index 81%
rename from onvif/proxy/lib/WSDiscovery/Types/UriListType.pm
rename to onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
index 1a04cfbee..c59a32f37 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/UriListType.pm
+++ b/onvif/proxy/lib/WSDiscovery10/Types/UriListType.pm
@@ -1,8 +1,8 @@
-package WSDiscovery::Types::UriListType;
+package WSDiscovery10::Types::UriListType;
 use strict;
 use warnings;
 
-sub get_xmlns { 'http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01'};
+sub get_xmlns { 'http://schemas.xmlsoap.org/ws/2005/04/discovery'};
 
 
 # list derivation
@@ -28,7 +28,7 @@ __END__
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined simpleType
-UriListType from the namespace http://docs.oasis-open.org/ws-dd/ns/discovery/2009/01.
+UriListType from the namespace http://schemas.xmlsoap.org/ws/2005/04/discovery.
 
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm b/onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm
similarity index 77%
rename from onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm
rename to onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm
index c04039b1f..ae78b1f36 100644
--- a/onvif/proxy/lib/WSDiscovery/Attributes/IsReferenceParameter.pm
+++ b/onvif/proxy/lib/WSNotification/Attributes/IsReferenceParameter.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Attributes::IsReferenceParameter;
+package WSNotification::Attributes::IsReferenceParameter;
 use strict;
 use warnings;
 
@@ -23,7 +23,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Attributes::IsReferenceParameter
+WSNotification::Attributes::IsReferenceParameter
 
 =head1 DESCRIPTION
 
@@ -40,7 +40,7 @@ IsReferenceParameter from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Attributes::IsReferenceParameter->new($data);
+ my $element = WSNotification::Attributes::IsReferenceParameter->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSNotification/Attributes/base.pm b/onvif/proxy/lib/WSNotification/Attributes/base.pm
new file mode 100644
index 000000000..97dd22b2d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/base.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::base;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('base');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::base
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+base from the namespace http://www.w3.org/XML/1998/namespace.
+
+http://www.w3.org/TR/xmlbase/ for information about this attribute. 
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::base->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/id.pm b/onvif/proxy/lib/WSNotification/Attributes/id.pm
new file mode 100644
index 000000000..619ebc869
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/id.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::id;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('id');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::ID
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::id
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+id from the namespace http://www.w3.org/XML/1998/namespace.
+
+http://www.w3.org/TR/xml-id/ for information about this attribute. 
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::id->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/lang.pm b/onvif/proxy/lib/WSNotification/Attributes/lang.pm
new file mode 100644
index 000000000..781d7e766
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/lang.pm
@@ -0,0 +1,72 @@
+
+package WSNotification::Attributes::lang;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('lang');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::lang
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+lang from the namespace http://www.w3.org/XML/1998/namespace.
+
+The union allows for the 'un-declaration' of xml:lang with the empty string. 
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::lang->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/space.pm b/onvif/proxy/lib/WSNotification/Attributes/space.pm
new file mode 100644
index 000000000..e585b2974
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/space.pm
@@ -0,0 +1,64 @@
+
+package WSNotification::Attributes::space;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/XML/1998/namespace' }
+
+__PACKAGE__->__set_name('space');
+__PACKAGE__->__set_ref();
+
+# atomic simpleType: <attribute><simpleType
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+);
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::NCName);
+
+
+}
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::space
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+space from the namespace http://www.w3.org/XML/1998/namespace.
+
+denotes an attribute whose value is a keyword indicating what whitespace processing discipline is intended for the content of the element; its value is inherited. This name is reserved by virtue of its definition in the XML specification. 
+
+
+
+
+This XML element type class has a atomic simpleType as it's base:
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::space->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/topic.pm b/onvif/proxy/lib/WSNotification/Attributes/topic.pm
new file mode 100644
index 000000000..b3f89669e
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/topic.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::topic;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('topic');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::topic
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+topic from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::topic->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm b/onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm
new file mode 100644
index 000000000..178f270c6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Attributes/topicNamespaceLocation.pm
@@ -0,0 +1,54 @@
+
+package WSNotification::Attributes::topicNamespaceLocation;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('topicNamespaceLocation');
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Attribute
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Attributes::topicNamespaceLocation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined attribute
+topicNamespaceLocation from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Attributes::topicNamespaceLocation->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { value => $value }
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Action.pm b/onvif/proxy/lib/WSNotification/Elements/Action.pm
similarity index 78%
rename from onvif/proxy/lib/WSDiscovery/Elements/Action.pm
rename to onvif/proxy/lib/WSNotification/Elements/Action.pm
index a24d6fdd9..fa2034ea9 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Action.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/Action.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::Action;
+package WSNotification::Elements::Action;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSNotification::Types::AttributedURIType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Action
+WSNotification::Elements::Action
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ Action from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Action->new($data);
+ my $element = WSNotification::Elements::Action->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/BaseFault.pm b/onvif/proxy/lib/WSNotification/Elements/BaseFault.pm
new file mode 100644
index 000000000..aae497541
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/BaseFault.pm
@@ -0,0 +1,72 @@
+
+package WSNotification::Elements::BaseFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsrf/bf-2' }
+
+__PACKAGE__->__set_name('BaseFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::BaseFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::BaseFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+BaseFault from the namespace http://docs.oasis-open.org/wsrf/bf-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::BaseFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::BaseFaultType
+   Timestamp =>  $some_value, # dateTime
+   Originator =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   ErrorCode => 
+ # No documentation generated for complexContent / extension yet
+,
+   Description =>  { value => $some_value },
+   FaultCause =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm b/onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm
new file mode 100644
index 000000000..abf894ef7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ConsumerReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::ConsumerReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ConsumerReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ConsumerReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ConsumerReference from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ConsumerReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm b/onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm
new file mode 100644
index 000000000..e072f4513
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CreatePullPoint.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::CreatePullPoint;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CreatePullPoint');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CreatePullPoint
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreatePullPoint from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CreatePullPoint->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm b/onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm
new file mode 100644
index 000000000..ad7aee7c6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CreatePullPointResponse.pm
@@ -0,0 +1,127 @@
+
+package WSNotification::Elements::CreatePullPointResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CreatePullPointResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %PullPoint_of :ATTR(:get<PullPoint>);
+
+__PACKAGE__->_factory(
+    [ qw(        PullPoint
+
+    ) ],
+    {
+        'PullPoint' => \%PullPoint_of,
+    },
+    {
+        'PullPoint' => 'WSNotification::Types::EndpointReferenceType',
+    },
+    {
+
+        'PullPoint' => 'PullPoint',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CreatePullPointResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreatePullPointResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * PullPoint
+
+ $element->set_PullPoint($data);
+ $element->get_PullPoint();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CreatePullPointResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   PullPoint =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CreationTime.pm b/onvif/proxy/lib/WSNotification/Elements/CreationTime.pm
new file mode 100644
index 000000000..cc7f3bfbc
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CreationTime.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::CreationTime;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CreationTime');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::dateTime
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CreationTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CreationTime from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CreationTime->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # dateTime
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm b/onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm
new file mode 100644
index 000000000..8ec8517c0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/CurrentTime.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::CurrentTime;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('CurrentTime');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::dateTime
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::CurrentTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+CurrentTime from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::CurrentTime->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # dateTime
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm
new file mode 100644
index 000000000..6c1ce18b4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPoint.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::DestroyPullPoint;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('DestroyPullPoint');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::DestroyPullPoint
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DestroyPullPoint from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::DestroyPullPoint->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm
new file mode 100644
index 000000000..f2e97fb62
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/DestroyPullPointResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::DestroyPullPointResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('DestroyPullPointResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::DestroyPullPointResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+DestroyPullPointResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::DestroyPullPointResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm b/onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm
similarity index 64%
rename from onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
rename to onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm
index 96c690bb4..3ea0ed684 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/EndpointReference.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/EndpointReference.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::EndpointReference;
+package WSNotification::Elements::EndpointReference;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
+    WSNotification::Types::EndpointReferenceType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::EndpointReference
+WSNotification::Elements::EndpointReference
 
 =head1 DESCRIPTION
 
@@ -43,15 +43,15 @@ EndpointReference from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::EndpointReference->new($data);
+ my $element = WSNotification::Elements::EndpointReference->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::EndpointReferenceType
+ { # WSNotification::Types::EndpointReferenceType
    Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
    },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
+   Metadata =>  { # WSNotification::Types::MetadataType
    },
  },
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm b/onvif/proxy/lib/WSNotification/Elements/FaultTo.pm
similarity index 65%
rename from onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
rename to onvif/proxy/lib/WSNotification/Elements/FaultTo.pm
index 530f9a4a4..d2504a5af 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/FaultTo.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/FaultTo.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::FaultTo;
+package WSNotification::Elements::FaultTo;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
+    WSNotification::Types::EndpointReferenceType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::FaultTo
+WSNotification::Elements::FaultTo
 
 =head1 DESCRIPTION
 
@@ -43,15 +43,15 @@ FaultTo from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::FaultTo->new($data);
+ my $element = WSNotification::Elements::FaultTo->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::EndpointReferenceType
+ { # WSNotification::Types::EndpointReferenceType
    Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
    },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
+   Metadata =>  { # WSNotification::Types::MetadataType
    },
  },
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/Filter.pm b/onvif/proxy/lib/WSNotification/Elements/Filter.pm
new file mode 100644
index 000000000..78118bc24
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Filter.pm
@@ -0,0 +1,62 @@
+
+package WSNotification::Elements::Filter;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Filter');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::FilterType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Filter
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Filter from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Filter->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::FilterType
+   TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+   },
+   MessageContent =>  { # WSNotification::Types::QueryExpressionType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm b/onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm
new file mode 100644
index 000000000..ff1edd9f6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/FixedTopicSet.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::FixedTopicSet;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('FixedTopicSet');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::boolean
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::FixedTopicSet
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+FixedTopicSet from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::FixedTopicSet->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # boolean
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/From.pm b/onvif/proxy/lib/WSNotification/Elements/From.pm
similarity index 65%
rename from onvif/proxy/lib/WSDiscovery/Elements/From.pm
rename to onvif/proxy/lib/WSNotification/Elements/From.pm
index 727c6a7ef..7e7ba2f30 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/From.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/From.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::From;
+package WSNotification::Elements::From;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
+    WSNotification::Types::EndpointReferenceType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::From
+WSNotification::Elements::From
 
 =head1 DESCRIPTION
 
@@ -43,15 +43,15 @@ From from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::From->new($data);
+ my $element = WSNotification::Elements::From->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::EndpointReferenceType
+ { # WSNotification::Types::EndpointReferenceType
    Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
    },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
+   Metadata =>  { # WSNotification::Types::MetadataType
    },
  },
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm
new file mode 100644
index 000000000..e06255356
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessage.pm
@@ -0,0 +1,122 @@
+
+package WSNotification::Elements::GetCurrentMessage;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetCurrentMessage');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Topic_of :ATTR(:get<Topic>);
+
+__PACKAGE__->_factory(
+    [ qw(        Topic
+
+    ) ],
+    {
+        'Topic' => \%Topic_of,
+    },
+    {
+        'Topic' => 'WSNotification::Types::TopicExpressionType',
+    },
+    {
+
+        'Topic' => 'Topic',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetCurrentMessage
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetCurrentMessage from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Topic
+
+ $element->set_Topic($data);
+ $element->get_Topic();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetCurrentMessage->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   Topic =>  { # WSNotification::Types::TopicExpressionType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm
new file mode 100644
index 000000000..9fae76077
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetCurrentMessageResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::GetCurrentMessageResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetCurrentMessageResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetCurrentMessageResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetCurrentMessageResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetCurrentMessageResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetMessages.pm b/onvif/proxy/lib/WSNotification/Elements/GetMessages.pm
new file mode 100644
index 000000000..fcb244fd1
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetMessages.pm
@@ -0,0 +1,121 @@
+
+package WSNotification::Elements::GetMessages;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetMessages');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %MaximumNumber_of :ATTR(:get<MaximumNumber>);
+
+__PACKAGE__->_factory(
+    [ qw(        MaximumNumber
+
+    ) ],
+    {
+        'MaximumNumber' => \%MaximumNumber_of,
+    },
+    {
+        'MaximumNumber' => 'SOAP::WSDL::XSD::Typelib::Builtin::nonNegativeInteger',
+    },
+    {
+
+        'MaximumNumber' => 'MaximumNumber',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetMessages
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetMessages from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MaximumNumber
+
+ $element->set_MaximumNumber($data);
+ $element->get_MaximumNumber();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetMessages->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   MaximumNumber =>  $some_value, # nonNegativeInteger
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm b/onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm
new file mode 100644
index 000000000..6eca425c5
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/GetMessagesResponse.pm
@@ -0,0 +1,147 @@
+
+package WSNotification::Elements::GetMessagesResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('GetMessagesResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %NotificationMessage_of :ATTR(:get<NotificationMessage>);
+
+__PACKAGE__->_factory(
+    [ qw(        NotificationMessage
+
+    ) ],
+    {
+        'NotificationMessage' => \%NotificationMessage_of,
+    },
+    {
+        'NotificationMessage' => 'WSNotification::Elements::NotificationMessage',
+
+    },
+    {
+
+        'NotificationMessage' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::GetMessagesResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+GetMessagesResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * NotificationMessage
+
+ $element->set_NotificationMessage($data);
+ $element->get_NotificationMessage();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::GetMessagesResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   NotificationMessage =>  { # WSNotification::Types::NotificationMessageHolderType
+     SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Topic =>  { # WSNotification::Types::TopicExpressionType
+     },
+     ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Message =>  {
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm
new file mode 100644
index 000000000..e7dd68101
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidFilterFault.pm
@@ -0,0 +1,59 @@
+
+package WSNotification::Elements::InvalidFilterFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidFilterFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidFilterFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidFilterFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidFilterFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidFilterFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidFilterFaultType
+   UnknownFilter =>  $some_value, # QName
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm
new file mode 100644
index 000000000..2813d9dc0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidMessageContentExpressionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::InvalidMessageContentExpressionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidMessageContentExpressionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidMessageContentExpressionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidMessageContentExpressionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidMessageContentExpressionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidMessageContentExpressionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidMessageContentExpressionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm
new file mode 100644
index 000000000..41dde93d4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidProducerPropertiesExpressionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::InvalidProducerPropertiesExpressionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidProducerPropertiesExpressionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidProducerPropertiesExpressionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidProducerPropertiesExpressionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidProducerPropertiesExpressionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm b/onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm
new file mode 100644
index 000000000..a4c60dfae
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/InvalidTopicExpressionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::InvalidTopicExpressionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('InvalidTopicExpressionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::InvalidTopicExpressionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::InvalidTopicExpressionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+InvalidTopicExpressionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::InvalidTopicExpressionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidTopicExpressionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/MessageContent.pm b/onvif/proxy/lib/WSNotification/Elements/MessageContent.pm
new file mode 100644
index 000000000..b963df968
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/MessageContent.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::MessageContent;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('MessageContent');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::QueryExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::MessageContent
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MessageContent from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::MessageContent->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::QueryExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm b/onvif/proxy/lib/WSNotification/Elements/MessageID.pm
similarity index 78%
rename from onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm
rename to onvif/proxy/lib/WSNotification/Elements/MessageID.pm
index 54dfa6a50..9d56cf303 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/MessageID.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/MessageID.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::MessageID;
+package WSNotification::Elements::MessageID;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSNotification::Types::AttributedURIType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::MessageID
+WSNotification::Elements::MessageID
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ MessageID from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::MessageID->new($data);
+ my $element = WSNotification::Elements::MessageID->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm b/onvif/proxy/lib/WSNotification/Elements/Metadata.pm
similarity index 74%
rename from onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
rename to onvif/proxy/lib/WSNotification/Elements/Metadata.pm
index 1567ef36a..9511c6578 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/Metadata.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/Metadata.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::Metadata;
+package WSNotification::Elements::Metadata;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::MetadataType
+    WSNotification::Types::MetadataType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::Metadata
+WSNotification::Elements::Metadata
 
 =head1 DESCRIPTION
 
@@ -43,11 +43,11 @@ Metadata from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::Metadata->new($data);
+ my $element = WSNotification::Elements::Metadata->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::MetadataType
+ { # WSNotification::Types::MetadataType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm b/onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm
new file mode 100644
index 000000000..2256bedee
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/MultipleTopicsSpecifiedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::MultipleTopicsSpecifiedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('MultipleTopicsSpecifiedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::MultipleTopicsSpecifiedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::MultipleTopicsSpecifiedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+MultipleTopicsSpecifiedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::MultipleTopicsSpecifiedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::MultipleTopicsSpecifiedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm b/onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm
new file mode 100644
index 000000000..22d200003
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NoCurrentMessageOnTopicFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::NoCurrentMessageOnTopicFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NoCurrentMessageOnTopicFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::NoCurrentMessageOnTopicFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NoCurrentMessageOnTopicFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NoCurrentMessageOnTopicFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NoCurrentMessageOnTopicFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NoCurrentMessageOnTopicFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm b/onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm
new file mode 100644
index 000000000..7efc19920
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NotificationMessage.pm
@@ -0,0 +1,76 @@
+
+package WSNotification::Elements::NotificationMessage;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NotificationMessage');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::NotificationMessageHolderType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NotificationMessage
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NotificationMessage from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NotificationMessage->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotificationMessageHolderType
+   SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Topic =>  { # WSNotification::Types::TopicExpressionType
+   },
+   ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Message =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm b/onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm
new file mode 100644
index 000000000..40e91087f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NotificationProducerRP.pm
@@ -0,0 +1,193 @@
+
+package WSNotification::Elements::NotificationProducerRP;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NotificationProducerRP');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TopicExpression_of :ATTR(:get<TopicExpression>);
+my %FixedTopicSet_of :ATTR(:get<FixedTopicSet>);
+my %TopicExpressionDialect_of :ATTR(:get<TopicExpressionDialect>);
+my %TopicSet_of :ATTR(:get<TopicSet>);
+
+__PACKAGE__->_factory(
+    [ qw(        TopicExpression
+        FixedTopicSet
+        TopicExpressionDialect
+        TopicSet
+
+    ) ],
+    {
+        'TopicExpression' => \%TopicExpression_of,
+        'FixedTopicSet' => \%FixedTopicSet_of,
+        'TopicExpressionDialect' => \%TopicExpressionDialect_of,
+        'TopicSet' => \%TopicSet_of,
+    },
+    {
+        'TopicExpression' => 'WSNotification::Elements::TopicExpression',
+
+        'FixedTopicSet' => 'WSNotification::Elements::FixedTopicSet',
+
+        'TopicExpressionDialect' => 'WSNotification::Elements::TopicExpressionDialect',
+
+        'TopicSet' => 'WSNotification::Elements::TopicSet',
+
+    },
+    {
+
+        'TopicExpression' => '',
+        'FixedTopicSet' => '',
+        'TopicExpressionDialect' => '',
+        'TopicSet' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NotificationProducerRP
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NotificationProducerRP from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TopicExpression
+
+ $element->set_TopicExpression($data);
+ $element->get_TopicExpression();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * FixedTopicSet
+
+ $element->set_FixedTopicSet($data);
+ $element->get_FixedTopicSet();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * TopicExpressionDialect
+
+ $element->set_TopicExpressionDialect($data);
+ $element->get_TopicExpressionDialect();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * TopicSet
+
+ $element->set_TopicSet($data);
+ $element->get_TopicSet();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NotificationProducerRP->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+   },
+   FixedTopicSet =>  $some_value, # boolean
+   TopicExpressionDialect =>  $some_value, # anyURI
+   TopicSet =>  { # WSNotification::Types::TopicSetType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Notify.pm b/onvif/proxy/lib/WSNotification/Elements/Notify.pm
new file mode 100644
index 000000000..781b0551d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Notify.pm
@@ -0,0 +1,147 @@
+
+package WSNotification::Elements::Notify;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Notify');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %NotificationMessage_of :ATTR(:get<NotificationMessage>);
+
+__PACKAGE__->_factory(
+    [ qw(        NotificationMessage
+
+    ) ],
+    {
+        'NotificationMessage' => \%NotificationMessage_of,
+    },
+    {
+        'NotificationMessage' => 'WSNotification::Elements::NotificationMessage',
+
+    },
+    {
+
+        'NotificationMessage' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Notify
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Notify from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * NotificationMessage
+
+ $element->set_NotificationMessage($data);
+ $element->get_NotificationMessage();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Notify->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   NotificationMessage =>  { # WSNotification::Types::NotificationMessageHolderType
+     SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Topic =>  { # WSNotification::Types::TopicExpressionType
+     },
+     ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+       Address =>  { value => $some_value },
+       ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+       },
+       Metadata =>  { # WSNotification::Types::MetadataType
+       },
+     },
+     Message =>  {
+     },
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm b/onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm
new file mode 100644
index 000000000..f322b7f0f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/NotifyMessageNotSupportedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::NotifyMessageNotSupportedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('NotifyMessageNotSupportedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::NotifyMessageNotSupportedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::NotifyMessageNotSupportedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+NotifyMessageNotSupportedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::NotifyMessageNotSupportedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotifyMessageNotSupportedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm b/onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm
similarity index 53%
rename from onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
rename to onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm
index 1f8cd7cbc..bcf1aa8e6 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ReferenceParameters.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/PauseFailedFault.pm
@@ -1,20 +1,20 @@
 
-package WSDiscovery::Elements::ReferenceParameters;
+package WSNotification::Elements::PauseFailedFault;
 use strict;
 use warnings;
 
 { # BLOCK to scope variables
 
-sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
 
-__PACKAGE__->__set_name('ReferenceParameters');
+__PACKAGE__->__set_name('PauseFailedFault');
 __PACKAGE__->__set_nillable();
 __PACKAGE__->__set_minOccurs();
 __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ReferenceParametersType
+    WSNotification::Types::PauseFailedFaultType
 );
 
 }
@@ -26,12 +26,12 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ReferenceParameters
+WSNotification::Elements::PauseFailedFault
 
 =head1 DESCRIPTION
 
 Perl data type class for the XML Schema defined element
-ReferenceParameters from the namespace http://www.w3.org/2005/08/addressing.
+PauseFailedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
 
 
 
@@ -43,11 +43,11 @@ ReferenceParameters from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ReferenceParameters->new($data);
+ my $element = WSNotification::Elements::PauseFailedFault->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ReferenceParametersType
+ { # WSNotification::Types::PauseFailedFaultType
  },
 
 =head1 AUTHOR
diff --git a/onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm b/onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm
new file mode 100644
index 000000000..eb6e991d6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/PauseSubscription.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::PauseSubscription;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('PauseSubscription');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::PauseSubscription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PauseSubscription from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::PauseSubscription->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm b/onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm
new file mode 100644
index 000000000..ef09471e9
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/PauseSubscriptionResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::PauseSubscriptionResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('PauseSubscriptionResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::PauseSubscriptionResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+PauseSubscriptionResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::PauseSubscriptionResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm
similarity index 74%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
rename to onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm
index 2512b7e91..b6463ca9b 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemAction.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemAction.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::ProblemAction;
+package WSNotification::Elements::ProblemAction;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::ProblemActionType
+    WSNotification::Types::ProblemActionType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProblemAction
+WSNotification::Elements::ProblemAction
 
 =head1 DESCRIPTION
 
@@ -43,11 +43,11 @@ ProblemAction from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProblemAction->new($data);
+ my $element = WSNotification::Elements::ProblemAction->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProblemActionType
+ { # WSNotification::Types::ProblemActionType
    Action =>  { value => $some_value },
    SoapAction =>  $some_value, # anyURI
  },
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm
new file mode 100644
index 000000000..dc58a06ee
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemHeader.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::ProblemHeader;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' }
+
+__PACKAGE__->__set_name('ProblemHeader');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::AttributedAnyType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProblemHeader
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProblemHeader from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProblemHeader->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::AttributedAnyType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm
similarity index 76%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
rename to onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm
index bd6f34982..eb1651154 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemHeaderQName.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemHeaderQName.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::ProblemHeaderQName;
+package WSNotification::Elements::ProblemHeaderQName;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedQNameType
+    WSNotification::Types::AttributedQNameType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProblemHeaderQName
+WSNotification::Elements::ProblemHeaderQName
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ ProblemHeaderQName from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProblemHeaderQName->new($data);
+ my $element = WSNotification::Elements::ProblemHeaderQName->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm b/onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm
similarity index 77%
rename from onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm
rename to onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm
index 70fe19410..336b92027 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ProblemIRI.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/ProblemIRI.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::ProblemIRI;
+package WSNotification::Elements::ProblemIRI;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSNotification::Types::AttributedURIType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ProblemIRI
+WSNotification::Elements::ProblemIRI
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ ProblemIRI from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ProblemIRI->new($data);
+ my $element = WSNotification::Elements::ProblemIRI->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm b/onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm
new file mode 100644
index 000000000..cdfef17d7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProducerProperties.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::ProducerProperties;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ProducerProperties');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::QueryExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProducerProperties
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProducerProperties from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProducerProperties->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::QueryExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm b/onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm
new file mode 100644
index 000000000..8fad76b7a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ProducerReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::ProducerReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ProducerReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ProducerReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ProducerReference from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ProducerReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm b/onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm
similarity index 78%
rename from onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm
rename to onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm
index ffdf501aa..7561b146a 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/RelatesTo.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/RelatesTo.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::RelatesTo;
+package WSNotification::Elements::RelatesTo;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::RelatesToType
+    WSNotification::Types::RelatesToType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::RelatesTo
+WSNotification::Elements::RelatesTo
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ RelatesTo from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::RelatesTo->new($data);
+ my $element = WSNotification::Elements::RelatesTo->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/Renew.pm b/onvif/proxy/lib/WSNotification/Elements/Renew.pm
new file mode 100644
index 000000000..0647997fa
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Renew.pm
@@ -0,0 +1,121 @@
+
+package WSNotification::Elements::Renew;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Renew');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TerminationTime_of :ATTR(:get<TerminationTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        TerminationTime
+
+    ) ],
+    {
+        'TerminationTime' => \%TerminationTime_of,
+    },
+    {
+        'TerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+    },
+    {
+
+        'TerminationTime' => 'TerminationTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Renew
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Renew from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TerminationTime
+
+ $element->set_TerminationTime($data);
+ $element->get_TerminationTime();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Renew->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   TerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm b/onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm
new file mode 100644
index 000000000..805e90e2b
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/RenewResponse.pm
@@ -0,0 +1,149 @@
+
+package WSNotification::Elements::RenewResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('RenewResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TerminationTime_of :ATTR(:get<TerminationTime>);
+my %CurrentTime_of :ATTR(:get<CurrentTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        TerminationTime
+        CurrentTime
+
+    ) ],
+    {
+        'TerminationTime' => \%TerminationTime_of,
+        'CurrentTime' => \%CurrentTime_of,
+    },
+    {
+        'TerminationTime' => 'WSNotification::Elements::TerminationTime',
+
+        'CurrentTime' => 'WSNotification::Elements::CurrentTime',
+
+    },
+    {
+
+        'TerminationTime' => '',
+        'CurrentTime' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::RenewResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+RenewResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TerminationTime
+
+ $element->set_TerminationTime($data);
+ $element->get_TerminationTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * CurrentTime
+
+ $element->set_CurrentTime($data);
+ $element->get_CurrentTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::RenewResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   TerminationTime =>  $some_value, # dateTime
+   CurrentTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm b/onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm
similarity index 65%
rename from onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
rename to onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm
index 428378c5e..b60354464 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/ReplyTo.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/ReplyTo.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::ReplyTo;
+package WSNotification::Elements::ReplyTo;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::EndpointReferenceType
+    WSNotification::Types::EndpointReferenceType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::ReplyTo
+WSNotification::Elements::ReplyTo
 
 =head1 DESCRIPTION
 
@@ -43,15 +43,15 @@ ReplyTo from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::ReplyTo->new($data);
+ my $element = WSNotification::Elements::ReplyTo->new($data);
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::EndpointReferenceType
+ { # WSNotification::Types::EndpointReferenceType
    Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
    },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
+   Metadata =>  { # WSNotification::Types::MetadataType
    },
  },
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm b/onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm
new file mode 100644
index 000000000..d25a20fe7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ResumeFailedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::ResumeFailedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ResumeFailedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::ResumeFailedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ResumeFailedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResumeFailedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ResumeFailedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ResumeFailedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm
new file mode 100644
index 000000000..23571e479
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscription.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::ResumeSubscription;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ResumeSubscription');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ResumeSubscription
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResumeSubscription from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ResumeSubscription->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm
new file mode 100644
index 000000000..bdb2bf122
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/ResumeSubscriptionResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::ResumeSubscriptionResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('ResumeSubscriptionResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::ResumeSubscriptionResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+ResumeSubscriptionResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::ResumeSubscriptionResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm b/onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm
similarity index 77%
rename from onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm
rename to onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm
index 980eeab2d..1299defd3 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/RetryAfter.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/RetryAfter.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::RetryAfter;
+package WSNotification::Elements::RetryAfter;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedUnsignedLongType
+    WSNotification::Types::AttributedUnsignedLongType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::RetryAfter
+WSNotification::Elements::RetryAfter
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ RetryAfter from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::RetryAfter->new($data);
+ my $element = WSNotification::Elements::RetryAfter->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/Subscribe.pm b/onvif/proxy/lib/WSNotification/Elements/Subscribe.pm
new file mode 100644
index 000000000..a1971bbfc
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Subscribe.pm
@@ -0,0 +1,219 @@
+
+package WSNotification::Elements::Subscribe;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Subscribe');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConsumerReference_of :ATTR(:get<ConsumerReference>);
+my %Filter_of :ATTR(:get<Filter>);
+my %InitialTerminationTime_of :ATTR(:get<InitialTerminationTime>);
+my %SubscriptionPolicy_of :ATTR(:get<SubscriptionPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConsumerReference
+        Filter
+        InitialTerminationTime
+        SubscriptionPolicy
+
+    ) ],
+    {
+        'ConsumerReference' => \%ConsumerReference_of,
+        'Filter' => \%Filter_of,
+        'InitialTerminationTime' => \%InitialTerminationTime_of,
+        'SubscriptionPolicy' => \%SubscriptionPolicy_of,
+    },
+    {
+        'ConsumerReference' => 'WSNotification::Types::EndpointReferenceType',
+        'Filter' => 'WSNotification::Types::FilterType',
+        'InitialTerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+
+        'SubscriptionPolicy' => 'WSNotification::Elements::Subscribe::_SubscriptionPolicy',
+    },
+    {
+
+        'ConsumerReference' => 'ConsumerReference',
+        'Filter' => 'Filter',
+        'InitialTerminationTime' => 'InitialTerminationTime',
+        'SubscriptionPolicy' => 'SubscriptionPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Elements::Subscribe::_SubscriptionPolicy;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Subscribe
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Subscribe from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConsumerReference
+
+ $element->set_ConsumerReference($data);
+ $element->get_ConsumerReference();
+
+
+
+
+=item * Filter
+
+ $element->set_Filter($data);
+ $element->get_Filter();
+
+
+
+
+=item * InitialTerminationTime
+
+ $element->set_InitialTerminationTime($data);
+ $element->get_InitialTerminationTime();
+
+
+
+
+=item * SubscriptionPolicy
+
+ $element->set_SubscriptionPolicy($data);
+ $element->get_SubscriptionPolicy();
+
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Subscribe->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Filter =>  { # WSNotification::Types::FilterType
+     TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+     },
+     MessageContent =>  { # WSNotification::Types::QueryExpressionType
+     },
+   },
+   InitialTerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+   SubscriptionPolicy =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm b/onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm
new file mode 100644
index 000000000..1084e01a1
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscribeCreationFailedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::SubscribeCreationFailedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscribeCreationFailedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::SubscribeCreationFailedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscribeCreationFailedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscribeCreationFailedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscribeCreationFailedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscribeCreationFailedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm b/onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm
new file mode 100644
index 000000000..6c7ad4444
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscribeResponse.pm
@@ -0,0 +1,169 @@
+
+package WSNotification::Elements::SubscribeResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscribeResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SubscriptionReference_of :ATTR(:get<SubscriptionReference>);
+my %CurrentTime_of :ATTR(:get<CurrentTime>);
+my %TerminationTime_of :ATTR(:get<TerminationTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        SubscriptionReference
+        CurrentTime
+        TerminationTime
+
+    ) ],
+    {
+        'SubscriptionReference' => \%SubscriptionReference_of,
+        'CurrentTime' => \%CurrentTime_of,
+        'TerminationTime' => \%TerminationTime_of,
+    },
+    {
+        'SubscriptionReference' => 'WSNotification::Types::EndpointReferenceType',
+        'CurrentTime' => 'WSNotification::Elements::CurrentTime',
+
+        'TerminationTime' => 'WSNotification::Elements::TerminationTime',
+
+    },
+    {
+
+        'SubscriptionReference' => 'SubscriptionReference',
+        'CurrentTime' => '',
+        'TerminationTime' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscribeResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscribeResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SubscriptionReference
+
+ $element->set_SubscriptionReference($data);
+ $element->get_SubscriptionReference();
+
+
+
+
+=item * CurrentTime
+
+ $element->set_CurrentTime($data);
+ $element->get_CurrentTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * TerminationTime
+
+ $element->set_TerminationTime($data);
+ $element->get_TerminationTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscribeResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   CurrentTime =>  $some_value, # dateTime
+   TerminationTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm b/onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm
new file mode 100644
index 000000000..e6813d8a5
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscriptionManagerRP.pm
@@ -0,0 +1,203 @@
+
+package WSNotification::Elements::SubscriptionManagerRP;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscriptionManagerRP');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %ConsumerReference_of :ATTR(:get<ConsumerReference>);
+my %Filter_of :ATTR(:get<Filter>);
+my %SubscriptionPolicy_of :ATTR(:get<SubscriptionPolicy>);
+my %CreationTime_of :ATTR(:get<CreationTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        ConsumerReference
+        Filter
+        SubscriptionPolicy
+        CreationTime
+
+    ) ],
+    {
+        'ConsumerReference' => \%ConsumerReference_of,
+        'Filter' => \%Filter_of,
+        'SubscriptionPolicy' => \%SubscriptionPolicy_of,
+        'CreationTime' => \%CreationTime_of,
+    },
+    {
+        'ConsumerReference' => 'WSNotification::Elements::ConsumerReference',
+
+        'Filter' => 'WSNotification::Elements::Filter',
+
+        'SubscriptionPolicy' => 'WSNotification::Elements::SubscriptionPolicy',
+
+        'CreationTime' => 'WSNotification::Elements::CreationTime',
+
+    },
+    {
+
+        'ConsumerReference' => '',
+        'Filter' => '',
+        'SubscriptionPolicy' => '',
+        'CreationTime' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscriptionManagerRP
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscriptionManagerRP from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * ConsumerReference
+
+ $element->set_ConsumerReference($data);
+ $element->get_ConsumerReference();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * Filter
+
+ $element->set_Filter($data);
+ $element->get_Filter();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * SubscriptionPolicy
+
+ $element->set_SubscriptionPolicy($data);
+ $element->get_SubscriptionPolicy();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+=item * CreationTime
+
+ $element->set_CreationTime($data);
+ $element->get_CreationTime();
+
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscriptionManagerRP->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+   ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Filter =>  { # WSNotification::Types::FilterType
+     TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+     },
+     MessageContent =>  { # WSNotification::Types::QueryExpressionType
+     },
+   },
+   SubscriptionPolicy =>  { # WSNotification::Types::SubscriptionPolicyType
+   },
+   CreationTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm b/onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm
new file mode 100644
index 000000000..db3b04824
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscriptionPolicy.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::SubscriptionPolicy;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscriptionPolicy');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::SubscriptionPolicyType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscriptionPolicy
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscriptionPolicy from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscriptionPolicy->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscriptionPolicyType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm b/onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm
new file mode 100644
index 000000000..a367610ec
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/SubscriptionReference.pm
@@ -0,0 +1,63 @@
+
+package WSNotification::Elements::SubscriptionReference;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('SubscriptionReference');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::EndpointReferenceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::SubscriptionReference
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+SubscriptionReference from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::SubscriptionReference->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::EndpointReferenceType
+   Address =>  { value => $some_value },
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+   },
+   Metadata =>  { # WSNotification::Types::MetadataType
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm b/onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm
new file mode 100644
index 000000000..86b99fa06
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TerminationTime.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::TerminationTime;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TerminationTime');
+__PACKAGE__->__set_nillable(1);
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::dateTime
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TerminationTime
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TerminationTime from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TerminationTime->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # dateTime
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Elements/To.pm b/onvif/proxy/lib/WSNotification/Elements/To.pm
similarity index 79%
rename from onvif/proxy/lib/WSDiscovery/Elements/To.pm
rename to onvif/proxy/lib/WSNotification/Elements/To.pm
index d435b934d..6f1c2d2f0 100644
--- a/onvif/proxy/lib/WSDiscovery/Elements/To.pm
+++ b/onvif/proxy/lib/WSNotification/Elements/To.pm
@@ -1,5 +1,5 @@
 
-package WSDiscovery::Elements::To;
+package WSNotification::Elements::To;
 use strict;
 use warnings;
 
@@ -14,7 +14,7 @@ __PACKAGE__->__set_maxOccurs();
 __PACKAGE__->__set_ref();
 use base qw(
     SOAP::WSDL::XSD::Typelib::Element
-    WSDiscovery::Types::AttributedURIType
+    WSNotification::Types::AttributedURIType
 );
 
 }
@@ -26,7 +26,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Elements::To
+WSNotification::Elements::To
 
 =head1 DESCRIPTION
 
@@ -43,7 +43,7 @@ To from the namespace http://www.w3.org/2005/08/addressing.
 
 =head2 new
 
- my $element = WSDiscovery::Elements::To->new($data);
+ my $element = WSNotification::Elements::To->new($data);
 
 Constructor. The following data structure may be passed to new():
 
diff --git a/onvif/proxy/lib/WSNotification/Elements/Topic.pm b/onvif/proxy/lib/WSNotification/Elements/Topic.pm
new file mode 100644
index 000000000..27eab03a8
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Topic.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::Topic;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Topic');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Topic
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Topic from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Topic->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm b/onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm
new file mode 100644
index 000000000..98422a5aa
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicExpression.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicExpression;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicExpression');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicExpressionType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicExpression
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicExpression from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicExpression->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm
new file mode 100644
index 000000000..4d988174b
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialect.pm
@@ -0,0 +1,57 @@
+
+package WSNotification::Elements::TopicExpressionDialect;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicExpressionDialect');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::Builtin::anyURI
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicExpressionDialect
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicExpressionDialect from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicExpressionDialect->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ $some_value, # anyURI
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm
new file mode 100644
index 000000000..74a693e86
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicExpressionDialectUnknownFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicExpressionDialectUnknownFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicExpressionDialectUnknownFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicExpressionDialectUnknownFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicExpressionDialectUnknownFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicExpressionDialectUnknownFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicExpressionDialectUnknownFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionDialectUnknownFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm b/onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm
new file mode 100644
index 000000000..22d33fa09
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicNamespace.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::TopicNamespace;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('TopicNamespace');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicNamespaceType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicNamespace
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicNamespace from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicNamespace->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNamespaceType
+   Topic =>  {
+   },
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm b/onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm
new file mode 100644
index 000000000..3bc6bae18
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicNotSupportedFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicNotSupportedFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('TopicNotSupportedFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicNotSupportedFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicNotSupportedFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicNotSupportedFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicNotSupportedFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNotSupportedFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/TopicSet.pm b/onvif/proxy/lib/WSNotification/Elements/TopicSet.pm
new file mode 100644
index 000000000..ded38f095
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/TopicSet.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::TopicSet;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' }
+
+__PACKAGE__->__set_name('TopicSet');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::TopicSetType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::TopicSet
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+TopicSet from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::TopicSet->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicSetType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm
new file mode 100644
index 000000000..b6503cb83
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToCreatePullPointFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToCreatePullPointFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToCreatePullPointFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToCreatePullPointFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToCreatePullPointFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToCreatePullPointFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToCreatePullPointFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToCreatePullPointFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm
new file mode 100644
index 000000000..69a502678
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroyPullPointFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToDestroyPullPointFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToDestroyPullPointFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToDestroyPullPointFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToDestroyPullPointFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToDestroyPullPointFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToDestroyPullPointFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroyPullPointFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm
new file mode 100644
index 000000000..b9a73e1e4
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToDestroySubscriptionFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToDestroySubscriptionFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToDestroySubscriptionFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToDestroySubscriptionFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToDestroySubscriptionFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToDestroySubscriptionFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToDestroySubscriptionFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroySubscriptionFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm
new file mode 100644
index 000000000..4933af814
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnableToGetMessagesFault.pm
@@ -0,0 +1,58 @@
+
+package WSNotification::Elements::UnableToGetMessagesFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnableToGetMessagesFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnableToGetMessagesFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnableToGetMessagesFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnableToGetMessagesFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnableToGetMessagesFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToGetMessagesFaultType
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm
new file mode 100644
index 000000000..f140e9682
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnacceptableInitialTerminationTimeFault.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::UnacceptableInitialTerminationTimeFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnacceptableInitialTerminationTimeFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnacceptableInitialTerminationTimeFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnacceptableInitialTerminationTimeFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnacceptableInitialTerminationTimeFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm
new file mode 100644
index 000000000..78e04e206
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnacceptableTerminationTimeFault.pm
@@ -0,0 +1,60 @@
+
+package WSNotification::Elements::UnacceptableTerminationTimeFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnacceptableTerminationTimeFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnacceptableTerminationTimeFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnacceptableTerminationTimeFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnacceptableTerminationTimeFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnacceptableTerminationTimeFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm
new file mode 100644
index 000000000..c0ab348b7
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnrecognizedPolicyRequestFault.pm
@@ -0,0 +1,59 @@
+
+package WSNotification::Elements::UnrecognizedPolicyRequestFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnrecognizedPolicyRequestFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnrecognizedPolicyRequestFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnrecognizedPolicyRequestFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnrecognizedPolicyRequestFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnrecognizedPolicyRequestFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnrecognizedPolicyRequestFaultType
+   UnrecognizedPolicy =>  $some_value, # QName
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm b/onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm
new file mode 100644
index 000000000..5263f5069
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/Unsubscribe.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::Unsubscribe;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('Unsubscribe');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::Unsubscribe
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+Unsubscribe from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::Unsubscribe->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm b/onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm
new file mode 100644
index 000000000..70119e1e3
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnsubscribeResponse.pm
@@ -0,0 +1,107 @@
+
+package WSNotification::Elements::UnsubscribeResponse;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnsubscribeResponse');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnsubscribeResponse
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnsubscribeResponse from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnsubscribeResponse->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ {
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm b/onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm
new file mode 100644
index 000000000..4270ec2fa
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UnsupportedPolicyRequestFault.pm
@@ -0,0 +1,59 @@
+
+package WSNotification::Elements::UnsupportedPolicyRequestFault;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UnsupportedPolicyRequestFault');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    WSNotification::Types::UnsupportedPolicyRequestFaultType
+);
+
+}
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UnsupportedPolicyRequestFault
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UnsupportedPolicyRequestFault from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UnsupportedPolicyRequestFault->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnsupportedPolicyRequestFaultType
+   UnsupportedPolicy =>  $some_value, # QName
+ },
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Elements/UseRaw.pm b/onvif/proxy/lib/WSNotification/Elements/UseRaw.pm
new file mode 100644
index 000000000..04d636ea3
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Elements/UseRaw.pm
@@ -0,0 +1,90 @@
+
+package WSNotification::Elements::UseRaw;
+use strict;
+use warnings;
+
+{ # BLOCK to scope variables
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' }
+
+__PACKAGE__->__set_name('UseRaw');
+__PACKAGE__->__set_nillable();
+__PACKAGE__->__set_minOccurs();
+__PACKAGE__->__set_maxOccurs();
+__PACKAGE__->__set_ref();
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Element
+    SOAP::WSDL::XSD::Typelib::ComplexType
+);
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+
+
+
+} # end of BLOCK
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Elements::UseRaw
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined element
+UseRaw from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+
+=head1 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+ my $element = WSNotification::Elements::UseRaw->new($data);
+
+Constructor. The following data structure may be passed to new():
+
+,
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
new file mode 100644
index 000000000..c86b26f9f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/NotificationProducerPort.pm
@@ -0,0 +1,184 @@
+package WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require WSNotification::Typemaps::WSBaseNotificationSender
+    if not WSNotification::Typemaps::WSBaseNotificationSender->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://docs.oasis-open.org/wsn/bw-2') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('WSNotification::Typemaps::WSBaseNotificationSender')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub Subscribe {
+    my ($self, $body, $header) = @_;
+    die "Subscribe must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Subscribe',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Subscribe',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::Subscribe )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub GetCurrentMessage {
+    my ($self, $body, $header) = @_;
+    die "GetCurrentMessage must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'GetCurrentMessage',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/GetCurrentMessage',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::GetCurrentMessage )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort - SOAP Interface for the WSBaseNotificationSender Web Service
+
+=head1 SYNOPSIS
+
+ use WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort;
+ my $interface = WSNotification::Interfaces::WSBaseNotificationSender::NotificationProducerPort->new();
+
+ my $response;
+ $response = $interface->Subscribe();
+ $response = $interface->GetCurrentMessage();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the WSBaseNotificationSender web service
+located at http://docs.oasis-open.org/wsn/bw-2.
+
+=head1 SERVICE WSBaseNotificationSender
+
+
+
+=head2 Port NotificationProducerPort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 Subscribe
+
+
+
+Returns a L<WSNotification::Elements::SubscribeResponse|WSNotification::Elements::SubscribeResponse> object.
+
+ $response = $interface->Subscribe( {
+    ConsumerReference =>  { # WSNotification::Types::EndpointReferenceType
+      Address =>  { value => $some_value },
+      ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+      },
+      Metadata =>  { # WSNotification::Types::MetadataType
+      },
+    },
+    Filter =>  { # WSNotification::Types::FilterType
+      TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+      },
+      MessageContent =>  { # WSNotification::Types::QueryExpressionType
+      },
+    },
+    InitialTerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+    SubscriptionPolicy =>  {
+    },
+  },,
+ );
+
+=head3 GetCurrentMessage
+
+
+
+Returns a L<WSNotification::Elements::GetCurrentMessageResponse|WSNotification::Elements::GetCurrentMessageResponse> object.
+
+ $response = $interface->GetCurrentMessage( {
+    Topic =>  { # WSNotification::Types::TopicExpressionType
+    },
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Fri Aug  8 16:49:21 2014
+
+=cut
diff --git a/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm
new file mode 100644
index 000000000..a10978083
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Interfaces/WSBaseNotificationSender/SubscriptionManagerPort.pm
@@ -0,0 +1,167 @@
+package WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort;
+use strict;
+use warnings;
+use Class::Std::Fast::Storable;
+use Scalar::Util qw(blessed);
+use base qw(SOAP::WSDL::Client::Base);
+
+# only load if it hasn't been loaded before
+require WSNotification::Typemaps::WSBaseNotificationSender
+    if not WSNotification::Typemaps::WSBaseNotificationSender->can('get_class');
+
+sub START {
+    $_[0]->set_proxy('http://docs.oasis-open.org/wsn/bw-2') if not $_[2]->{proxy};
+    $_[0]->set_class_resolver('WSNotification::Typemaps::WSBaseNotificationSender')
+        if not $_[2]->{class_resolver};
+
+    $_[0]->set_prefix($_[2]->{use_prefix}) if exists $_[2]->{use_prefix};
+}
+
+sub Renew {
+    my ($self, $body, $header) = @_;
+    die "Renew must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Renew',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Renew',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::Renew )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+sub Unsubscribe {
+    my ($self, $body, $header) = @_;
+    die "Unsubscribe must be called as object method (\$self is <$self>)" if not blessed($self);
+    return $self->SUPER::call({
+        operation => 'Unsubscribe',
+        soap_action => 'http://docs.oasis-open.org/wsn/bw-2/Unsubscribe',
+        style => 'document',
+        body => {
+            
+
+           'use'            => 'literal',
+            namespace       => 'http://schemas.xmlsoap.org/wsdl/soap/',
+            encodingStyle   => '',
+            parts           =>  [qw( WSNotification::Elements::Unsubscribe )],
+
+        },
+        header => {
+            
+        },
+        headerfault => {
+            
+        }
+    }, $body, $header);
+}
+
+
+
+
+1;
+
+
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort - SOAP Interface for the WSBaseNotificationSender Web Service
+
+=head1 SYNOPSIS
+
+ use WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort;
+ my $interface = WSNotification::Interfaces::WSBaseNotificationSender::SubscriptionManagerPort->new();
+
+ my $response;
+ $response = $interface->Renew();
+ $response = $interface->Unsubscribe();
+
+
+
+=head1 DESCRIPTION
+
+SOAP Interface for the WSBaseNotificationSender web service
+located at http://docs.oasis-open.org/wsn/bw-2.
+
+=head1 SERVICE WSBaseNotificationSender
+
+
+
+=head2 Port SubscriptionManagerPort
+
+
+
+=head1 METHODS
+
+=head2 General methods
+
+=head3 new
+
+Constructor.
+
+All arguments are forwarded to L<SOAP::WSDL::Client|SOAP::WSDL::Client>.
+
+=head2 SOAP Service methods
+
+Method synopsis is displayed with hash refs as parameters.
+
+The commented class names in the method's parameters denote that objects
+of the corresponding class can be passed instead of the marked hash ref.
+
+You may pass any combination of objects, hash and list refs to these
+methods, as long as you meet the structure.
+
+List items (i.e. multiple occurences) are not displayed in the synopsis.
+You may generally pass a list ref of hash refs (or objects) instead of a hash
+ref - this may result in invalid XML if used improperly, though. Note that
+SOAP::WSDL always expects list references at maximum depth position.
+
+XML attributes are not displayed in this synopsis and cannot be set using
+hash refs. See the respective class' documentation for additional information.
+
+
+
+=head3 Renew
+
+
+
+Returns a L<WSNotification::Elements::RenewResponse|WSNotification::Elements::RenewResponse> object.
+
+ $response = $interface->Renew( {
+    TerminationTime => $some_value, # AbsoluteOrRelativeTimeType
+  },,
+ );
+
+=head3 Unsubscribe
+
+
+
+Returns a L<WSNotification::Elements::UnsubscribeResponse|WSNotification::Elements::UnsubscribeResponse> object.
+
+ $response = $interface->Unsubscribe( {
+  },,
+ );
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL on Fri Aug  8 16:49:21 2014
+
+=cut
diff --git a/onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm b/onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm
new file mode 100644
index 000000000..cebd9edb8
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Typemaps/WSBaseNotificationSender.pm
@@ -0,0 +1,210 @@
+
+package WSNotification::Typemaps::WSBaseNotificationSender;
+use strict;
+use warnings;
+
+our $typemap_1 = {
+               'InvalidMessageContentExpressionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'Subscribe/InitialTerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+               'InvalidTopicExpressionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NotifyMessageNotSupportedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'SubscribeCreationFailedFault' => 'WSNotification::Elements::SubscribeCreationFailedFault',
+               'UnsupportedPolicyRequestFault' => 'WSNotification::Elements::UnsupportedPolicyRequestFault',
+               'UnrecognizedPolicyRequestFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'Subscribe/Filter/MessageContent' => 'WSNotification::Types::QueryExpressionType',
+               'InvalidMessageContentExpressionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnacceptableInitialTerminationTimeFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnacceptableInitialTerminationTimeFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'NotifyMessageNotSupportedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnacceptableInitialTerminationTimeFault' => 'WSNotification::Elements::UnacceptableInitialTerminationTimeFault',
+               'InvalidProducerPropertiesExpressionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'SubscribeCreationFailedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NotifyMessageNotSupportedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'NotifyMessageNotSupportedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'TopicNotSupportedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'RenewResponse' => 'WSNotification::Elements::RenewResponse',
+               'InvalidMessageContentExpressionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'UnableToDestroySubscriptionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicExpressionDialectUnknownFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnacceptableTerminationTimeFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnacceptableTerminationTimeFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidFilterFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnableToDestroySubscriptionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnrecognizedPolicyRequestFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnrecognizedPolicyRequestFault/UnrecognizedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+               'InvalidProducerPropertiesExpressionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'Fault/detail' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'Renew' => 'WSNotification::Elements::Renew',
+               'UnsupportedPolicyRequestFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'TopicExpressionDialectUnknownFault' => 'WSNotification::Elements::TopicExpressionDialectUnknownFault',
+               'UnacceptableInitialTerminationTimeFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidTopicExpressionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'MultipleTopicsSpecifiedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnrecognizedPolicyRequestFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidMessageContentExpressionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'Subscribe/ConsumerReference/Address' => 'WSNotification::Types::AttributedURIType',
+               'TopicExpressionDialectUnknownFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnacceptableTerminationTimeFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'Fault/faultactor' => 'SOAP::WSDL::XSD::Typelib::Builtin::token',
+               'Fault/faultcode' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+               'UnsupportedPolicyRequestFault/UnsupportedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+               'Subscribe/ConsumerReference/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'MultipleTopicsSpecifiedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicExpressionDialectUnknownFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'UnrecognizedPolicyRequestFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'TopicNotSupportedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidProducerPropertiesExpressionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'Unsubscribe' => 'WSNotification::Elements::Unsubscribe',
+               'NoCurrentMessageOnTopicFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'TopicNotSupportedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicNotSupportedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'MultipleTopicsSpecifiedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnableToDestroySubscriptionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'UnacceptableInitialTerminationTimeFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'InvalidTopicExpressionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnacceptableTerminationTimeFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'RenewResponse/CurrentTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'MultipleTopicsSpecifiedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidProducerPropertiesExpressionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnsupportedPolicyRequestFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'SubscribeCreationFailedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnrecognizedPolicyRequestFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'Subscribe/SubscriptionPolicy' => 'WSNotification::Elements::Subscribe::_SubscriptionPolicy',
+               'InvalidFilterFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidProducerPropertiesExpressionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NoCurrentMessageOnTopicFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'TopicNotSupportedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnrecognizedPolicyRequestFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidProducerPropertiesExpressionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'Renew/TerminationTime' => 'WSNotification::Types::AbsoluteOrRelativeTimeType',
+               'UnsupportedPolicyRequestFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidTopicExpressionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'TopicNotSupportedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnacceptableTerminationTimeFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnrecognizedPolicyRequestFault' => 'WSNotification::Elements::UnrecognizedPolicyRequestFault',
+               'UnacceptableTerminationTimeFault/MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidTopicExpressionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'SubscribeCreationFailedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnsupportedPolicyRequestFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'RenewResponse/TerminationTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidTopicExpressionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'TopicExpressionDialectUnknownFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnacceptableInitialTerminationTimeFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidTopicExpressionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'SubscribeResponse/SubscriptionReference/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'InvalidMessageContentExpressionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'Subscribe/ConsumerReference' => 'WSNotification::Types::EndpointReferenceType',
+               'UnableToDestroySubscriptionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'GetCurrentMessage' => 'WSNotification::Elements::GetCurrentMessage',
+               'TopicExpressionDialectUnknownFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'SubscribeCreationFailedFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'NoCurrentMessageOnTopicFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnrecognizedPolicyRequestFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'InvalidFilterFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'SubscribeCreationFailedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'InvalidFilterFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'TopicExpressionDialectUnknownFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidFilterFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'UnacceptableInitialTerminationTimeFault/MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'NotifyMessageNotSupportedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'SubscribeResponse/SubscriptionReference/Address' => 'WSNotification::Types::AttributedURIType',
+               'NoCurrentMessageOnTopicFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'SubscribeCreationFailedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'NotifyMessageNotSupportedFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'TopicNotSupportedFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'UnsupportedPolicyRequestFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'TopicExpressionDialectUnknownFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnableToDestroySubscriptionFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'SubscribeCreationFailedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'TopicNotSupportedFault' => 'WSNotification::Elements::TopicNotSupportedFault',
+               'InvalidMessageContentExpressionFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'MultipleTopicsSpecifiedFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidFilterFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'MultipleTopicsSpecifiedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnsubscribeResponse' => 'WSNotification::Elements::UnsubscribeResponse',
+               'Subscribe' => 'WSNotification::Elements::Subscribe',
+               'GetCurrentMessageResponse' => 'WSNotification::Elements::GetCurrentMessageResponse',
+               'NotifyMessageNotSupportedFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'MultipleTopicsSpecifiedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'NoCurrentMessageOnTopicFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnacceptableInitialTerminationTimeFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'Subscribe/ConsumerReference/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnsupportedPolicyRequestFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'NotifyMessageNotSupportedFault' => 'WSNotification::Elements::NotifyMessageNotSupportedFault',
+               'InvalidTopicExpressionFault' => 'WSNotification::Elements::InvalidTopicExpressionFault',
+               'UnableToDestroySubscriptionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'InvalidFilterFault' => 'WSNotification::Elements::InvalidFilterFault',
+               'GetCurrentMessage/Topic' => 'WSNotification::Types::TopicExpressionType',
+               'SubscribeResponse/SubscriptionReference/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidFilterFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'InvalidMessageContentExpressionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'Fault' => 'SOAP::WSDL::SOAP::Typelib::Fault11',
+               'Subscribe/Filter/TopicExpression' => 'WSNotification::Types::TopicExpressionType',
+               'SubscribeResponse' => 'WSNotification::Elements::SubscribeResponse',
+               'TopicExpressionDialectUnknownFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidMessageContentExpressionFault' => 'WSNotification::Elements::InvalidMessageContentExpressionFault',
+               'NotifyMessageNotSupportedFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnrecognizedPolicyRequestFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'SubscribeCreationFailedFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'MultipleTopicsSpecifiedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'SubscribeResponse/SubscriptionReference' => 'WSNotification::Types::EndpointReferenceType',
+               'UnsupportedPolicyRequestFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'InvalidFilterFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'NoCurrentMessageOnTopicFault' => 'WSNotification::Elements::NoCurrentMessageOnTopicFault',
+               'InvalidMessageContentExpressionFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnsupportedPolicyRequestFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'UnacceptableTerminationTimeFault/ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+               'UnableToDestroySubscriptionFault' => 'WSNotification::Elements::UnableToDestroySubscriptionFault',
+               'UnacceptableTerminationTimeFault' => 'WSNotification::Elements::UnacceptableTerminationTimeFault',
+               'Subscribe/Filter' => 'WSNotification::Types::FilterType',
+               'UnacceptableTerminationTimeFault/Originator/Metadata' => 'WSNotification::Types::MetadataType',
+               'InvalidTopicExpressionFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'UnacceptableInitialTerminationTimeFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'MultipleTopicsSpecifiedFault' => 'WSNotification::Elements::MultipleTopicsSpecifiedFault',
+               'Fault/faultstring' => 'SOAP::WSDL::XSD::Typelib::Builtin::string',
+               'TopicNotSupportedFault/Originator' => 'WSNotification::Types::EndpointReferenceType',
+               'UnacceptableTerminationTimeFault/MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidProducerPropertiesExpressionFault/Originator/Address' => 'WSNotification::Types::AttributedURIType',
+               'InvalidProducerPropertiesExpressionFault' => 'WSNotification::Elements::InvalidProducerPropertiesExpressionFault',
+               'UnacceptableTerminationTimeFault/Originator/ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+               'SubscribeResponse/CurrentTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'UnacceptableInitialTerminationTimeFault/MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'SubscribeResponse/TerminationTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+               'InvalidFilterFault/UnknownFilter' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+               'UnableToDestroySubscriptionFault/Description' => 'WSNotification::Types::BaseFaultType::_Description',
+               'UnacceptableInitialTerminationTimeFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'InvalidProducerPropertiesExpressionFault/FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+               'UnableToDestroySubscriptionFault/Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime'
+             };
+;
+
+sub get_class {
+  my $name = join '/', @{ $_[1] };
+  return $typemap_1->{ $name };
+}
+
+sub get_typemap {
+    return $typemap_1;
+}
+
+1;
+
+__END__
+
+__END__
+
+=pod
+
+=head1 NAME
+
+WSNotification::Typemaps::WSBaseNotificationSender - typemap for WSBaseNotificationSender
+
+=head1 DESCRIPTION
+
+Typemap created by SOAP::WSDL for map-based SOAP message parsers.
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm b/onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm
new file mode 100644
index 000000000..ac8dc805d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AbsoluteOrRelativeTimeType.pm
@@ -0,0 +1,76 @@
+package WSNotification::Types::AbsoluteOrRelativeTimeType;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2'};
+
+# derivation by union
+# union is not fully supported yet - value space constraints are not
+# checked yet.
+# This implementation of union resorts to the simplest possible base, which
+# is: "If the <list> or <union> alternative is chosen, then the
+# simple ur-type definition·."
+#
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::anySimpleType
+);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+AbsoluteOrRelativeTimeType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+This type class is derived by union.
+
+Derivation by union is not fully supported yet - value space constraints are
+not checked yet.
+
+The current implementation of union resorts to inheriting from the base type,
+which means (quoted from the XML Schema specs): "If the <list> or <union>
+alternative is chosen, then the simple ur-type definition·."
+
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm
new file mode 100644
index 000000000..248338084
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedAnyType.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::AttributedAnyType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::AttributedAnyType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+AttributedAnyType from the namespace http://www.w3.org/2005/08/addressing.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::AttributedAnyType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm
similarity index 89%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm
rename to onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm
index dd2d1522c..5ae9529bb 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedQNameType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedQNameType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::AttributedQNameType;
+package WSNotification::Types::AttributedQNameType;
 use strict;
 use warnings;
 
@@ -30,7 +30,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedQNameType
+WSNotification::Types::AttributedQNameType
 
 =head1 DESCRIPTION
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm
similarity index 85%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm
rename to onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm
index 5cab1a8c9..b561322d5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedURIType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedURIType.pm
@@ -1,9 +1,9 @@
-package WSDiscovery::Types::AttributedURIType;
+package WSNotification::Types::AttributedURIType;
 use strict;
 use warnings;
 
 
-__PACKAGE__->_set_element_form_qualified(0);
+__PACKAGE__->_set_element_form_qualified(1);
 
 sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
 
@@ -30,7 +30,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedURIType
+WSNotification::Types::AttributedURIType
 
 =head1 DESCRIPTION
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm b/onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm
similarity index 88%
rename from onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm
rename to onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm
index c2a947795..39796def5 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/AttributedUnsignedLongType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/AttributedUnsignedLongType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::AttributedUnsignedLongType;
+package WSNotification::Types::AttributedUnsignedLongType;
 use strict;
 use warnings;
 
@@ -30,7 +30,7 @@ use base qw(
 
 =head1 NAME
 
-WSDiscovery::Types::AttributedUnsignedLongType
+WSNotification::Types::AttributedUnsignedLongType
 
 =head1 DESCRIPTION
 
diff --git a/onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm b/onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm
new file mode 100644
index 000000000..90323617a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/BaseFaultType.pm
@@ -0,0 +1,288 @@
+package WSNotification::Types::BaseFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsrf/bf-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(SOAP::WSDL::XSD::Typelib::Builtin::anyType);
+# Variety: 
+
+
+# There's no variety - empty complexType
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+__PACKAGE__->_factory();
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::BaseFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+BaseFaultType from the namespace http://docs.oasis-open.org/wsrf/bf-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Timestamp
+
+
+=item * Originator
+
+
+=item * ErrorCode
+
+
+=item * Description
+
+
+=item * FaultCause
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::BaseFaultType
+   Timestamp =>  $some_value, # dateTime
+   Originator =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   ErrorCode => 
+ # No documentation generated for complexContent / extension yet
+,
+   Description =>  { value => $some_value },
+   FaultCause =>  {
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm b/onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm
new file mode 100644
index 000000000..48b4b3475
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ConcreteTopicExpression.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::ConcreteTopicExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+ConcreteTopicExpression from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+The pattern allows strings matching the following EBNF: ConcreteTopicPath ::= RootTopic ChildTopic* RootTopic ::= QName ChildTopic ::= '/' (QName | NCName) 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/Documentation.pm b/onvif/proxy/lib/WSNotification/Types/Documentation.pm
new file mode 100644
index 000000000..84f61d65f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/Documentation.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::Documentation;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::Documentation
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+Documentation from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::Documentation
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm b/onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm
similarity index 68%
rename from onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
rename to onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm
index 59411fa37..c12ba0cc4 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/EndpointReferenceType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/EndpointReferenceType.pm
@@ -1,9 +1,9 @@
-package WSDiscovery::Types::EndpointReferenceType;
+package WSNotification::Types::EndpointReferenceType;
 use strict;
 use warnings;
 
 
-__PACKAGE__->_set_element_form_qualified(0);
+__PACKAGE__->_set_element_form_qualified(1);
 
 sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
 
@@ -37,16 +37,15 @@ __PACKAGE__->_factory(
         'Metadata' => \%Metadata_of,
     },
     {
-        'Address' => 'WSDiscovery::Types::AttributedURIType',
-        'ReferenceParameters' => 'WSDiscovery::Elements::ReferenceParameters',
-
-        'Metadata' => 'WSDiscovery::Elements::Metadata',
+        'Address' => 'WSNotification::Types::AttributedURIType',
+        'ReferenceParameters' => 'WSNotification::Types::ReferenceParametersType',
+        'Metadata' => 'WSNotification::Elements::Metadata',
 
     },
     {
 
         'Address' => 'Address',
-        'ReferenceParameters' => '',
+        'ReferenceParameters' => 'ReferenceParameters',
         'Metadata' => '',
     }
 );
@@ -67,7 +66,7 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::EndpointReferenceType
+WSNotification::Types::EndpointReferenceType
 
 =head1 DESCRIPTION
 
@@ -91,12 +90,6 @@ methods:
 
 =item * ReferenceParameters
 
-Note: The name of this property has been altered, because it didn't match
-perl's notion of variable/subroutine names. The altered name is used in
-perl code only, XML output uses the original name:
-
- 
-
 
 =item * Metadata
 
@@ -118,11 +111,11 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::EndpointReferenceType
+ { # WSNotification::Types::EndpointReferenceType
    Address =>  { value => $some_value },
-   ReferenceParameters =>  { # WSDiscovery::Types::ReferenceParametersType
+   ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
    },
-   Metadata =>  { # WSDiscovery::Types::MetadataType
+   Metadata =>  { # WSNotification::Types::MetadataType
    },
  },
 
diff --git a/onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm b/onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm
new file mode 100644
index 000000000..e7c4deef6
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ExtensibleDocumented.pm
@@ -0,0 +1,104 @@
+package WSNotification::Types::ExtensibleDocumented;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+    },
+    {
+
+        'documentation' => 'documentation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::ExtensibleDocumented
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ExtensibleDocumented from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * documentation
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ExtensibleDocumented
+   documentation =>  { # WSNotification::Types::Documentation
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm b/onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm
similarity index 96%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm
rename to onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm
index 89d8704e8..06e4df192 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesOpenEnumType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/FaultCodesOpenEnumType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::FaultCodesOpenEnumType;
+package WSNotification::Types::FaultCodesOpenEnumType;
 use strict;
 use warnings;
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm b/onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm
similarity index 95%
rename from onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm
rename to onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm
index a042be3cf..88146b753 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/FaultCodesType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/FaultCodesType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::FaultCodesType;
+package WSNotification::Types::FaultCodesType;
 use strict;
 use warnings;
 
diff --git a/onvif/proxy/lib/WSNotification/Types/FilterType.pm b/onvif/proxy/lib/WSNotification/Types/FilterType.pm
new file mode 100644
index 000000000..7aece8cf1
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/FilterType.pm
@@ -0,0 +1,128 @@
+package WSNotification::Types::FilterType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %TopicExpression_of :ATTR(:get<TopicExpression>);
+my %MessageContent_of :ATTR(:get<MessageContent>);
+
+__PACKAGE__->_factory(
+    [ qw(        TopicExpression
+        MessageContent
+
+    ) ],
+    {
+        'TopicExpression' => \%TopicExpression_of,
+        'MessageContent' => \%MessageContent_of,
+    },
+    {
+        'TopicExpression' => 'WSNotification::Elements::TopicExpression',
+
+        'MessageContent' => 'WSNotification::Elements::MessageContent',
+
+    },
+    {
+
+        'TopicExpression' => '',
+        'MessageContent' => '',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::FilterType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+FilterType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * TopicExpression
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * MessageContent
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::FilterType
+   TopicExpression =>  { # WSNotification::Types::TopicExpressionType
+   },
+   MessageContent =>  { # WSNotification::Types::QueryExpressionType
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm b/onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm
new file mode 100644
index 000000000..07498a001
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/FullTopicExpression.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::FullTopicExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::token);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+FullTopicExpression from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+TopicPathExpression ::= TopicPath ( '|' TopicPath )* TopicPath ::= RootTopic ChildTopicExpression* RootTopic ::= NamespacePrefix? ('//')? (NCName | '*') NamespacePrefix ::= NCName ':' ChildTopicExpression ::= '/' '/'? (QName | NCName | '*'| '.') 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::token
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm
new file mode 100644
index 000000000..f16776fa2
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidFilterFaultType.pm
@@ -0,0 +1,261 @@
+package WSNotification::Types::InvalidFilterFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %UnknownFilter_of :ATTR(:get<UnknownFilter>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        UnknownFilter
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'UnknownFilter' => \%UnknownFilter_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'UnknownFilter' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'UnknownFilter' => 'UnknownFilter',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidFilterFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidFilterFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * UnknownFilter
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidFilterFaultType
+   UnknownFilter =>  $some_value, # QName
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm
new file mode 100644
index 000000000..c8a643358
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidMessageContentExpressionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::InvalidMessageContentExpressionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidMessageContentExpressionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidMessageContentExpressionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidMessageContentExpressionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm
new file mode 100644
index 000000000..ea5a790ea
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidProducerPropertiesExpressionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::InvalidProducerPropertiesExpressionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidProducerPropertiesExpressionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidProducerPropertiesExpressionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm
new file mode 100644
index 000000000..f3061a2db
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/InvalidTopicExpressionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::InvalidTopicExpressionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::InvalidTopicExpressionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+InvalidTopicExpressionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::InvalidTopicExpressionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm b/onvif/proxy/lib/WSNotification/Types/MetadataType.pm
similarity index 88%
rename from onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm
rename to onvif/proxy/lib/WSNotification/Types/MetadataType.pm
index 072161f78..d1bcd64a0 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/MetadataType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/MetadataType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::MetadataType;
+package WSNotification::Types::MetadataType;
 use strict;
 use warnings;
 
@@ -50,7 +50,7 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::MetadataType
+WSNotification::Types::MetadataType
 
 =head1 DESCRIPTION
 
@@ -80,7 +80,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::MetadataType
+ { # WSNotification::Types::MetadataType
  },
 
 
diff --git a/onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm
new file mode 100644
index 000000000..64015b34d
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/MultipleTopicsSpecifiedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::MultipleTopicsSpecifiedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::MultipleTopicsSpecifiedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+MultipleTopicsSpecifiedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::MultipleTopicsSpecifiedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm b/onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm
new file mode 100644
index 000000000..a9e3d2817
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/NoCurrentMessageOnTopicFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::NoCurrentMessageOnTopicFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::NoCurrentMessageOnTopicFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NoCurrentMessageOnTopicFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NoCurrentMessageOnTopicFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm b/onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm
new file mode 100644
index 000000000..8eae83502
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/NotificationMessageHolderType.pm
@@ -0,0 +1,209 @@
+package WSNotification::Types::NotificationMessageHolderType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %SubscriptionReference_of :ATTR(:get<SubscriptionReference>);
+my %Topic_of :ATTR(:get<Topic>);
+my %ProducerReference_of :ATTR(:get<ProducerReference>);
+my %Message_of :ATTR(:get<Message>);
+
+__PACKAGE__->_factory(
+    [ qw(        SubscriptionReference
+        Topic
+        ProducerReference
+        Message
+
+    ) ],
+    {
+        'SubscriptionReference' => \%SubscriptionReference_of,
+        'Topic' => \%Topic_of,
+        'ProducerReference' => \%ProducerReference_of,
+        'Message' => \%Message_of,
+    },
+    {
+        'SubscriptionReference' => 'WSNotification::Elements::SubscriptionReference',
+
+        'Topic' => 'WSNotification::Elements::Topic',
+
+        'ProducerReference' => 'WSNotification::Elements::ProducerReference',
+
+
+        'Message' => 'WSNotification::Types::NotificationMessageHolderType::_Message',
+    },
+    {
+
+        'SubscriptionReference' => '',
+        'Topic' => '',
+        'ProducerReference' => '',
+        'Message' => 'Message',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::NotificationMessageHolderType::_Message;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::NotificationMessageHolderType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NotificationMessageHolderType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * SubscriptionReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Topic
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * ProducerReference
+
+Note: The name of this property has been altered, because it didn't match
+perl's notion of variable/subroutine names. The altered name is used in
+perl code only, XML output uses the original name:
+
+ 
+
+
+=item * Message
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotificationMessageHolderType
+   SubscriptionReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Topic =>  { # WSNotification::Types::TopicExpressionType
+   },
+   ProducerReference =>  { # WSNotification::Types::EndpointReferenceType
+     Address =>  { value => $some_value },
+     ReferenceParameters =>  { # WSNotification::Types::ReferenceParametersType
+     },
+     Metadata =>  { # WSNotification::Types::MetadataType
+     },
+   },
+   Message =>  {
+   },
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm
new file mode 100644
index 000000000..2604e277f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/NotifyMessageNotSupportedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::NotifyMessageNotSupportedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::NotifyMessageNotSupportedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+NotifyMessageNotSupportedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::NotifyMessageNotSupportedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm
new file mode 100644
index 000000000..03660d798
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/PauseFailedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::PauseFailedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::PauseFailedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+PauseFailedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::PauseFailedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm b/onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm
similarity index 89%
rename from onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
rename to onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm
index 1426017f4..4f583bda7 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ProblemActionType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/ProblemActionType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::ProblemActionType;
+package WSNotification::Types::ProblemActionType;
 use strict;
 use warnings;
 
@@ -34,7 +34,7 @@ __PACKAGE__->_factory(
         'SoapAction' => \%SoapAction_of,
     },
     {
-        'Action' => 'WSDiscovery::Elements::Action',
+        'Action' => 'WSNotification::Elements::Action',
 
         'SoapAction' => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
     },
@@ -61,7 +61,7 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ProblemActionType
+WSNotification::Types::ProblemActionType
 
 =head1 DESCRIPTION
 
@@ -103,7 +103,7 @@ perl code only, XML output uses the original name:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ProblemActionType
+ { # WSNotification::Types::ProblemActionType
    Action =>  { value => $some_value },
    SoapAction =>  $some_value, # anyURI
  },
diff --git a/onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm b/onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm
new file mode 100644
index 000000000..a8bfcdb54
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/QueryExpressionType.pm
@@ -0,0 +1,139 @@
+package WSNotification::Types::QueryExpressionType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::QueryExpressionType::_QueryExpressionType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::QueryExpressionType::_QueryExpressionType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Dialect_of :ATTR(:get<Dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Dialect
+    ) ],
+    {
+
+        Dialect => \%Dialect_of,
+    },
+    {
+        Dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::QueryExpressionType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+QueryExpressionType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::QueryExpressionType
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::QueryExpressionType::_QueryExpressionType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Dialect
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm b/onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm
similarity index 86%
rename from onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm
rename to onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm
index d6569a66b..914afc5e7 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/ReferenceParametersType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/ReferenceParametersType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::ReferenceParametersType;
+package WSNotification::Types::ReferenceParametersType;
 use strict;
 use warnings;
 
@@ -50,7 +50,7 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::ReferenceParametersType
+WSNotification::Types::ReferenceParametersType
 
 =head1 DESCRIPTION
 
@@ -80,7 +80,7 @@ methods:
 
 Constructor. The following data structure may be passed to new():
 
- { # WSDiscovery::Types::ReferenceParametersType
+ { # WSNotification::Types::ReferenceParametersType
  },
 
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm b/onvif/proxy/lib/WSNotification/Types/RelatesToType.pm
similarity index 72%
rename from onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm
rename to onvif/proxy/lib/WSNotification/Types/RelatesToType.pm
index 068d00ce6..7e38c6d2e 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelatesToType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/RelatesToType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::RelatesToType;
+package WSNotification::Types::RelatesToType;
 use strict;
 use warnings;
 
@@ -7,7 +7,7 @@ __PACKAGE__->_set_element_form_qualified(0);
 
 sub get_xmlns { 'http://www.w3.org/2005/08/addressing' };
 
-our $XML_ATTRIBUTE_CLASS = 'WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr';
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::RelatesToType::_RelatesToType::XmlAttr';
 
 sub __get_attr_class {
     return $XML_ATTRIBUTE_CLASS;
@@ -18,7 +18,7 @@ use base qw(
     SOAP::WSDL::XSD::Typelib::Builtin::anyURI
 );
 
-package WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr;
+package WSNotification::Types::RelatesToType::_RelatesToType::XmlAttr;
 use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
 
 { # BLOCK to scope variables
@@ -34,7 +34,7 @@ __PACKAGE__->_factory(
         RelationshipType => \%RelationshipType_of,
     },
     {
-        RelationshipType => 'WSDiscovery::Types::RelationshipTypeOpenEnum',
+        RelationshipType => 'WSNotification::Types::RelationshipTypeOpenEnum',
     }
 );
 
@@ -50,7 +50,7 @@ __PACKAGE__->_factory(
 
 =head1 NAME
 
-WSDiscovery::Types::RelatesToType
+WSNotification::Types::RelatesToType
 
 =head1 DESCRIPTION
 
@@ -91,7 +91,7 @@ See the correspondent WSDL/XML Schema if in question.
 
 This class has additional attributes, accessibly via the C<attr()> method.
 
-attr() returns an object of the class WSDiscovery::Types::RelatesToType::_RelatesToType::XmlAttr.
+attr() returns an object of the class WSNotification::Types::RelatesToType::_RelatesToType::XmlAttr.
 
 The following attributes can be accessed on this object via the corresponding
 get_/set_ methods:
@@ -102,7 +102,7 @@ get_/set_ methods:
 
 
 
-This attribute is of type L<WSDiscovery::Types::RelationshipTypeOpenEnum|WSDiscovery::Types::RelationshipTypeOpenEnum>.
+This attribute is of type L<WSNotification::Types::RelationshipTypeOpenEnum|WSNotification::Types::RelationshipTypeOpenEnum>.
 
 
 =back
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm b/onvif/proxy/lib/WSNotification/Types/RelationshipType.pm
similarity index 95%
rename from onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm
rename to onvif/proxy/lib/WSNotification/Types/RelationshipType.pm
index 022f9b27e..e3f288911 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelationshipType.pm
+++ b/onvif/proxy/lib/WSNotification/Types/RelationshipType.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::RelationshipType;
+package WSNotification::Types::RelationshipType;
 use strict;
 use warnings;
 
diff --git a/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm b/onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm
similarity index 96%
rename from onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
rename to onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm
index dc3e004c2..e598093cb 100644
--- a/onvif/proxy/lib/WSDiscovery/Types/RelationshipTypeOpenEnum.pm
+++ b/onvif/proxy/lib/WSNotification/Types/RelationshipTypeOpenEnum.pm
@@ -1,4 +1,4 @@
-package WSDiscovery::Types::RelationshipTypeOpenEnum;
+package WSNotification::Types::RelationshipTypeOpenEnum;
 use strict;
 use warnings;
 
diff --git a/onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm
new file mode 100644
index 000000000..52b5ed041
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/ResumeFailedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::ResumeFailedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::ResumeFailedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+ResumeFailedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::ResumeFailedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm b/onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm
new file mode 100644
index 000000000..5f67e1970
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/SimpleTopicExpression.pm
@@ -0,0 +1,65 @@
+package WSNotification::Types::SimpleTopicExpression;
+use strict;
+use warnings;
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1'};
+
+# derivation by restriction
+use base qw(
+    SOAP::WSDL::XSD::Typelib::Builtin::QName);
+
+
+
+1;
+
+__END__
+
+=pod
+
+=head1 NAME
+
+
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined simpleType
+SimpleTopicExpression from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+The pattern allows strings matching the following EBNF: RootTopic ::= QName 
+
+
+
+This clase is derived from 
+   SOAP::WSDL::XSD::Typelib::Builtin::QName
+. SOAP::WSDL's schema implementation does not validate data, so you can use it exactly
+like it's base type.
+
+# Description of restrictions not implemented yet.
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor.
+
+=head2 get_value / set_value
+
+Getter and setter for the simpleType's value.
+
+=head1 OVERLOADING
+
+Depending on the simple type's base type, the following operations are overloaded
+
+ Stringification
+ Numerification
+ Boolification
+
+Check L<SOAP::WSDL::XSD::Typelib::Builtin> for more information.
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm
new file mode 100644
index 000000000..cbfd7724a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/SubscribeCreationFailedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::SubscribeCreationFailedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::SubscribeCreationFailedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SubscribeCreationFailedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscribeCreationFailedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm b/onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm
new file mode 100644
index 000000000..b79ec4774
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/SubscriptionPolicyType.pm
@@ -0,0 +1,94 @@
+package WSNotification::Types::SubscriptionPolicyType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::SubscriptionPolicyType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+SubscriptionPolicyType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::SubscriptionPolicyType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm b/onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm
new file mode 100644
index 000000000..d640d9d19
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicExpressionDialectUnknownFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::TopicExpressionDialectUnknownFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicExpressionDialectUnknownFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicExpressionDialectUnknownFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionDialectUnknownFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm b/onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm
new file mode 100644
index 000000000..20910969c
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicExpressionType.pm
@@ -0,0 +1,120 @@
+package WSNotification::Types::TopicExpressionType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicExpressionType::_TopicExpressionType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string);
+
+
+
+package WSNotification::Types::TopicExpressionType::_TopicExpressionType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %Dialect_of :ATTR(:get<Dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        Dialect
+    ) ],
+    {
+
+        Dialect => \%Dialect_of,
+    },
+    {
+        Dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicExpressionType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicExpressionType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicExpressionType
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::TopicExpressionType::_TopicExpressionType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * Dialect
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm b/onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm
new file mode 100644
index 000000000..b08fe6e53
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicNamespaceType.pm
@@ -0,0 +1,256 @@
+package WSNotification::Types::TopicNamespaceType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicNamespaceType::_TopicNamespaceType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::ExtensibleDocumented);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+my %Topic_of :ATTR(:get<Topic>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+        Topic
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+        'Topic' => \%Topic_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+
+        'Topic' => 'WSNotification::Types::TopicNamespaceType::_Topic',
+    },
+    {
+
+        'documentation' => 'documentation',
+        'Topic' => 'Topic',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::TopicNamespaceType::_Topic;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicNamespaceType::_Topic::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::TopicType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+my %MessagePattern_of :ATTR(:get<MessagePattern>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+        MessagePattern
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+        'MessagePattern' => \%MessagePattern_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+        'MessagePattern' => 'WSNotification::Types::QueryExpressionType',
+    },
+    {
+
+        'documentation' => 'documentation',
+        'MessagePattern' => 'MessagePattern',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::TopicNamespaceType::_Topic::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %parent_of :ATTR(:get<parent>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        parent
+    ) ],
+    {
+
+        parent => \%parent_of,
+    },
+    {
+        parent => 'WSNotification::Types::ConcreteTopicExpression',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::TopicNamespaceType::_TopicNamespaceType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %name_of :ATTR(:get<name>);
+my %targetNamespace_of :ATTR(:get<targetNamespace>);
+my %final_of :ATTR(:get<final>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        name
+        targetNamespace
+        final
+    ) ],
+    {
+
+        name => \%name_of,
+
+        targetNamespace => \%targetNamespace_of,
+
+        final => \%final_of,
+    },
+    {
+        name => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+        targetNamespace => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+        final => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicNamespaceType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicNamespaceType from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * Topic
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNamespaceType
+   Topic =>  {
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::TopicNamespaceType::_TopicNamespaceType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * name
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+=item * targetNamespace
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::anyURI|SOAP::WSDL::XSD::Typelib::Builtin::anyURI>.
+
+=item * final
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm b/onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm
new file mode 100644
index 000000000..d4639c99a
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicNotSupportedFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::TopicNotSupportedFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicNotSupportedFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicNotSupportedFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicNotSupportedFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicSetType.pm b/onvif/proxy/lib/WSNotification/Types/TopicSetType.pm
new file mode 100644
index 000000000..4c6e58c45
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicSetType.pm
@@ -0,0 +1,102 @@
+package WSNotification::Types::TopicSetType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::ExtensibleDocumented);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+    },
+    {
+
+        'documentation' => 'documentation',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicSetType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicSetType from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicSetType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/TopicType.pm b/onvif/proxy/lib/WSNotification/Types/TopicType.pm
new file mode 100644
index 000000000..c20dbb6a8
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/TopicType.pm
@@ -0,0 +1,168 @@
+package WSNotification::Types::TopicType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/t-1' };
+
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::TopicType::_TopicType::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::ExtensibleDocumented);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %documentation_of :ATTR(:get<documentation>);
+my %MessagePattern_of :ATTR(:get<MessagePattern>);
+
+__PACKAGE__->_factory(
+    [ qw(        documentation
+        MessagePattern
+
+    ) ],
+    {
+        'documentation' => \%documentation_of,
+        'MessagePattern' => \%MessagePattern_of,
+    },
+    {
+        'documentation' => 'WSNotification::Types::Documentation',
+        'MessagePattern' => 'WSNotification::Types::QueryExpressionType',
+    },
+    {
+
+        'documentation' => 'documentation',
+        'MessagePattern' => 'MessagePattern',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::TopicType::_TopicType::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %name_of :ATTR(:get<name>);
+my %final_of :ATTR(:get<final>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        name
+        final
+    ) ],
+    {
+
+        name => \%name_of,
+
+        final => \%final_of,
+    },
+    {
+        name => 'SOAP::WSDL::XSD::Typelib::Builtin::NCName',
+        final => 'SOAP::WSDL::XSD::Typelib::Builtin::boolean',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::TopicType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+TopicType from the namespace http://docs.oasis-open.org/wsn/t-1.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MessagePattern
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::TopicType
+   MessagePattern =>  { # WSNotification::Types::QueryExpressionType
+   },
+ },
+
+
+
+=head2 attr
+
+NOTE: Attribute documentation is experimental, and may be inaccurate.
+See the correspondent WSDL/XML Schema if in question.
+
+This class has additional attributes, accessibly via the C<attr()> method.
+
+attr() returns an object of the class WSNotification::Types::TopicType::_TopicType::XmlAttr.
+
+The following attributes can be accessed on this object via the corresponding
+get_/set_ methods:
+
+=over
+
+=item * name
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::NCName|SOAP::WSDL::XSD::Typelib::Builtin::NCName>.
+
+=item * final
+
+
+
+This attribute is of type L<SOAP::WSDL::XSD::Typelib::Builtin::boolean|SOAP::WSDL::XSD::Typelib::Builtin::boolean>.
+
+
+=back
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm
new file mode 100644
index 000000000..1eaa5945f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToCreatePullPointFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToCreatePullPointFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToCreatePullPointFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToCreatePullPointFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToCreatePullPointFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm
new file mode 100644
index 000000000..61618b190
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToDestroyPullPointFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToDestroyPullPointFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToDestroyPullPointFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToDestroyPullPointFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroyPullPointFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm
new file mode 100644
index 000000000..fd1de261f
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToDestroySubscriptionFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToDestroySubscriptionFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToDestroySubscriptionFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToDestroySubscriptionFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToDestroySubscriptionFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm
new file mode 100644
index 000000000..df0dfd4a0
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnableToGetMessagesFaultType.pm
@@ -0,0 +1,252 @@
+package WSNotification::Types::UnableToGetMessagesFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnableToGetMessagesFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnableToGetMessagesFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnableToGetMessagesFaultType
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm
new file mode 100644
index 000000000..d9803c706
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnacceptableInitialTerminationTimeFaultType.pm
@@ -0,0 +1,270 @@
+package WSNotification::Types::UnacceptableInitialTerminationTimeFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %MinimumTime_of :ATTR(:get<MinimumTime>);
+my %MaximumTime_of :ATTR(:get<MaximumTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        MinimumTime
+        MaximumTime
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'MinimumTime' => \%MinimumTime_of,
+        'MaximumTime' => \%MaximumTime_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'MinimumTime' => 'MinimumTime',
+        'MaximumTime' => 'MaximumTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnacceptableInitialTerminationTimeFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MinimumTime
+
+
+=item * MaximumTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableInitialTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm
new file mode 100644
index 000000000..649b61830
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnacceptableTerminationTimeFaultType.pm
@@ -0,0 +1,270 @@
+package WSNotification::Types::UnacceptableTerminationTimeFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %MinimumTime_of :ATTR(:get<MinimumTime>);
+my %MaximumTime_of :ATTR(:get<MaximumTime>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        MinimumTime
+        MaximumTime
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'MinimumTime' => \%MinimumTime_of,
+        'MaximumTime' => \%MaximumTime_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'MinimumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'MaximumTime' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'MinimumTime' => 'MinimumTime',
+        'MaximumTime' => 'MaximumTime',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnacceptableTerminationTimeFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnacceptableTerminationTimeFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * MinimumTime
+
+
+=item * MaximumTime
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnacceptableTerminationTimeFaultType
+   MinimumTime =>  $some_value, # dateTime
+   MaximumTime =>  $some_value, # dateTime
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm
new file mode 100644
index 000000000..a82914c62
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnrecognizedPolicyRequestFaultType.pm
@@ -0,0 +1,261 @@
+package WSNotification::Types::UnrecognizedPolicyRequestFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %UnrecognizedPolicy_of :ATTR(:get<UnrecognizedPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        UnrecognizedPolicy
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'UnrecognizedPolicy' => \%UnrecognizedPolicy_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'UnrecognizedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'UnrecognizedPolicy' => 'UnrecognizedPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnrecognizedPolicyRequestFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnrecognizedPolicyRequestFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * UnrecognizedPolicy
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnrecognizedPolicyRequestFaultType
+   UnrecognizedPolicy =>  $some_value, # QName
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm b/onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm
new file mode 100644
index 000000000..8c22f4cbc
--- /dev/null
+++ b/onvif/proxy/lib/WSNotification/Types/UnsupportedPolicyRequestFaultType.pm
@@ -0,0 +1,261 @@
+package WSNotification::Types::UnsupportedPolicyRequestFaultType;
+use strict;
+use warnings;
+
+
+__PACKAGE__->_set_element_form_qualified(0);
+
+sub get_xmlns { 'http://docs.oasis-open.org/wsn/b-2' };
+
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+
+use base qw(WSNotification::Types::BaseFaultType);
+# Variety: sequence
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+my %Timestamp_of :ATTR(:get<Timestamp>);
+my %Originator_of :ATTR(:get<Originator>);
+my %ErrorCode_of :ATTR(:get<ErrorCode>);
+my %Description_of :ATTR(:get<Description>);
+my %FaultCause_of :ATTR(:get<FaultCause>);
+my %UnsupportedPolicy_of :ATTR(:get<UnsupportedPolicy>);
+
+__PACKAGE__->_factory(
+    [ qw(        Timestamp
+        Originator
+        ErrorCode
+        Description
+        FaultCause
+        UnsupportedPolicy
+
+    ) ],
+    {
+        'Timestamp' => \%Timestamp_of,
+        'Originator' => \%Originator_of,
+        'ErrorCode' => \%ErrorCode_of,
+        'Description' => \%Description_of,
+        'FaultCause' => \%FaultCause_of,
+        'UnsupportedPolicy' => \%UnsupportedPolicy_of,
+    },
+    {
+        'Timestamp' => 'SOAP::WSDL::XSD::Typelib::Builtin::dateTime',
+        'Originator' => 'WSNotification::Types::EndpointReferenceType',
+
+        'ErrorCode' => 'WSNotification::Types::BaseFaultType::_ErrorCode',
+
+        'Description' => 'WSNotification::Types::BaseFaultType::_Description',
+
+        'FaultCause' => 'WSNotification::Types::BaseFaultType::_FaultCause',
+        'UnsupportedPolicy' => 'SOAP::WSDL::XSD::Typelib::Builtin::QName',
+    },
+    {
+
+        'Timestamp' => 'Timestamp',
+        'Originator' => 'Originator',
+        'ErrorCode' => 'ErrorCode',
+        'Description' => 'Description',
+        'FaultCause' => 'FaultCause',
+        'UnsupportedPolicy' => 'UnsupportedPolicy',
+    }
+);
+
+} # end BLOCK
+
+
+
+
+package WSNotification::Types::BaseFaultType::_Description;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_Description::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use base qw(
+    SOAP::WSDL::XSD::Typelib::ComplexType
+    SOAP::WSDL::XSD::Typelib::Builtin::string
+);
+
+package WSNotification::Types::BaseFaultType::_Description::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %lang_of :ATTR(:get<lang>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        lang
+    ) ],
+    {
+
+        lang => \%lang_of,
+    },
+    {
+
+            lang => 'WSNotification::Attributes::lang',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_ErrorCode;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS = 'WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr';
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+# empty variety
+
+package WSNotification::Types::BaseFaultType::_ErrorCode::XmlAttr;
+use base qw(SOAP::WSDL::XSD::Typelib::AttributeSet);
+
+{ # BLOCK to scope variables
+
+my %dialect_of :ATTR(:get<dialect>);
+
+__PACKAGE__->_factory(
+    [ qw(
+        dialect
+    ) ],
+    {
+
+        dialect => \%dialect_of,
+    },
+    {
+        dialect => 'SOAP::WSDL::XSD::Typelib::Builtin::anyURI',
+    }
+);
+
+} # end BLOCK
+
+
+
+}
+
+
+
+package WSNotification::Types::BaseFaultType::_FaultCause;
+use strict;
+use warnings;
+{
+our $XML_ATTRIBUTE_CLASS;
+undef $XML_ATTRIBUTE_CLASS;
+
+sub __get_attr_class {
+    return $XML_ATTRIBUTE_CLASS;
+}
+
+use Class::Std::Fast::Storable constructor => 'none';
+use base qw(SOAP::WSDL::XSD::Typelib::ComplexType);
+
+Class::Std::initialize();
+
+{ # BLOCK to scope variables
+
+
+__PACKAGE__->_factory(
+    [ qw(
+    ) ],
+    {
+    },
+    {
+    },
+    {
+
+    }
+);
+
+} # end BLOCK
+
+
+
+
+
+
+
+}
+
+
+
+
+
+
+
+1;
+
+
+=pod
+
+=head1 NAME
+
+WSNotification::Types::UnsupportedPolicyRequestFaultType
+
+=head1 DESCRIPTION
+
+Perl data type class for the XML Schema defined complexType
+UnsupportedPolicyRequestFaultType from the namespace http://docs.oasis-open.org/wsn/b-2.
+
+
+
+
+
+
+=head2 PROPERTIES
+
+The following properties may be accessed using get_PROPERTY / set_PROPERTY
+methods:
+
+=over
+
+=item * UnsupportedPolicy
+
+
+
+
+=back
+
+
+=head1 METHODS
+
+=head2 new
+
+Constructor. The following data structure may be passed to new():
+
+ { # WSNotification::Types::UnsupportedPolicyRequestFaultType
+   UnsupportedPolicy =>  $some_value, # QName
+ },
+
+
+
+
+=head1 AUTHOR
+
+Generated by SOAP::WSDL
+
+=cut
+
diff --git a/onvif/scripts/Makefile.am b/onvif/scripts/Makefile.am
deleted file mode 100644
index 80db9755c..000000000
--- a/onvif/scripts/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-bin_SCRIPTS = \
-  zmonvif-probe.pl
-
diff --git a/onvif/scripts/zmonvif-probe.pl b/onvif/scripts/zmonvif-probe.pl
index 8740fb7e6..93c12959f 100755
--- a/onvif/scripts/zmonvif-probe.pl
+++ b/onvif/scripts/zmonvif-probe.pl
@@ -28,9 +28,10 @@ use Getopt::Std;
 
 require ONVIF::Client;
 
-require WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort;
-require WSDiscovery::Elements::Types;
-require WSDiscovery::Elements::Scopes;
+require WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort;
+require WSDiscovery10::Elements::Types;
+require WSDiscovery10::Elements::Scopes;
+require WSDiscovery10::Elements::To;
 
 require WSDiscovery::TransportUDP;
 
@@ -95,7 +96,7 @@ sub deserialize_message
 
 sub interpret_messages
 {
-  my ($svc_discover, @responses, %services) = @_;
+  my ($svc_discover, $services, @responses ) = @_;
 
   foreach my $response ( @responses ) {
 
@@ -106,7 +107,7 @@ sub interpret_messages
     my $result = deserialize_message($svc_discover, $response);
     if(not $result) {
       if($verbose) {
-        print "Error deserializing message:\n" . $result . "\n";
+        print "Error deserializing message. No message returned from deserializer.\n";
       }
       next;
     }
@@ -114,15 +115,23 @@ sub interpret_messages
     my $xaddr;  
     foreach my $l_xaddr (split ' ', $result->get_ProbeMatch()->get_XAddrs()) {
   #   find IPv4 address
-      if($l_xaddr =~ m|//[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+/|) { 
+      if($verbose) {
+        print "l_xaddr = $l_xaddr\n";
+      }
+      if($l_xaddr =~ m|//[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+[:/]|) {
         $xaddr = $l_xaddr;
         last;
+      } else {
+        print STDERR "Unable to find IPv4 address from xaddr $l_xaddr\n";
       }
     }
 
+    # No usable address found
+    next if not $xaddr;
+
     # ignore multiple responses from one service
-    next if defined $services{$xaddr};
-    $services{$xaddr} = 1;
+    next if defined $services->{$xaddr};
+    $services->{$xaddr} = 1;
 
     print "$xaddr, " . $svc_discover->get_soap_version() . ", ";
 
@@ -163,39 +172,41 @@ sub discover
   if($verbose) {
     print "Probing for SOAP 1.1\n"
   }
-  my $svc_discover = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new({ 
+  my $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({ 
 #    no_dispatch => '1',
   });
   $svc_discover->set_soap_version('1.1');
 
   my $result = $svc_discover->ProbeOp(
     { # WSDiscovery::Types::ProbeType
-      Types => { 'dn:NetworkVideoTransmitter', 'tds:Device' }, # QNameListType
+      Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
       Scopes =>  { value => '' },
-    },, 
+    },
+      WSDiscovery10::Elements::To->new({ value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' })
   );
 #  print $result . "\n";
 
-  interpret_messages($svc_discover, \@responses, \%services);
+  interpret_messages($svc_discover, \%services, @responses);
   @responses = ();
 
   if($verbose) {
     print "Probing for SOAP 1.2\n"
   }
-  $svc_discover = WSDiscovery::Interfaces::WSDiscovery::WSDiscoveryPort->new({
+  $svc_discover = WSDiscovery10::Interfaces::WSDiscovery::WSDiscoveryPort->new({
 #    no_dispatch => '1',
   });
   $svc_discover->set_soap_version('1.2');
 
   $result = $svc_discover->ProbeOp(
     { # WSDiscovery::Types::ProbeType
-      Types => { 'dn:NetworkVideoTransmitter', 'tds:Device' }, # QNameListType
+      Types => 'http://www.onvif.org/ver10/network/wsdl:NetworkVideoTransmitter http://www.onvif.org/ver10/device/wsdl:Device', # QNameListType
       Scopes =>  { value => '' },
-    },, 
+    },
+      WSDiscovery10::Elements::To->new({ value => 'urn:schemas-xmlsoap-org:ws:2005:04:discovery' })
   );
 #  print $result . "\n";
 
-  interpret_messages($svc_discover, @responses, \%services);
+  interpret_messages($svc_discover, \%services, @responses);
 }
 
 
@@ -224,16 +235,21 @@ sub profiles
          $profile->get_VideoEncoderConfiguration()->get_RateControl()->get_FrameRateLimit() .
          ", ";
 
-    $result = $client->get_endpoint('media')->GetStreamUri( { 
-      StreamSetup =>  { # ONVIF::Media::Types::StreamSetup
-        Stream => 'RTP_unicast', # StreamType
-        Transport =>  { # ONVIF::Media::Types::Transport
-          Protocol => 'RTSP', # TransportProtocol
-        },
-      },
-      ProfileToken => $token, # ReferenceToken  
-    } ,, );
-    die $result if not $result;
+   # Specification gives conflicting values for unicast stream types, try both.
+   # http://www.onvif.org/onvif/ver10/media/wsdl/media.wsdl#op.GetStreamUri
+   foreach my $streamtype ( 'RTP_unicast', 'RTP-Unicast' ) {
+     $result = $client->get_endpoint('media')->GetStreamUri( {
+       StreamSetup =>  { # ONVIF::Media::Types::StreamSetup
+         Stream => $streamtype, # StreamType
+         Transport =>  { # ONVIF::Media::Types::Transport
+           Protocol => 'RTSP', # TransportProtocol
+         },
+       },
+       ProfileToken => $token, # ReferenceToken
+     } ,, );
+     last if $result;
+   }
+   die $result if not $result;
   #  print $result . "\n";
 
     print $result->get_MediaUri()->get_Uri() .
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
deleted file mode 100644
index 5eacd8203..000000000
--- a/scripts/Makefile.am
+++ /dev/null
@@ -1,75 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# Ack! Nasty hack to get modules Makefile regenerated if wiped with make clean
-all-local: ZoneMinder/Makefile
-
-ZoneMinder/Makefile: ZoneMinder/Makefile.PL
-	( cd ZoneMinder; perl Makefile.PL )
-
-bin_SCRIPTS = \
-	zmdc.pl \
-	zmaudit.pl \
-	zmfilter.pl \
-	zmtrigger.pl \
-	zmx10.pl \
-	zmwatch.pl \
-	zmpkg.pl \
-	zmupdate.pl \
-	zmvideo.pl \
-	zmcontrol.pl \
-	zmtrack.pl \
-	zmcamtool.pl \
-	zmsystemctl.pl
-
-SUBDIRS = \
-	. \
-    ZoneMinder
-
-EXTRA_DIST = \
-	zmdc.pl.in \
-	zmaudit.pl.in \
-	zmfilter.pl.in \
-	zmtrigger.pl.in \
-	zmx10.pl.in \
-	zmwatch.pl.in \
-	zmpkg.pl.in \
-	zmupdate.pl.in \
-	zmvideo.pl.in \
-	zmcontrol.pl.in \
-	zmtrack.pl.in \
-	zmcamtool.pl.in \
-	zmsystemctl.pl.in \
-	ZoneMinder/Makefile.PL \
-	ZoneMinder/README \
-	ZoneMinder/Changes \
-	ZoneMinder/META.yml \
-	ZoneMinder/MANIFEST \
-	ZoneMinder/t/ZoneMinder.t \
-	ZoneMinder/lib/ZoneMinder.pm \
-	ZoneMinder/lib/ZoneMinder/Base.pm.in \
-	ZoneMinder/lib/ZoneMinder/Config.pm.in \
-	ZoneMinder/lib/ZoneMinder/Logger.pm \
-	ZoneMinder/lib/ZoneMinder/General.pm \
-	ZoneMinder/lib/ZoneMinder/Database.pm \
-	ZoneMinder/lib/ZoneMinder/Memory.pm.in \
-	ZoneMinder/lib/ZoneMinder/Memory/Shared.pm \
-	ZoneMinder/lib/ZoneMinder/Memory/Mapped.pm \
-	ZoneMinder/lib/ZoneMinder/ConfigAdmin.pm \
-	ZoneMinder/lib/ZoneMinder/ConfigData.pm.in \
-	ZoneMinder/lib/ZoneMinder/Control.pm \
-	ZoneMinder/lib/ZoneMinder/Control \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Handle.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Spawning.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Inet.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Unix.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/File.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Channel/Serial.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Connection.pm \
-	ZoneMinder/lib/ZoneMinder/Trigger/Connection/Example.pm \
-	zm.in \
-	zmdbbackup.in \
-	zmdbrestore.in \
-	zmeventdump.in \
-	zmlogrotate.conf.in
-
diff --git a/scripts/ZoneMinder/CMakeLists.txt b/scripts/ZoneMinder/CMakeLists.txt
index 09c02b816..3ed9bf7c6 100644
--- a/scripts/ZoneMinder/CMakeLists.txt
+++ b/scripts/ZoneMinder/CMakeLists.txt
@@ -24,7 +24,7 @@ else(CMAKE_VERBOSE_MAKEFILE)
 endif(CMAKE_VERBOSE_MAKEFILE)
 
 # Add build target for the perl modules
-add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make --makefile=MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
+add_custom_target(zmperlmodules ALL perl Makefile.PL ${ZM_PERL_MM_PARMS} FIRST_MAKEFILE=MakefilePerl DESTDIR="${CMAKE_CURRENT_BINARY_DIR}/output" ${MAKEMAKER_NOECHO_COMMAND} COMMAND make -f MakefilePerl pure_install COMMENT "Building ZoneMinder perl modules")
 
 # Add install target for the perl modules
 install(DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}/output/" DESTINATION "/")
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
index 0c5a82a30..3a226cdc8 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Config.pm.in
@@ -66,12 +66,6 @@ use Carp;
 BEGIN
 {
     my $config_file = ZM_CONFIG;
-    ( my $local_config_file = $config_file ) =~ s|^.*/|./|;
-    if ( -s $local_config_file and -r $local_config_file )
-    {
-        print( STDERR "Warning, overriding installed $local_config_file file with local copy\n" );
-        $config_file = $local_config_file;
-    }
     open( my $CONFIG, "<", $config_file )
         or croak( "Can't open config file '$config_file': $!" );
     foreach my $str ( <$CONFIG> )
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
index d75a77e45..fc4143d8a 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
+++ b/scripts/ZoneMinder/lib/ZoneMinder/ConfigData.pm.in
@@ -345,10 +345,10 @@ our @options =
             already logged in. As authentication hashes are time and,
             optionally, IP limited this can allow short-term access to
             ZoneMinder screens from other web pages etc. In order to use
-            this the calling application will hae to generate the
+            this the calling application will have to generate the
             authentication hash itself and ensure it is valid. If you use
             this option you should ensure that you have modified the
-            ZM_AUTH_HASH_SECRET to somethign unique to your system.
+            ZM_AUTH_HASH_SECRET to something unique to your system.
         "),
         requires    => [
                             { name=>"ZM_OPT_USE_AUTH", value=>"yes" },
@@ -3759,161 +3759,6 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
         type        => $types{integer},
         category    => "lowband",
     },
-    {
-        name        => "ZM_WEB_P_CAN_STREAM",
-        default     => "auto",
-        description => "Override the automatic detection of browser streaming capability",
-        help        => qqq("
-            If you know that your browser can handle image streams of the
-            type 'multipart/x-mixed-replace' but ZoneMinder does not detect
-            this correctly you can set this option to ensure that the
-            stream is delivered with or without the use of the Cambozola
-            plugin. Selecting 'yes' will tell ZoneMinder that your browser
-            can handle the streams natively, 'no' means that it can't and
-            so the plugin will be used while 'auto' lets ZoneMinder decide.
-        "),
-        type        => $types{tristate},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_STREAM_METHOD",
-        default     => "jpeg",
-        description => "Which method should be used to send video streams to your browser.",
-        help        => qqq("
-            ZoneMinder can be configured to use either mpeg encoded video
-            or a series or still jpeg images when sending video streams.
-            This option defines which is used. If you choose mpeg you
-            should ensure that you have the appropriate plugins available
-            on your browser whereas choosing jpeg will work natively on
-            Mozilla and related browsers and with a Java applet on Internet
-            Explorer
-        "),
-        type        => {
-            db_type     =>"string",
-            hint        =>"mpeg|jpeg",
-            pattern     =>qr|^([mj])|i,
-            format      =>q( $1 =~ /^m/ ? "mpeg" : "jpeg" )
-        },
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_DEFAULT_SCALE",
-        default     => "100",
-        description => "What the default scaling factor applied to 'live' or 'event' views is (%)",
-        help        => qqq("
-            Normally ZoneMinder will display 'live' or 'event' streams in
-            their native size. However if you have monitors with large
-            dimensions or a slow link you may prefer to reduce this size,
-            alternatively for small monitors you can enlarge it. This
-            options lets you specify what the default scaling factor will
-            be. It is expressed as a percentage so 100 is normal size, 200
-            is double size etc.
-        "),
-        type        => {
-            db_type     =>"integer",
-            hint        =>"25|33|50|75|100|150|200|300|400",
-            pattern     =>qr|^(\d+)$|, format=>q( $1 )
-        },
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_DEFAULT_RATE",
-        default     => "100",
-        description => "What the default replay rate factor applied to 'event' views is (%)",
-        help        => qqq("
-            Normally ZoneMinder will display 'event' streams at their
-            native rate, i.e. as close to real-time as possible. However if
-            you have long events it is often convenient to replay them at a
-            faster rate for review. This option lets you specify what the
-            default replay rate will be. It is expressed as a percentage so
-            100 is normal rate, 200 is double speed etc.
-        "),
-        type        => {
-            db_type     =>"integer",
-            hint        =>"25|50|100|150|200|400|1000|2500|5000|10000",
-            pattern     =>qr|^(\d+)$|,
-            format      =>q( $1 )
-        },
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_VIDEO_BITRATE",
-        default     => "8000",
-        description => "What the bitrate of the video encoded stream should be set to",
-        help        => qqq("
-            When encoding real video via the ffmpeg library a bit rate can
-            be specified which roughly corresponds to the available
-            bandwidth used for the stream. This setting effectively
-            corresponds to a 'quality' setting for the video. A low value
-            will result in a blocky image whereas a high value will produce
-            a clearer view. Note that this setting does not control the
-            frame rate of the video however the quality of the video
-            produced is affected both by this setting and the frame rate
-            that the video is produced at. A higher frame rate at a
-            particular bit rate result in individual frames being at a
-            lower quality.
-        "),
-        type        => $types{integer},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_VIDEO_MAXFPS",
-        default     => "5",
-        description => "What the maximum frame rate for streamed video should be",
-        help        => qqq("
-            When using streamed video the main control is the bitrate which
-            determines how much data can be transmitted. However a lower
-            bitrate at high frame rates results in a lower quality image.
-            This option allows you to limit the maximum frame rate to
-            ensure that video quality is maintained. An additional
-            advantage is that encoding video at high frame rates is a
-            processor intensive task when for the most part a very high
-            frame rate offers little perceptible improvement over one that
-            has a more manageable resource requirement. Note, this option
-            is implemented as a cap beyond which binary reduction takes
-            place. So if you have a device capturing at 15fps and set this
-            option to 10fps then the video is not produced at 10fps, but
-            rather at 7.5fps (15 divided by 2) as the final frame rate must
-            be the original divided by a power of 2.
-        "),
-        type        => $types{integer},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_SCALE_THUMBS",
-        default     => "yes",
-        description => "Scale thumbnails in events, bandwidth versus cpu in rescaling",
-        help        => qqq("
-            If unset, this option sends the whole image to the browser
-            which resizes it in the window. If set the image is scaled down
-            on the server before sending a reduced size image to the
-            browser to conserve bandwidth at the cost of cpu on the server.
-            Note that ZM can only perform the resizing if the appropriate
-            PHP graphics functionality is installed. This is usually
-            available in the php-gd package.
-        "),
-        type        => $types{boolean},
-        category    => "phoneband",
-    },
-    {
-        name        => "ZM_WEB_P_AJAX_TIMEOUT",
-        default     => "10000",
-        description => "How long to wait for Ajax request responses (ms)",
-        help        => qqq("
-            The newer versions of the live feed and event views use Ajax to
-            request information from the server and populate the views
-            dynamically. This option allows you to specify a timeout if
-            required after which requests are abandoned. A timeout may be
-            necessary if requests would overwise hang such as on a slow
-            connection. This would tend to consume a lot of browser memory
-            and make the interface unresponsive. Ordinarily no requests
-            should timeout so this setting should be set to a value greater
-            than the slowest expected response. This value is in
-            milliseconds but if set to zero then no timeout will be used.
-        "),
-        type        => $types{integer},
-        category    => "phoneband",
-    },
     {
         name        => "ZM_DYN_LAST_VERSION",
         default     => "",
@@ -3981,139 +3826,39 @@ body = "ZM alarm detected - %EL% secs, %EF%/%EFA% frames, t%EST%/m%ESM%/a%ESA% s
         category    => "dynamic",
     },
     {
-        name        => "ZM_EYEZM_DEBUG",
+        name        => "ZM_SSMTP_MAIL",
         default     => "no",
-        description => "Switch additional debugging on for eyeZm Plugin",
+        description =>  qqq("
+            Use a SSMTP mail server if available. 
+            NEW_MAIL_MODULES must be enabled
+        "),
+        requires    => [
+                        { name => "ZM_OPT_EMAIL", value => "yes" },
+                        { name => "ZM_OPT_MESSAGE", value => "yes" },
+                        { name => "ZM_NEW_MAIL_MODULES", value => "yes" }
+                       ],
         help        => qqq("
-            Enable or Disable extra debugging from the eyeZm Plugin. Extra
-            debugging information will be displayed in it's own file
-            (EYEZM_LOG_TO_FILE is set), or your Apache error log
+            SSMTP is a lightweight and efficient method to send email.
+            The SSMTP application is not installed by default.
+            NEW_MAIL_MODULES must also be enabled.
+            Please visit: http://www.zoneminder.com/wiki/index.php/How_to_get_ssmtp_working_with_Zoneminder
+            for setup and configuration help.
         "),
         type        => $types{boolean},
-        category    => "eyeZm",
+        category    => "mail",
     },
     {
-        name        => "ZM_EYEZM_LOG_TO_FILE",
-        default     => "yes",
-        description => "When eyeZm Debugging is enabled, enabling this logs output to it's own file",
+        name        => "ZM_SSMTP_PATH",
+        default     => "",
+        description => "SSMTP executable path",
+        requires    => [{ name => "ZM_SSMTP_MAIL", value => "yes" }],
         help        => qqq("
-            When EYEZM_DEBUG is on and EYEZM_LOG_TO_FILE is on, output
-            generated from the eyeZm Plugin will go to it's own file.
-            Otherwise it will go to the apache error log.
-        "),
-        type        => $types{boolean},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_LOG_FILE",
-        default     => "@ZM_LOGDIR@/zm_xml.log",
-        description => "Default filename to use when logging eyeZm Output and EYEZM_LOG_TO_FILE is enabled", 
-        help        => qqq("
-            This file will contain it's own output from the eyeZm Plugin
-            when EYEZM_LOG_TO_FILE and EYEZM_DEBUG are both enabled
+            Recommend setting the path to the SSMTP application.
+            If path is not defined. Zoneminder will try to determine
+            the path via shell command. Example path: /usr/sbin/ssmtp.
         "),
         type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_EVENT_VCODEC",
-        default     => "mpeg4",
-        description => "Default video-codec to use for encoding events",
-        help        => qqq("
-            The eyeZm Plugin calls FFMPEG externally to encode the captured
-            images. If your FFMPEG is not built with support for H264,
-            change this to MPEG-4. If using H264, please check
-            http://www.eyezm.com for H264 requirements and that your eyeZm
-            version supports H264 (v1.2+).
-        "),
-        type        => {
-            db_type     =>"string",
-            hint        =>"mpeg4|h264",
-            pattern     =>qr|^([mh])|i,
-            format      =>q( $1 =~ /^m/ ? "mpeg4" : "h264" )
-        },
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_FEED_VCODEC",
-        default     => "mjpeg",
-        description => "Default video-codec to use for streaming the live feed",
-        help        => qqq("
-            Determines whether the live stream is generated using native
-            MJPEG streaming with ZoneMinder, or H264 using FFMPEG and
-            HTML-5 streaming. If using H264, please check
-            http://www.eyezm.com for H264 requirements and that your eyeZm
-            version supports H264 (v1.2+). This is just a default
-            parameter, and can be overridden with eyeZm.
-        "),
-        type        => {
-            db_type     =>"string",
-            hint        =>"mjpeg|h264",
-            pattern     =>qr|^([mh])|i,
-            format      =>q( $1 =~ /^m/ ? "mjpeg" : "h264" )
-        },
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_H264_DEFAULT_BR",
-        default     => "96k",
-        description => "Default bit-rate to use with FFMPEG for H264 streaming",
-        help        => qqq("
-            When using the eyeZm Plugin to stream H264 data, FFMPEG
-            requires a bitrate to control the quality and bandwidth of the
-            video. This should be specified in a format acceptable to
-            FFMPEG. The default value is sufficient for most installations.
-            This is just a default parameter, and can be overridden with
-            eyeZm.
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_H264_DEFAULT_EVBR",
-        default     => "128k",
-        description => "Default bit-rate to use with FFMPEG for H264 event viewing",
-        help        => qqq("
-            When using the eyeZm Plugin to view events in H264, FFMPEG
-            requires a bitrate to control the quality and bandwidth of the
-            video. This should be specified in a format acceptable to
-            FFMPEG. The default value is sufficient for most installations.
-            This is just a default parameter, and can be overridden with
-            eyeZm.
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_H264_TIMEOUT",
-        default     => "20",
-        description => "Timeout (sec) to wait for H264 stream to start before terminating",
-        help        => qqq("
-            The eyeZm Plugin will attempt to spawn an H264 stream when
-            requested, and require that it complete within the timeout
-            specified. If you have a slow system or find through the logs
-            that the H264 stream is not starting because the timeout is
-            expiring, even though FFMPEG is running, try increasing this
-            value. If you have a fast system, decreasing this value can
-            improve the responsiveness when there are issues starting H264
-            streams
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
-    },
-    {
-        name        => "ZM_EYEZM_SEG_DURATION",
-        default     => "3",
-        description => "Segment duration used for streaming using HTTP-5 Streaming protocol",
-        help        => qqq("
-            The HTTP-5 Live Streaming Protocol segments the input video
-            stream into small chunks of a duration specified by this
-            parameter. Increasing the segment duration will help with
-            choppy connections on the other end, but will increase the
-            latency in starting a stream.
-        "),
-        type        => $types{string},
-        category    => "eyeZm",
+        category    => "mail",
     },
 );
 
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Event.pm b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
new file mode 100644
index 000000000..67c117460
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Event.pm
@@ -0,0 +1,330 @@
+# ==========================================================================
+#
+# ZoneMinder Event Module, $Date$, $Revision$
+# Copyright (C) 2001-2008  Philip Coombes
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Event;
+
+use 5.006;
+use strict;
+use warnings;
+
+require Exporter;
+require ZoneMinder::Base;
+require Date::Manip;
+
+our @ISA = qw(Exporter ZoneMinder::Base);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration   use ZoneMinder ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+our %EXPORT_TAGS = (
+    'functions' => [ qw(
+    ) ]
+);
+push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw();
+
+our $VERSION = $ZoneMinder::Base::VERSION;
+
+# ==========================================================================
+#
+# General Utility Functions
+#
+# ==========================================================================
+
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+
+use POSIX;
+
+sub new {
+    my ( $parent, $id, $data ) = @_;
+
+	my $self = {};
+	bless $self, $parent;
+    $$self{dbh} = $ZoneMinder::Database::dbh;
+#zmDbConnect();
+	if ( ( $$self{Id} = $id ) or $data ) {
+#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
+		$self->load( $data );
+	}
+	return $self;
+} # end sub new
+
+sub load {
+	my ( $self, $data ) = @_;
+	my $type = ref $self;
+	if ( ! $data ) {
+#$log->debug("Object::load Loading from db $type");
+		$data = $$self{dbh}->selectrow_hashref( 'SELECT * FROM Events WHERE Id=?', {}, $$self{Id} );
+		if ( ! $data ) {
+				Error( "Failure to load Event record for $$self{Id}: Reason: " . $$self{dbh}->errstr );
+		} else {
+			Debug( 3, "Loaded Event $$self{Id}" );	
+		} # end if
+	} # end if ! $data
+	if ( $data and %$data ) {
+		@$self{keys %$data} = values %$data;
+	} # end if
+} # end sub load
+
+sub Name {
+	if ( @_ > 1 ) {
+		$_[0]{Name} = $_[1];
+	}
+	return $_[0]{Name};
+} # end sub Path
+
+sub find {
+	shift if $_[0] eq 'ZoneMinder::Event';
+	my %sql_filters = @_;
+
+	my $sql = 'SELECT * FROM Events';
+	my @sql_filters;
+	my @sql_values;
+
+    if ( exists $sql_filters{Name} ) {
+        push @sql_filters , ' Name = ? ';
+		push @sql_values, $sql_filters{Name};
+    }
+
+	$sql .= ' WHERE ' . join(' AND ', @sql_filters ) if @sql_filters;
+	$sql .= ' LIMIT ' . $sql_filters{limit} if $sql_filters{limit};
+
+	my $sth = $ZoneMinder::Database::dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
+    my $res = $sth->execute( @sql_values )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+
+	my @results;
+
+	while( my $db_filter = $sth->fetchrow_hashref() ) {
+		my $filter = new ZoneMinder::Event( $$db_filter{Id}, $db_filter );
+		push @results, $filter;
+	} # end while
+	return @results;
+}
+
+sub find_one {
+	my @results = find(@_);
+	return $results[0] if @results;
+}
+
+sub getEventPath
+{
+    my $event = shift;
+
+    my $event_path = "";
+    if ( $Config{ZM_USE_DEEP_STORAGE} )
+    {
+        $event_path = $Config{ZM_DIR_EVENTS}
+                      .'/'.$event->{MonitorId}
+                      .'/'.strftime( "%y/%m/%d/%H/%M/%S",
+                                     localtime($event->{Time})
+                                   )
+        ;
+    }
+    else
+    {
+        $event_path = $Config{ZM_DIR_EVENTS}
+                      .'/'.$event->{MonitorId}
+                      .'/'.$event->{Id}
+        ;
+    }
+
+    if ( index($Config{ZM_DIR_EVENTS},'/') != 0 ){
+        $event_path = $Config{ZM_PATH_WEB}
+                      .'/'.$event_path
+        ;
+    }
+    return( $event_path );
+}
+
+sub GenerateVideo {
+	my ( $self, $rate, $fps, $scale, $size, $overwrite, $format ) = @_;
+
+	my $event_path = getEventPath( $self );
+	chdir( $event_path );
+	( my $video_name = $self->{Name} ) =~ s/\s/_/g;
+
+	my @file_parts;
+	if ( $rate )
+	{
+		my $file_rate = $rate;
+		$file_rate =~ s/\./_/;
+		$file_rate =~ s/_00//;
+		$file_rate =~ s/(_\d+)0+$/$1/;
+		$file_rate = 'r'.$file_rate;
+		push( @file_parts, $file_rate );
+	}
+	elsif ( $fps )
+	{
+		my $file_fps = $fps;
+		$file_fps =~ s/\./_/;
+		$file_fps =~ s/_00//;
+		$file_fps =~ s/(_\d+)0+$/$1/;
+		$file_fps = 'R'.$file_fps;
+		push( @file_parts, $file_fps );
+	}
+
+	if ( $scale )
+	{
+		my $file_scale = $scale;
+		$file_scale =~ s/\./_/;
+		$file_scale =~ s/_00//;
+		$file_scale =~ s/(_\d+)0+$/$1/;
+		$file_scale = 's'.$file_scale;
+		push( @file_parts, $file_scale );
+	}
+	elsif ( $size )
+	{
+		my $file_size = 'S'.$size;
+		push( @file_parts, $file_size );
+	}
+	my $video_file = "$video_name-".$file_parts[0]."-".$file_parts[1].".$format";
+	if ( $overwrite || !-s $video_file )
+	{
+		Info( "Creating video file $video_file for event $self->{Id}\n" );
+
+		my $frame_rate = sprintf( "%.2f", $self->{Frames}/$self->{FullLength} );
+		if ( $rate )
+		{
+			if ( $rate != 1.0 )
+			{
+				$frame_rate *= $rate;
+			}
+		}
+		elsif ( $fps )
+		{
+			$frame_rate = $fps;
+		}
+
+		my $width = $self->{MonitorWidth};
+		my $height = $self->{MonitorHeight};
+		my $video_size = " ${width}x${height}";
+
+		if ( $scale )
+		{
+			if ( $scale != 1.0 )
+			{
+				$width = int($width*$scale);
+				$height = int($height*$scale);
+				$video_size = " ${width}x${height}";
+			}
+		}
+		elsif ( $size )
+		{
+			$video_size = $size;
+		}
+		my $command = $Config{ZM_PATH_FFMPEG}
+		." -y -r $frame_rate "
+			.$Config{ZM_FFMPEG_INPUT_OPTIONS}
+		." -i %0"
+			.$Config{ZM_EVENT_IMAGE_DIGITS}
+		."d-capture.jpg -s $video_size "
+#. " -f concat -i /tmp/event_files.txt"
+			." -s $video_size "
+			.$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
+		." '$video_file' > ffmpeg.log 2>&1"
+			;
+		Debug( $command."\n" );
+		my $output = qx($command);
+
+		my $status = $? >> 8;
+		if ( $status )
+		{
+			Error( "Unable to generate video, check "
+					.$event_path."/ffmpeg.log for details"
+				 );
+			return;
+		}
+
+		Info( "Finished $video_file\n" );
+		return $event_path.'/'.$video_file;
+	} else {
+		Info( "Video file $video_file already exists for event $self->{Id}\n" );
+		return $event_path.'/'.$video_file;
+	}
+	return;	
+} # end sub GenerateVideo
+
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Event;
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for ZoneMinder, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Mention other useful documentation such as the documentation of
+related modules or operating system documentation (such as man pages
+in UNIX), or any relevant external documentation such as RFCs or
+standards.
+
+If you have a mailing list set up for your module, mention it here.
+
+If you have a web site set up for your module, mention it here.
+
+=head1 AUTHOR
+
+Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
new file mode 100644
index 000000000..b7806ec4a
--- /dev/null
+++ b/scripts/ZoneMinder/lib/ZoneMinder/Filter.pm
@@ -0,0 +1,526 @@
+# ==========================================================================
+#
+# ZoneMinder Filter Module, $Date$, $Revision$
+# Copyright (C) 2001-2008  Philip Coombes
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+# ==========================================================================
+#
+# This module contains the common definitions and functions used by the rest
+# of the ZoneMinder scripts
+#
+package ZoneMinder::Filter;
+
+use 5.006;
+use strict;
+use warnings;
+
+require Exporter;
+require ZoneMinder::Base;
+require Date::Manip;
+
+our @ISA = qw(Exporter ZoneMinder::Base);
+
+# Items to export into callers namespace by default. Note: do not export
+# names by default without a very good reason. Use EXPORT_OK instead.
+# Do not simply export all your public functions/methods/constants.
+
+# This allows declaration   use ZoneMinder ':all';
+# If you do not need this, moving things directly into @EXPORT or @EXPORT_OK
+# will save memory.
+our %EXPORT_TAGS = (
+    'functions' => [ qw(
+    ) ]
+);
+push( @{$EXPORT_TAGS{all}}, @{$EXPORT_TAGS{$_}} ) foreach keys %EXPORT_TAGS;
+
+our @EXPORT_OK = ( @{ $EXPORT_TAGS{'all'} } );
+
+our @EXPORT = qw();
+
+our $VERSION = $ZoneMinder::Base::VERSION;
+
+# ==========================================================================
+#
+# General Utility Functions
+#
+# ==========================================================================
+
+use ZoneMinder::Config qw(:all);
+use ZoneMinder::Logger qw(:all);
+use ZoneMinder::Database qw(:all);
+
+use POSIX;
+
+sub new {
+    my ( $parent, $id, $data ) = @_;
+
+	my $self = {};
+	bless $self, $parent;
+    $$self{dbh} = $ZoneMinder::Database::dbh;
+#zmDbConnect();
+	if ( ( $$self{Id} = $id ) or $data ) {
+#$log->debug("loading $parent $id") if $debug or DEBUG_ALL;
+		$self->load( $data );
+	}
+	return $self;
+} # end sub new
+
+sub load {
+	my ( $self, $data ) = @_;
+	my $type = ref $self;
+	if ( ! $data ) {
+#$log->debug("Object::load Loading from db $type");
+		$data = $$self{dbh}->selectrow_hashref( 'SELECT * FROM Filter WHERE Id=?', {}, $$self{Id} );
+		if ( ! $data ) {
+				Error( "Failure to load Filter record for $$self{Id}: Reason: " . $$self{dbh}->errstr );
+		} else {
+			Debug( 3, "Loaded Filter $$self{Id}" );	
+		} # end if
+	} # end if ! $data
+	if ( $data and %$data ) {
+		@$self{keys %$data} = values %$data;
+	} # end if
+} # end sub load
+
+sub Name {
+	if ( @_ > 1 ) {
+		$_[0]{Name} = $_[1];
+	}
+	return $_[0]{Name};
+} # end sub Path
+
+sub find {
+	shift if $_[0] eq 'ZoneMinder::Filter';
+	my %sql_filters = @_;
+
+	my $sql = 'SELECT * FROM Filters';
+	my @sql_filters;
+	my @sql_values;
+
+    if ( exists $sql_filters{Name} ) {
+        push @sql_filters , ' Name = ? ';
+		push @sql_values, $sql_filters{Name};
+    }
+
+	$sql .= ' WHERE ' . join(' AND ', @sql_filters ) if @sql_filters;
+	$sql .= ' LIMIT ' . $sql_filters{limit} if $sql_filters{limit};
+
+	my $sth = $ZoneMinder::Database::dbh->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$ZoneMinder::Database::dbh->errstr() );
+    my $res = $sth->execute( @sql_values )
+            or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+
+	my @results;
+
+	while( my $db_filter = $sth->fetchrow_hashref() ) {
+		my $filter = new ZoneMinder::Filter( $$db_filter{Id}, $db_filter );
+		push @results, $filter;
+	} # end while
+	return @results;
+}
+
+sub find_one {
+	my @results = find(@_);
+	return $results[0] if @results;
+}
+
+sub Execute {
+	my $self = $_[0];
+
+	my $sql = $self->Sql();
+
+   if ( $self->{HasDiskPercent} )
+    {
+        my $disk_percent = getDiskPercent();
+        $sql =~ s/zmDiskPercent/$disk_percent/g;
+    }
+    if ( $self->{HasDiskBlocks} )
+    {
+        my $disk_blocks = getDiskBlocks();
+        $sql =~ s/zmDiskBlocks/$disk_blocks/g;
+    }
+    if ( $self->{HasSystemLoad} )
+    {
+        my $load = getLoad();
+        $sql =~ s/zmSystemLoad/$load/g;
+    }
+
+    my $sth = $$self{dbh}->prepare_cached( $sql )
+        or Fatal( "Can't prepare '$sql': ".$$self{dbh}->errstr() );
+    my $res = $sth->execute();
+    if ( !$res )
+    {
+        Error( "Can't execute filter '$sql', ignoring: ".$sth->errstr() );
+        return;
+    }
+	my @results;
+
+    while( my $event = $sth->fetchrow_hashref() ) {
+		push @results, $event;
+	}
+	$sth->finish();
+	return @results;
+}
+
+sub Sql {
+	my $self = $_[0];
+	if ( ! $$self{Sql} ) {
+		my $filter_expr = ZoneMinder::General::jsonDecode( $self->{Query} );
+        my $sql = "SELECT E.Id,
+                          E.MonitorId,
+                          M.Name as MonitorName,
+                          M.DefaultRate,
+                          M.DefaultScale,
+                          E.Name,
+                          E.Cause,
+                          E.Notes,
+                          E.StartTime,
+                          unix_timestamp(E.StartTime) as Time,
+                          E.Length,
+                          E.Frames,
+                          E.AlarmFrames,
+                          E.TotScore,
+                          E.AvgScore,
+                          E.MaxScore,
+                          E.Archived,
+                          E.Videoed,
+                          E.Uploaded,
+                          E.Emailed,
+                          E.Messaged,
+                          E.Executed
+                   FROM Events as E
+                   INNER JOIN Monitors as M on M.Id = E.MonitorId
+        ";
+        $self->{Sql} = '';
+
+        if ( $filter_expr->{terms} ) {
+            for ( my $i = 0; $i < @{$filter_expr->{terms}}; $i++ ) {
+                if ( exists($filter_expr->{terms}[$i]->{cnj}) ) {
+                    $self->{Sql} .= " ".$filter_expr->{terms}[$i]->{cnj}." ";
+                }
+                if ( exists($filter_expr->{terms}[$i]->{obr}) ) {
+                    $self->{Sql} .= " ".str_repeat( "(", $filter_expr->{terms}[$i]->{obr} )." ";
+                }
+                my $value = $filter_expr->{terms}[$i]->{val};
+                my @value_list;
+                if ( $filter_expr->{terms}[$i]->{attr} ) {
+                    if ( $filter_expr->{terms}[$i]->{attr} =~ /^Monitor/ ) {
+                        my ( $temp_attr_name ) = $filter_expr->{terms}[$i]->{attr} =~ /^Monitor(.+)$/;
+                        $self->{Sql} .= "M.".$temp_attr_name;
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DateTime' ) {
+                        $self->{Sql} .= "E.StartTime";
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Date' ) {
+                        $self->{Sql} .= "to_days( E.StartTime )";
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Time' ) {
+                        $self->{Sql} .= "extract( hour_second from E.StartTime )";
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Weekday' ) {
+                        $self->{Sql} .= "weekday( E.StartTime )";
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DiskPercent' ) {
+                        $self->{Sql} .= "zmDiskPercent";
+                        $self->{HasDiskPercent} = !undef;
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DiskBlocks' ) {
+                        $self->{Sql} .= "zmDiskBlocks";
+                        $self->{HasDiskBlocks} = !undef;
+                    } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'SystemLoad' ) {
+                        $self->{Sql} .= "zmSystemLoad";
+                        $self->{HasSystemLoad} = !undef;
+                    } else {
+                        $self->{Sql} .= "E.".$filter_expr->{terms}[$i]->{attr};
+                    }
+
+                    ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
+                    foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) ) {
+                        if ( $filter_expr->{terms}[$i]->{attr} =~ /^Monitor/ ) {
+                            $value = "'$temp_value'";
+                        } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Name'
+                                || $filter_expr->{terms}[$i]->{attr} eq 'Cause'
+                                || $filter_expr->{terms}[$i]->{attr} eq 'Notes'
+                        ) {
+                            $value = "'$temp_value'";
+                        } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DateTime' ) {
+                            $value = DateTimeToSQL( $temp_value );
+                            if ( !$value ) {
+                                Error( "Error parsing date/time '$temp_value', "
+                                      ."skipping filter '$self->{Name}'\n" );
+                                return;
+                            }
+                            $value = "'$value'";
+                        } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Date' ) {
+                            $value = DateTimeToSQL( $temp_value );
+                            if ( !$value ) {
+                                Error( "Error parsing date/time '$temp_value', "
+                                      ."skipping filter '$self->{Name}'\n" );
+                                return;
+                            }
+                            $value = "to_days( '$value' )";
+                        } elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Time' ) {
+                            $value = DateTimeToSQL( $temp_value );
+                            if ( !$value ) {
+                                Error( "Error parsing date/time '$temp_value', "
+                                      ."skipping filter '$self->{Name}'\n" );
+                                return;
+                            }
+                            $value = "extract( hour_second from '$value' )";
+                        } else {
+                            $value = $temp_value;
+                        }
+                        push( @value_list, $value );
+                    } # end foreach temp_value
+                } # end if has an attr
+                if ( $filter_expr->{terms}[$i]->{op} ) {
+                    if ( $filter_expr->{terms}[$i]->{op} eq '=~' ) {
+                        $self->{Sql} .= " regexp $value";
+                    } elsif ( $filter_expr->{terms}[$i]->{op} eq '!~' ) {
+                        $self->{Sql} .= " not regexp $value";
+                    } elsif ( $filter_expr->{terms}[$i]->{op} eq '=[]' ) {
+                        $self->{Sql} .= " in (".join( ",", @value_list ).")";
+                    } elsif ( $filter_expr->{terms}[$i]->{op} eq '!~' ) {
+                        $self->{Sql} .= " not in (".join( ",", @value_list ).")";
+                    } else {
+                        $self->{Sql} .= " ".$filter_expr->{terms}[$i]->{op}." $value";
+                    }
+                } # end if has an operator
+                if ( exists($filter_expr->{terms}[$i]->{cbr}) ) {
+                    $self->{Sql} .= " ".str_repeat( ")", $filter_expr->{terms}[$i]->{cbr} )." ";
+                }
+            } # end foreach term
+        } # end if terms
+
+        if ( $self->{Sql} )
+        {
+            if ( $self->{AutoMessage} )
+            {
+                # Include all events, including events that are still ongoing
+                # and have no EndTime yet
+                $sql .= " and ( ".$self->{Sql}." )";
+            }
+            else
+            {
+                # Only include closed events (events with valid EndTime)
+                $sql .= " where not isnull(E.EndTime) and ( ".$self->{Sql}." )";
+            }
+        }
+        my @auto_terms;
+        if ( $self->{AutoArchive} )
+        {
+            push( @auto_terms, "E.Archived = 0" )
+        }
+        if ( $self->{AutoVideo} )
+        {
+            push( @auto_terms, "E.Videoed = 0" )
+        }
+        if ( $self->{AutoUpload} )
+        {
+            push( @auto_terms, "E.Uploaded = 0" )
+        }
+        if ( $self->{AutoEmail} )
+        {
+            push( @auto_terms, "E.Emailed = 0" )
+        }
+        if ( $self->{AutoMessage} )
+        {
+            push( @auto_terms, "E.Messaged = 0" )
+        }
+        if ( $self->{AutoExecute} )
+        {
+            push( @auto_terms, "E.Executed = 0" )
+        }
+        if ( @auto_terms )
+        {
+            $sql .= " and ( ".join( " or ", @auto_terms )." )";
+        }
+        if ( !$filter_expr->{sort_field} )
+        {
+            $filter_expr->{sort_field} = 'StartTime';
+            $filter_expr->{sort_asc} = 0;
+        }
+        my $sort_column = '';
+        if ( $filter_expr->{sort_field} eq 'Id' )
+        {
+            $sort_column = "E.Id";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'MonitorName' )
+        {
+            $sort_column = "M.Name";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'Name' )
+        {
+            $sort_column = "E.Name";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'StartTime' )
+        {
+            $sort_column = "E.StartTime";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'Secs' )
+        {
+            $sort_column = "E.Length";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'Frames' )
+        {
+            $sort_column = "E.Frames";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'AlarmFrames' )
+        {
+            $sort_column = "E.AlarmFrames";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'TotScore' )
+        {
+            $sort_column = "E.TotScore";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'AvgScore' )
+        {
+            $sort_column = "E.AvgScore";
+        }
+        elsif ( $filter_expr->{sort_field} eq 'MaxScore' )
+        {
+            $sort_column = "E.MaxScore";
+        }
+        else
+        {
+            $sort_column = "E.StartTime";
+        }
+        my $sort_order = $filter_expr->{sort_asc}?"asc":"desc";
+        $sql .= " order by ".$sort_column." ".$sort_order;
+        if ( $filter_expr->{limit} )
+        {
+            $sql .= " limit 0,".$filter_expr->{limit};
+        }
+        Debug( "SQL:$sql\n" );
+        $self->{Sql} = $sql;
+	} # end if has Sql
+	return $self->{Sql};
+} # end sub Sql
+
+sub getDiskPercent
+{
+    my $command = "df .";
+    my $df = qx( $command );
+    my $space = -1;
+    if ( $df =~ /\s(\d+)%/ms )
+    {
+        $space = $1;
+    }
+    return( $space );
+}
+sub getDiskBlocks
+{
+    my $command = "df .";
+    my $df = qx( $command );
+    my $space = -1;
+    if ( $df =~ /\s(\d+)\s+\d+\s+\d+%/ms )
+    {
+        $space = $1;
+    }
+    return( $space );
+}
+sub getLoad
+{
+    my $command = "uptime .";
+    my $uptime = qx( $command );
+    my $load = -1;
+    if ( $uptime =~ /load average:\s+([\d.]+)/ms )
+    {
+        $load = $1;
+        Info( "Load: $load" );
+    }
+    return( $load );
+}
+
+#
+# More or less replicates the equivalent PHP function
+#
+sub strtotime
+{
+    my $dt_str = shift;
+    return( Date::Manip::UnixDate( $dt_str, '%s' ) );
+}
+
+#
+# More or less replicates the equivalent PHP function
+#
+sub str_repeat
+{
+    my $string = shift;
+    my $count = shift;
+    return( ${string}x${count} );
+}
+
+# Formats a date into MySQL format
+sub DateTimeToSQL
+{
+    my $dt_str = shift;
+    my $dt_val = strtotime( $dt_str );
+    if ( !$dt_val )
+    {
+        Error( "Unable to parse date string '$dt_str'\n" );
+        return( undef );
+    }
+    return( strftime( "%Y-%m-%d %H:%M:%S", localtime( $dt_val ) ) );
+}
+
+1;
+__END__
+# Below is stub documentation for your module. You'd better edit it!
+
+=head1 NAME
+
+ZoneMinder::Database - Perl extension for blah blah blah
+
+=head1 SYNOPSIS
+
+  use ZoneMinder::Filter;
+  blah blah blah
+
+=head1 DESCRIPTION
+
+Stub documentation for ZoneMinder, created by h2xs. It looks like the
+author of the extension was negligent enough to leave the stub
+unedited.
+
+Blah blah blah.
+
+=head2 EXPORT
+
+None by default.
+
+
+
+=head1 SEE ALSO
+
+Mention other useful documentation such as the documentation of
+related modules or operating system documentation (such as man pages
+in UNIX), or any relevant external documentation such as RFCs or
+standards.
+
+If you have a mailing list set up for your module, mention it here.
+
+If you have a web site set up for your module, mention it here.
+
+=head1 AUTHOR
+
+Philip Coombes, E<lt>philip.coombes@zoneminder.comE<gt>
+
+=head1 COPYRIGHT AND LICENSE
+
+Copyright (C) 2001-2008  Philip Coombes
+
+This library is free software; you can redistribute it and/or modify
+it under the same terms as Perl itself, either Perl version 5.8.3 or,
+at your option, any later version of Perl 5 you may have available.
+
+
+=cut
diff --git a/scripts/ZoneMinder/lib/ZoneMinder/General.pm b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
index 195bd265f..944781f6b 100644
--- a/scripts/ZoneMinder/lib/ZoneMinder/General.pm
+++ b/scripts/ZoneMinder/lib/ZoneMinder/General.pm
@@ -107,7 +107,6 @@ sub getCmdFormat
     my $suffix = "";
     my $command = $prefix.$null_command.$suffix;
     Debug( "Testing \"$command\"\n" );
-    $command .= " > /dev/null 2>&1"; 
     my $output = qx($command);
     my $status = $? >> 8;
     if ( !$status )
diff --git a/scripts/zmaudit.pl.in b/scripts/zmaudit.pl.in
index 1e01628b8..7f2df08b9 100644
--- a/scripts/zmaudit.pl.in
+++ b/scripts/zmaudit.pl.in
@@ -83,7 +83,7 @@ use constant EVENT_PATH => ($Config{ZM_DIR_EVENTS}=~m|/|)
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmcontrol.pl.in b/scripts/zmcontrol.pl.in
index aba1d1c36..9b34533f7 100644
--- a/scripts/zmcontrol.pl.in
+++ b/scripts/zmcontrol.pl.in
@@ -63,7 +63,7 @@ use constant MAX_COMMAND_WAIT => 1800;
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmdc.pl.in b/scripts/zmdc.pl.in
index b120e2846..36d5e922a 100644
--- a/scripts/zmdc.pl.in
+++ b/scripts/zmdc.pl.in
@@ -73,7 +73,7 @@ use constant SOCK_FILE => $Config{ZM_PATH_SOCKS}.'/zmdc.sock';
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
@@ -862,7 +862,7 @@ sub killAll
     my $killall;
     if ( '@HOST_OS@' eq 'BSD' )
     {
-        $killall = 'killall -';
+        $killall = 'killall -q -';
     } elsif ( '@HOST_OS@' eq 'solaris' ) {
         $killall = 'pkill -';
     } else {
diff --git a/scripts/zmfilter.pl.in b/scripts/zmfilter.pl.in
index 1db114d9d..a101edf3a 100755
--- a/scripts/zmfilter.pl.in
+++ b/scripts/zmfilter.pl.in
@@ -60,10 +60,11 @@ use constant START_DELAY => 5; # How long to wait before starting
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
+require ZoneMinder::Filter;
 use DBI;
 use POSIX;
 use Time::HiRes qw/gettimeofday/;
-use Date::Manip;
+#use Date::Manip;
 use Getopt::Long;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 use autouse 'Data::Dumper'=>qw(Dumper);
@@ -127,7 +128,7 @@ if ( $Config{ZM_OPT_MESSAGE} )
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
@@ -137,36 +138,6 @@ my $filter_parm = "";
 my $version = 0;
 
 #
-# More or less replicates the equivalent PHP function
-#
-sub strtotime
-{
-    my $dt_str = shift;
-    return( UnixDate( $dt_str, '%s' ) );
-}
-
-#
-# More or less replicates the equivalent PHP function
-#
-sub str_repeat
-{
-    my $string = shift;
-    my $count = shift;
-    return( ${string}x${count} );
-}
-
-# Formats a date into MySQL format
-sub DateTimeToSQL
-{
-    my $dt_str = shift;
-    my $dt_val = strtotime( $dt_str );
-    if ( !$dt_val )
-    {
-        Error( "Unable to parse date string '$dt_str'\n" );
-        return( undef );
-    }
-    return( strftime( "%Y-%m-%d %H:%M:%S", localtime( $dt_val ) ) );
-}
 
 GetOptions(
     'filter=s'      =>\$filter_parm,
@@ -225,43 +196,6 @@ while( 1 )
     sleep( $delay );
 }
 
-sub getDiskPercent
-{
-    my $command = "df .";
-    my $df = qx( $command );
-    my $space = -1;
-    if ( $df =~ /\s(\d+)%/ms )
-    {
-        $space = $1;
-    }
-    return( $space );
-}
-
-sub getDiskBlocks
-{
-    my $command = "df .";
-    my $df = qx( $command );
-    my $space = -1;
-    if ( $df =~ /\s(\d+)\s+\d+\s+\d+%/ms )
-    {
-        $space = $1;
-    }
-    return( $space );
-}
-
-sub getLoad
-{
-    my $command = "uptime .";
-    my $uptime = qx( $command );
-    my $load = -1;
-    if ( $uptime =~ /load average:\s+([\d.]+)/ms )
-    {
-        $load = $1;
-        Info( "Load: $load" );
-    }
-    return( $load );
-}
-
 sub getFilters
 {
     my $filter_name = shift;
@@ -299,309 +233,18 @@ sub getFilters
     }
     FILTER: while( my $db_filter = $sth->fetchrow_hashref() )
     {
+		my $filter = new ZoneMinder::Filter( $$db_filter{Id}, $db_filter );
         Debug( "Found filter '$db_filter->{Name}'\n" );
-        my $filter_expr = jsonDecode( $db_filter->{Query} );
-        my $sql = "SELECT E.Id,
-                          E.MonitorId,
-                          M.Name as MonitorName,
-                          M.DefaultRate,
-                          M.DefaultScale,
-                          E.Name,
-                          E.Cause,
-                          E.Notes,
-                          E.StartTime,
-                          unix_timestamp(E.StartTime) as Time,
-                          E.Length,
-                          E.Frames,
-                          E.AlarmFrames,
-                          E.TotScore,
-                          E.AvgScore,
-                          E.MaxScore,
-                          E.Archived,
-                          E.Videoed,
-                          E.Uploaded,
-                          E.Emailed,
-                          E.Messaged,
-                          E.Executed
-                   FROM Events as E
-                   INNER JOIN Monitors as M on M.Id = E.MonitorId
-        ";
-        $db_filter->{Sql} = '';
+		my $sql = $filter->Sql();
 
-        if ( $filter_expr->{terms} )
-        {
-            for ( my $i = 0; $i < @{$filter_expr->{terms}}; $i++ )
-            {
-                if ( exists($filter_expr->{terms}[$i]->{cnj}) )
-                {
-                    $db_filter->{Sql} .= " ".$filter_expr->{terms}[$i]->{cnj}." ";
-                }
-                if ( exists($filter_expr->{terms}[$i]->{obr}) )
-                {
-                    $db_filter->{Sql} .= " ".str_repeat( "(", $filter_expr->{terms}[$i]->{obr} )." ";
-                }
-                my $value = $filter_expr->{terms}[$i]->{val};
-                my @value_list;
-                if ( $filter_expr->{terms}[$i]->{attr} )
-                {
-                    if ( $filter_expr->{terms}[$i]->{attr} =~ /^Monitor/ )
-                    {
-                        my ( $temp_attr_name ) = $filter_expr->{terms}[$i]->{attr} =~ /^Monitor(.+)$/;
-                        $db_filter->{Sql} .= "M.".$temp_attr_name;
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' )
-                    {
-                        $db_filter->{Sql} .= "M.ServerId";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DateTime' )
-                    {
-                        $db_filter->{Sql} .= "E.StartTime";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Date' )
-                    {
-                        $db_filter->{Sql} .= "to_days( E.StartTime )";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Time' )
-                    {
-                        $db_filter->{Sql} .= "extract( hour_second from E.StartTime )";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Weekday' )
-                    {
-                        $db_filter->{Sql} .= "weekday( E.StartTime )";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DiskPercent' )
-                    {
-                        $db_filter->{Sql} .= "zmDiskPercent";
-                        $db_filter->{HasDiskPercent} = !undef;
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DiskBlocks' )
-                    {
-                        $db_filter->{Sql} .= "zmDiskBlocks";
-                        $db_filter->{HasDiskBlocks} = !undef;
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{attr} eq 'SystemLoad' )
-                    {
-                        $db_filter->{Sql} .= "zmSystemLoad";
-                        $db_filter->{HasSystemLoad} = !undef;
-                    }
-                    else
-                    {
-                        $db_filter->{Sql} .= "E.".$filter_expr->{terms}[$i]->{attr};
-                    }
-
-                    ( my $stripped_value = $value ) =~ s/^["\']+?(.+)["\']+?$/$1/;
-                    foreach my $temp_value ( split( /["'\s]*?,["'\s]*?/, $stripped_value ) )
-                    {
-                        if ( $filter_expr->{terms}[$i]->{attr} =~ /^Monitor/ )
-                        {
-                            $value = "'$temp_value'";
-                        }
-                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'ServerId' ) {
-                            if ( $temp_value eq 'ZM_SERVER_ID' ) {
-                                $value = "'$Config{ZM_SERVER_ID}'";
-                            } else {
-                                $value = "'$temp_value'";
-                            }
-                        }
-                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Name'
-                                || $filter_expr->{terms}[$i]->{attr} eq 'Cause'
-                                || $filter_expr->{terms}[$i]->{attr} eq 'Notes'
-                        )
-                        {
-                            $value = "'$temp_value'";
-                        }
-                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'DateTime' )
-                        {
-                            $value = DateTimeToSQL( $temp_value );
-                            if ( !$value )
-                            {
-                                Error( "Error parsing date/time '$temp_value', "
-                                      ."skipping filter '$db_filter->{Name}'\n" );
-                                next FILTER;
-                            }
-                            $value = "'$value'";
-                        }
-                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Date' )
-                        {
-                            $value = DateTimeToSQL( $temp_value );
-                            if ( !$value )
-                            {
-                                Error( "Error parsing date/time '$temp_value', "
-                                      ."skipping filter '$db_filter->{Name}'\n" );
-                                next FILTER;
-                            }
-                            $value = "to_days( '$value' )";
-                        }
-                        elsif ( $filter_expr->{terms}[$i]->{attr} eq 'Time' )
-                        {
-                            $value = DateTimeToSQL( $temp_value );
-                            if ( !$value )
-                            {
-                                Error( "Error parsing date/time '$temp_value', "
-                                      ."skipping filter '$db_filter->{Name}'\n" );
-                                next FILTER;
-                            }
-                            $value = "extract( hour_second from '$value' )";
-                        }
-                        else
-                        {
-                            $value = $temp_value;
-                        }
-                        push( @value_list, $value );
-                    }
-                }
-                if ( $filter_expr->{terms}[$i]->{op} )
-                {
-                    if ( $filter_expr->{terms}[$i]->{op} eq '=~' )
-                    {
-                        $db_filter->{Sql} .= " regexp $value";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{op} eq '!~' )
-                    {
-                        $db_filter->{Sql} .= " not regexp $value";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{op} eq '=[]' )
-                    {
-                        $db_filter->{Sql} .= " in (".join( ",", @value_list ).")";
-                    }
-                    elsif ( $filter_expr->{terms}[$i]->{op} eq '!~' )
-                    {
-                        $db_filter->{Sql} .= " not in (".join( ",", @value_list ).")";
-                    }
-                    else
-                    {
-                        $db_filter->{Sql} .= " ".$filter_expr->{terms}[$i]->{op}." $value";
-                    }
-                }
-                if ( exists($filter_expr->{terms}[$i]->{cbr}) )
-                {
-                    $db_filter->{Sql} .= " ".str_repeat( ")", $filter_expr->{terms}[$i]->{cbr} )." ";
-                }
-            }
-        }
-        if ( $db_filter->{Sql} )
-        {
-            if ( $db_filter->{AutoMessage} )
-            {
-                # Include all events, including events that are still ongoing
-                # and have no EndTime yet
-                $sql .= " and ( ".$db_filter->{Sql}." )";
-            }
-            else
-            {
-                # Only include closed events (events with valid EndTime)
-                $sql .= " where not isnull(E.EndTime) and ( ".$db_filter->{Sql}." )";
-            }
-        }
-        my @auto_terms;
-        if ( $db_filter->{AutoArchive} )
-        {
-            push( @auto_terms, "E.Archived = 0" )
-        }
-        if ( $db_filter->{AutoVideo} )
-        {
-            push( @auto_terms, "E.Videoed = 0" )
-        }
-        if ( $db_filter->{AutoUpload} )
-        {
-            push( @auto_terms, "E.Uploaded = 0" )
-        }
-        if ( $db_filter->{AutoEmail} )
-        {
-            push( @auto_terms, "E.Emailed = 0" )
-        }
-        if ( $db_filter->{AutoMessage} )
-        {
-            push( @auto_terms, "E.Messaged = 0" )
-        }
-        if ( $db_filter->{AutoExecute} )
-        {
-            push( @auto_terms, "E.Executed = 0" )
-        }
-        if ( @auto_terms )
-        {
-            $sql .= " and ( ".join( " or ", @auto_terms )." )";
-        }
-        if ( !$filter_expr->{sort_field} )
-        {
-            $filter_expr->{sort_field} = 'StartTime';
-            $filter_expr->{sort_asc} = 0;
-        }
-        my $sort_column = '';
-        if ( $filter_expr->{sort_field} eq 'Id' )
-        {
-            $sort_column = "E.Id";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'MonitorName' )
-        {
-            $sort_column = "M.Name";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'Name' )
-        {
-            $sort_column = "E.Name";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'StartTime' )
-        {
-            $sort_column = "E.StartTime";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'Secs' )
-        {
-            $sort_column = "E.Length";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'Frames' )
-        {
-            $sort_column = "E.Frames";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'AlarmFrames' )
-        {
-            $sort_column = "E.AlarmFrames";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'TotScore' )
-        {
-            $sort_column = "E.TotScore";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'AvgScore' )
-        {
-            $sort_column = "E.AvgScore";
-        }
-        elsif ( $filter_expr->{sort_field} eq 'MaxScore' )
-        {
-            $sort_column = "E.MaxScore";
-        }
-        else
-        {
-            $sort_column = "E.StartTime";
-        }
-        my $sort_order = $filter_expr->{sort_asc}?"asc":"desc";
-        $sql .= " order by ".$sort_column." ".$sort_order;
-        if ( $filter_expr->{limit} )
-        {
-            $sql .= " limit 0,".$filter_expr->{limit};
-        }
-        Debug( "SQL:$sql\n" );
-        $db_filter->{Sql} = $sql;
-        if ( $db_filter->{AutoExecute} )
-        {
-            my $script = $db_filter->{AutoExecuteCmd};
-            $script =~ s/\s.*$//;
-            if ( !-e $script )
-            {
-                Error( "Auto execute script '$script' not found, "
-                      ."skipping filter '$db_filter->{Name}'\n" );
-                next FILTER;
-
-            }
-            elsif ( !-x $script )
-            {
-                Error( "Auto execute script '$script' not executable, "
-                      ."skipping filter '$db_filter->{Name}'\n" );
-                next FILTER;
-            }
-        }
-        push( @filters, $db_filter );
+		if ( ! $sql ) {
+			Error( "Error parsing Sql. skipping filter '$db_filter->{Name}'\n" );
+			next FILTER;
+		}
+		push( @filters, $filter );
     }
     $sth->finish();
-
+	Debug( "Got " . @filters . " filters" );
     return( \@filters );
 }
 
@@ -619,37 +262,11 @@ sub checkFilter
         ($filter->{AutoExecute}?", execute":"").
         "\n"
     );
-    my $sql = $filter->{Sql};
 
-    if ( $filter->{HasDiskPercent} )
-    {
-        my $disk_percent = getDiskPercent();
-        $sql =~ s/zmDiskPercent/$disk_percent/g;
-    }
-    if ( $filter->{HasDiskBlocks} )
-    {
-        my $disk_blocks = getDiskBlocks();
-        $sql =~ s/zmDiskBlocks/$disk_blocks/g;
-    }
-    if ( $filter->{HasSystemLoad} )
-    {
-        my $load = getLoad();
-        $sql =~ s/zmSystemLoad/$load/g;
-    }
-
-    my $sth = $dbh->prepare_cached( $sql )
-        or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-    my $res = $sth->execute();
-    if ( !$res )
-    {
-        Error( "Can't execute filter '$sql', ignoring: ".$sth->errstr() );
-        return;
-    }
-
-    while( my $event = $sth->fetchrow_hashref() )
-    {
+	foreach my $event ( $filter->Execute() ) {
         Debug( "Checking event $event->{Id}\n" );
         my $delete_ok = !undef;
+$dbh->ping();
         if ( $filter->{AutoArchive} )
         {
             Info( "Archiving event $event->{Id}\n" );
@@ -658,7 +275,7 @@ sub checkFilter
             my $sth = $dbh->prepare_cached( $sql )
                 or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
             my $res = $sth->execute( $event->{Id} )
-                or Fatal( "Can't execute '$sql': ".$sth->errstr() );
+                or Error( "Can't execute '$sql': ".$sth->errstr() );
         }
         if ( $Config{ZM_OPT_FFMPEG} && $filter->{AutoVideo} )
         {
@@ -730,7 +347,6 @@ sub checkFilter
             }
         }
     }
-    $sth->finish();
 }
 
 sub generateVideo
@@ -935,10 +551,12 @@ sub uploadArchFile
                 if $Config{ZM_UPLOAD_PORT};
             $sftpOptions{timeout} = $Config{ZM_UPLOAD_TIMEOUT}
                 if $Config{ZM_UPLOAD_TIMEOUT};
-            $sftpOptions{more} = [ '-o'=>'StrictHostKeyChecking=no' ]
+            my @more_ssh_args;
+            push @more_ssh_args, ['-o'=>'StrictHostKeyChecking=no']
 				if ! $Config{ZM_UPLOAD_STRICT};
-            $Net::SFTP::Foreign::debug = -1
+            push @more_ssh_args, ['-v']
                 if $Config{ZM_UPLOAD_DEBUG};
+            $sftpOptions{more} = [@more_ssh_args];
             my $sftp = Net::SFTP::Foreign->new( $Config{ZM_UPLOAD_HOST}, %sftpOptions );
             if ( $sftp->error )
             {
@@ -1177,9 +795,31 @@ sub sendEmail
                     Disposition => "attachment"
                 );
             }
+            if ( $Config{ZM_SSMTP_MAIL} ){
+
+                my $ssmtp_location = $Config{ZM_SSMTP_PATH};
+
+                if( ! $ssmtp_location ){
+
+                	$ssmtp_location = qx('which ssmtp');
+					
+					if ( logDebugging() )
+   					{			
+				        Debug( "which ssmtp: $ssmtp_location - set ssmtp path in options to suppress this message\n" );
+				    }
+
+                }
+
+                $mail->send( 'sendmail', $ssmtp_location, $Config{ZM_EMAIL_ADDRESS} );
+
+            }else{
+
+                MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
+                $mail->send();
+            }
             ### Send the Message
-            MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
-            $mail->send();
+            #MIME::Lite->send( "smtp", $Config{ZM_EMAIL_HOST}, Timeout=>60 );
+            #$mail->send();
         }
         else
         {
diff --git a/scripts/zmpkg.pl.in b/scripts/zmpkg.pl.in
index 53e29a8da..57708c62a 100644
--- a/scripts/zmpkg.pl.in
+++ b/scripts/zmpkg.pl.in
@@ -52,7 +52,7 @@ use Time::HiRes qw/gettimeofday/;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 
 # Detaint our environment
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 my $store_state=""; # PP - will remember state name passed
diff --git a/scripts/zmtelemetry.pl.in b/scripts/zmtelemetry.pl.in
index a5c2e00a3..c7bf4a3f3 100644
--- a/scripts/zmtelemetry.pl.in
+++ b/scripts/zmtelemetry.pl.in
@@ -76,7 +76,7 @@ if ( $Config{ZM_TELEMETRY_DATA} )
     while( 1 ) {
         my $now = time();
         if ( ($now-$lastCheck) > CHECK_INTERVAL ) {
-            Info( "Colleting data to send to ZoneMinder Telemetry server." );
+            Info( "Collecting data to send to ZoneMinder Telemetry server." );
             my $dbh = zmDbConnect();
             # Build the telemetry hash
             # We should keep *BSD systems in mind when calling system commands
diff --git a/scripts/zmtrack.pl.in b/scripts/zmtrack.pl.in
index b1eec2d7e..cd00e809d 100644
--- a/scripts/zmtrack.pl.in
+++ b/scripts/zmtrack.pl.in
@@ -68,7 +68,7 @@ use Time::HiRes qw( usleep );
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmtrigger.pl.in b/scripts/zmtrigger.pl.in
index 222e42f79..2f180e090 100644
--- a/scripts/zmtrigger.pl.in
+++ b/scripts/zmtrigger.pl.in
@@ -54,14 +54,15 @@ B<id>|B<action>|B<score>|B<cause>|B<text>|B<showtext>
   Valid actions are 'on', 'off', 'cancel' or 'show' where
   'on' forces an alarm condition on;
   'off' forces an alarm condition off;
-  'cancel' negates the previous 'on' or 'off'.
-
-  The 'show' action merely updates some auxiliary text which can optionally
-  be displayed in the images captured by the monitor. Ordinarily you would
-  use 'on' and 'cancel', 'off' would tend to be used to suppress motion
-  based events. Additionally 'on' and 'off' can take an additional time
-  offset, e.g. on+20 which automatically 'cancel's the previous action
-  after that number of seconds.
+  'cancel' negates the previous 'on' or 'off';
+  'show' updates the auxiliary text represented by the %Q 
+  placeholder, which can optionally be added to the affected monitor's
+  timestamp label format.
+  
+  Ordinarily you would use 'on' and 'cancel', 'off' would tend to be
+  used to suppress motion based events. Additionally 'on' and 'off' can
+  take an additional time offset, e.g. on+20 which automatically
+  cancel's the previous action after that number of seconds.
 
 =item B<score>
 
@@ -166,7 +167,7 @@ use Time::HiRes qw( usleep );
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmvideo.pl.in b/scripts/zmvideo.pl.in
index 725477c15..754213af6 100644
--- a/scripts/zmvideo.pl.in
+++ b/scripts/zmvideo.pl.in
@@ -27,7 +27,7 @@ zmvideo.pl - ZoneMinder Video Creation Script
 
 =head1 SYNOPSIS
 
- zmvideo.pl -e <event_id>,--event=<event_id> [--format <format>]
+ zmvideo.pl [ -e <event_id>,--event=<event_id> | --filter=<filter name> ] [--format <format>]
                                              [--rate=<rate>]
                                              [--scale=<scale>]
                                              [--fps=<fps>]
@@ -40,15 +40,18 @@ This script is used to create MPEG videos of events for the web pages
 or as email attachments.
 
 =head1 OPTIONS
-
- -e<event_id>, --event=<event_id>  - What event to create the video for
- -f<format>, --format=<format>     - What format to create the video in, default is mpg. For ffmpeg only.
- -r<rate>, --rate=<rate>           - Relative rate, 1 = realtime, 2 = double speed, 0.5 = half speed etc.
- -s<scale>, --scale=<scale>        - Scale, 1 = normal, 2 = double size, 0.5 = half size etc.
- -F<fps>, --fps=<fps>              - Absolute frame rate, in frames per second
- -S<size>, --size=<size>           - Absolute video size, WxH or other specification supported by ffmpeg
- -o, --overwrite                   - Whether to overwrite an existing file, off by default.
- -v, --version                     - Outputs the currently installed version of ZoneMinder
+ -c[=filename], --concat[=filename] - When creating videos for multiple events, create a concatenated video as well.
+                                    - If not specified, filename is taken from filter name.
+ -e<event_id>, --event=<event_id>   - What event to create the video for
+ --filter_name=<filter name>        - The name of a saved filter to generate a video for all events returned by it.
+ --filter_id=<filter id>            - The id of a saved filter to generate a video for all events returned by it.
+ -f<format>, --format=<format>      - What format to create the video in, default is mpg. For ffmpeg only.
+ -r<rate>, --rate=<rate>            - Relative rate, 1 = realtime, 2 = double speed, 0.5 = half speed etc.
+ -s<scale>, --scale=<scale>         - Scale, 1 = normal, 2 = double size, 0.5 = half size etc.
+ -F<fps>, --fps=<fps>               - Absolute frame rate, in frames per second
+ -S<size>, --size=<size>            - Absolute video size, WxH or other specification supported by ffmpeg
+ -o, --overwrite                    - Whether to overwrite an existing file, off by default.
+ -v, --version                      - Outputs the currently installed version of ZoneMinder
 
 =cut
 use strict;
@@ -62,21 +65,27 @@ use bytes;
 
 @EXTRA_PERL_LIB@
 use ZoneMinder;
+require ZoneMinder::Filter;
+require ZoneMinder::Event;
 use DBI;
 use autouse 'Data::Dumper'=>qw(Dumper);
 use POSIX qw(strftime);
 use Getopt::Long qw(:config no_ignore_case );
+use Cwd;
 use autouse 'Pod::Usage'=>qw(pod2usage);
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
 logInit();
 
 my $event_id;
+my $concat_name;
+my $filter_name;
+my $filter_id;
 my $format = 'mpg';
 my $rate = '';
 my $scale = '';
@@ -95,7 +104,10 @@ for ( my $i = 0; $i < @formats; $i++ )
 }
 
 GetOptions(
-    'event=i'       =>\$event_id,
+	'concat|c:s'	=>\$concat_name,
+    'event|e=i'     =>\$event_id,
+    'filter_name=s'	=>\$filter_name,
+    'filter_id=i'	=>\$filter_id,
     'format|f=s'    =>\$format,
     'rate|r=f'      =>\$rate,
     'scale|s=f'     =>\$scale,
@@ -110,9 +122,9 @@ if ( $version ) {
     exit(0);
 }
 
-if ( !$event_id || $event_id < 0 )
+if ( !( $filter_id or $filter_name or $event_id ) || $event_id < 0 )
 {
-    print( STDERR "Please give a valid event id\n" );
+    print( STDERR "Please give a valid event id or filter name\n" );
     pod2usage(-exitstatus => -1);
 }
 
@@ -164,128 +176,86 @@ $size = $detaint_size;
 
 my $dbh = zmDbConnect();
 
-my @filters;
+my $cwd = getcwd;
+
+my $video_name;
+my @event_ids;
+if ( $event_id ) {
+	@event_ids = ( $event_id );
+	
+} elsif ( $filter_name or $filter_id ) {
+	my $Filter = ZoneMinder::Filter->find_one( 
+		($filter_name ? ( Name => $filter_name ) : () ),
+		($filter_id ? ( Id => $filter_name ) : () ),
+		);
+	if ( ! $Filter ) {
+		Fatal("Filter $filter_name $filter_id not found.");	
+	}	
+	@event_ids = map { $_->{Id} }$Filter->Execute();	
+	Fatal( "No events found for $filter_name") if ! @event_ids;
+	$concat_name = $filter_name if $concat_name eq '';
+}
+
 my $sql = " SELECT max(F.Delta)-min(F.Delta) as FullLength,
-                   E.*,
-                   unix_timestamp(E.StartTime) as Time,
-                   M.Name as MonitorName,
-                   M.Width as MonitorWidth,
-                   M.Height as MonitorHeight,
-                   M.Palette
-            FROM Frames as F
-            INNER JOIN Events as E on F.EventId = E.Id
-            INNER JOIN Monitors as M on E.MonitorId = M.Id
-            WHERE EventId = '$event_id'
-            GROUP BY F.EventId"
-;
-my $sth = $dbh->prepare_cached( $sql )
-    or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
-my $res = $sth->execute()
-    or Fatal( "Can't execute: ".$sth->errstr() );
-my $event = $sth->fetchrow_hashref();
-$sth->finish();
-my $event_path = getEventPath( $event );
-chdir( $event_path );
-( my $video_name = $event->{Name} ) =~ s/\s/_/g; 
+   E.*,
+   unix_timestamp(E.StartTime) as Time,
+   M.Name as MonitorName,
+   M.Width as MonitorWidth,
+   M.Height as MonitorHeight,
+   M.Palette
+   FROM Frames as F
+   INNER JOIN Events as E on F.EventId = E.Id
+   INNER JOIN Monitors as M on E.MonitorId = M.Id
+   WHERE EventId = ?
+   GROUP BY F.EventId"
+   ;
+my $sth = $dbh->prepare_cached( $sql ) or Fatal( "Can't prepare '$sql': ".$dbh->errstr() );
 
-my @file_parts;
-if ( $rate )
-{
-    my $file_rate = $rate;
-    $file_rate =~ s/\./_/;
-    $file_rate =~ s/_00//;
-    $file_rate =~ s/(_\d+)0+$/$1/;
-    $file_rate = 'r'.$file_rate;
-    push( @file_parts, $file_rate );
-}
-elsif ( $fps )
-{
-    my $file_fps = $fps;
-    $file_fps =~ s/\./_/;
-    $file_fps =~ s/_00//;
-    $file_fps =~ s/(_\d+)0+$/$1/;
-    $file_fps = 'R'.$file_fps;
-    push( @file_parts, $file_fps );
-}
-
-if ( $scale )
-{
-    my $file_scale = $scale;
-    $file_scale =~ s/\./_/;
-    $file_scale =~ s/_00//;
-    $file_scale =~ s/(_\d+)0+$/$1/;
-    $file_scale = 's'.$file_scale;
-    push( @file_parts, $file_scale );
-}
-elsif ( $size )
-{
-    my $file_size = 'S'.$size;
-    push( @file_parts, $file_size );
-}
-my $video_file = "$video_name-".$file_parts[0]."-".$file_parts[1].".$format";
-
-if ( $overwrite || !-s $video_file )
-{
-    Info( "Creating video file $video_file for event $event->{Id}\n" );
-
-    my $frame_rate = sprintf( "%.2f", $event->{Frames}/$event->{FullLength} );
-    if ( $rate )
-    {
-        if ( $rate != 1.0 )
-        {
-            $frame_rate *= $rate;
-        }
-    }
-    elsif ( $fps )
-    {
-        $frame_rate = $fps;
-    }
-
-    my $width = $event->{MonitorWidth};
-    my $height = $event->{MonitorHeight};
-    my $video_size = " ${width}x${height}";
-
-    if ( $scale )
-    {
-        if ( $scale != 1.0 )
-        {
-            $width = int($width*$scale);
-            $height = int($height*$scale);
-            $video_size = " ${width}x${height}";
-        }
-    }
-    elsif ( $size )
-    {
-        $video_size = $size;
-    }
-
-    my $command = $Config{ZM_PATH_FFMPEG}
-                 ." -y -r $frame_rate "
-                 .$Config{ZM_FFMPEG_INPUT_OPTIONS}
-                 ." -i %0"
-                 .$Config{ZM_EVENT_IMAGE_DIGITS}
-                 ."d-capture.jpg -s $video_size "
-                 .$Config{ZM_FFMPEG_OUTPUT_OPTIONS}
-                 ." '$video_file' > ffmpeg.log 2>&1"
-    ;
-    Debug( $command."\n" );
-    my $output = qx($command);
-
-    my $status = $? >> 8;
-    if ( $status )
-    {
-        Error( "Unable to generate video, check "
-               .$event_path."/ffmpeg.log for details"
-        );
-        exit( -1 );
-    }
-    
-    Info( "Finished $video_file\n" );
-}
-else
-{
-    Info( "Video file $video_file already exists for event $event->{Id}\n" );
+my @video_files;
+foreach my $event_id ( @event_ids ) {
+
+	my $res = $sth->execute( $event_id )
+		or Fatal( "Can't execute: ".$sth->errstr() );
+	my $event = $sth->fetchrow_hashref();
+
+	my $Event = new ZoneMinder::Event( $$event{Id}, $event );
+	my $video_file = $Event->GenerateVideo( $rate, $fps, $scale,  $size, $overwrite, $format );
+	if ( $video_file ) {
+		push @video_files, $video_file;
+	}
+} # end foreach event_id
+
+if ( $concat_name ) {
+	($cwd) = $cwd =~ /(.*)/; # detaint
+	chdir( $cwd );
+	($concat_name ) = $concat_name =~ /([\-A-Za-z0-9_\.]*)/;
+	my $concat_list_file = "/tmp/$concat_name.concat.lst";
+
+	my $video_file = $concat_name . '.'. $detaint_format;
+
+	open( my $fd, '>', $concat_list_file ) or die "Can't open $concat_list_file: $!";
+	foreach ( @video_files ) {
+		print $fd "file '$_'\n";
+	}
+	close $fd;
+	my $command = $Config{ZM_PATH_FFMPEG}
+	. " -f concat -i $concat_list_file -c copy "
+		." '$video_file' > ffmpeg.log 2>&1"
+		;
+	Debug( $command."\n" );
+	my $output = qx($command);
+
+	my $status = $? >> 8;
+
+	unlink $concat_list_file;
+	if ( $status )
+	{
+		Error( "Unable to generate video, check /ffmpeg.log for details");
+		exit(-1);
+	}
+	
 }
+#unlink $input_file_list;
 #print( STDOUT $event->{MonitorId}.'/'.$event->{Id}.'/'.$video_file."\n" );
-print( STDOUT $event_path . '/' . $video_file ."\n" );
+#print( STDOUT $video_file."\n" );
 exit( 0 );
diff --git a/scripts/zmwatch.pl.in b/scripts/zmwatch.pl.in
index 5e0767487..4e2ff927c 100644
--- a/scripts/zmwatch.pl.in
+++ b/scripts/zmwatch.pl.in
@@ -61,7 +61,7 @@ use autouse 'Data::Dumper'=>qw(Dumper);
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/scripts/zmx10.pl.in b/scripts/zmx10.pl.in
index d25e74c8a..8daa63c87 100644
--- a/scripts/zmx10.pl.in
+++ b/scripts/zmx10.pl.in
@@ -71,7 +71,7 @@ use constant SOCK_FILE => $Config{ZM_PATH_SOCKS}.'/zmx10.sock';
 
 $| = 1;
 
-$ENV{PATH}  = '/bin:/usr/bin';
+$ENV{PATH}  = '/bin:/usr/bin:/usr/local/bin';
 $ENV{SHELL} = '/bin/sh' if exists $ENV{SHELL};
 delete @ENV{qw(IFS CDPATH ENV BASH_ENV)};
 
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 21844e12f..90fd4da6c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -14,21 +14,19 @@ add_executable(zma zma.cpp)
 add_executable(zmu zmu.cpp)
 add_executable(zmf zmf.cpp)
 add_executable(zms zms.cpp)
-add_executable(zmstreamer zmstreamer.cpp)
 
 target_link_libraries(zmc zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zma zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmu zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zmf zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 target_link_libraries(zms zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
-target_link_libraries(zmstreamer zm ${ZM_EXTRA_LIBS} ${ZM_BIN_LIBS})
 
 # Generate man files for the binaries destined for the bin folder
-FOREACH(CBINARY zma zmc zmf zmu zmstreamer)
+FOREACH(CBINARY zma zmc zmf zmu)
     POD2MAN(${CMAKE_CURRENT_SOURCE_DIR}/${CBINARY}.cpp zoneminder-${CBINARY} 8)
-ENDFOREACH(CBINARY zma zmc zmf zmu zmstreamer)
+ENDFOREACH(CBINARY zma zmc zmf zmu)
 
-install(TARGETS zmc zma zmu zmf zmstreamer RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+install(TARGETS zmc zma zmu zmf RUNTIME DESTINATION "${CMAKE_INSTALL_FULL_BINDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(TARGETS zms RUNTIME DESTINATION "${ZM_CGIDIR}" PERMISSIONS OWNER_WRITE OWNER_READ OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
 install(CODE "execute_process(COMMAND ln -sf zms nph-zms WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})" )
 install(FILES ${CMAKE_CURRENT_BINARY_DIR}/nph-zms DESTINATION "${ZM_CGIDIR}")
diff --git a/src/Makefile.am b/src/Makefile.am
deleted file mode 100644
index aad3deb23..000000000
--- a/src/Makefile.am
+++ /dev/null
@@ -1,139 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-AM_CPPFLAGS = @MYSQL_CFLAGS@ @MARIADB_CFLAGS@ @FFMPEG_CFLAGS@ -Wall -finline-functions -fomit-frame-pointer
-#AM_CXXFLAGS = -frepo
-
-CLEANFILES = *.rpo
-
-# This should be set to your CGI directory
-cgidir = @CGI_PREFIX@
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-
-bin_PROGRAMS = \
-	zmc \
-	zma \
-	zmu \
-	zms \
-	zmf \
-	zmstreamer
-
-zm_SOURCES = \
-	zm_box.cpp \
-	zm_buffer.cpp \
-	zm_camera.cpp \
-	zm_comms.cpp \
-	zm_config.cpp \
-	zm_coord.cpp \
-	zm_curl_camera.cpp \
-	zm.cpp \
-	zm_db.cpp \
-	zm_logger.cpp \
-	zm_event.cpp \
-	zm_exception.cpp \
-	zm_file_camera.cpp \
-	zm_ffmpeg_camera.cpp \
-	zm_image.cpp \
-	zm_jpeg.cpp \
-    zm_libvlc_camera.cpp \
-	zm_local_camera.cpp \
-	zm_monitor.cpp \
-	zm_ffmpeg.cpp \
-	zm_mpeg.cpp \
-	zm_poly.cpp \
-	zm_regexp.cpp \
-	zm_remote_camera.cpp \
-	zm_remote_camera_http.cpp \
-	zm_remote_camera_rtsp.cpp \
-	zm_rtp.cpp \
-	zm_rtp_ctrl.cpp \
-	zm_rtp_data.cpp \
-	zm_rtp_source.cpp \
-	zm_rtsp.cpp \
-	zm_rtsp_auth.cpp \
-	zm_sdp.cpp \
-	zm_signal.cpp \
-	zm_stream.cpp \
-	zm_thread.cpp \
-	zm_time.cpp \
-	zm_timer.cpp \
-	zm_user.cpp \
-	zm_utils.cpp \
-	zm_video.cpp \
-	zm_videostore.cpp \
-	zm_zone.cpp
-
-zmc_SOURCES = zmc.cpp $(zm_SOURCES)
-zma_SOURCES = zma.cpp $(zm_SOURCES)
-zms_SOURCES = zms.cpp $(zm_SOURCES)
-zmu_SOURCES = zmu.cpp $(zm_SOURCES)
-zmf_SOURCES = zmf.cpp $(zm_SOURCES)
-zmstreamer_SOURCES = zmstreamer.cpp $(zm_SOURCES)
-
-noinst_HEADERS = \
-	jinclude.h \
-	zm_box.h \
-	zm_buffer.h \
-	zm_camera.h \
-	zm_comms.h \
-	zm_config_defines.h \
-	zm_config.h \
-	zm_coord.h \
-	zm_curl_camera.h \
-	zm_db.h \
-	zm_logger.h \
-	zm_event.h \
-	zm_exception.h \
-	zmf.h \
-	zm_file_camera.h \
-	zm_ffmpeg_camera.h \
-	zm_font.h \
-	zm_font.h \
-	zm.h \
-	zm_image.h \
-	zm_jpeg.h \
-    zm_libvlc_camera.h \
-	zm_local_camera.h \
-	zm_mem_utils.h \
-	zm_monitor.h \
-	zm_ffmpeg.h \
-	zm_mpeg.h \
-	zm_poly.h \
-	zm_regexp.h \
-	zm_remote_camera.h \
-	zm_remote_camera_http.h \
-	zm_remote_camera_rtsp.h \
-	zm_rgb.h \
-	zm_rtp_ctrl.h \
-	zm_rtp_data.h \
-	zm_rtp.h \
-	zm_rtp_source.h \
-	zm_rtsp.h \
-	zm_sdp.h \
-	zm_signal.h \
-	zm_stream.h \
-	zm_thread.h \
-	zm_time.h \
-	zm_timer.h \
-	zm_user.h \
-	zm_utils.h \
-	zm_video.h \
-	zm_videostore.h \
-	zm_zone.h
-
-EXTRA_DIST = \
-	zm_config.h.in \
-	zm_threaddata.cpp
-
-dist-hook:
-	@( rm $(distdir)/zm_config.h )
-
-# Yes, you are correct. This is a HACK!
-install-exec-hook:
-	( cd $(DESTDIR)@bindir@; mkdir -p $(DESTDIR)$(cgidir); mv zms $(DESTDIR)$(cgidir) )
-	( cd $(DESTDIR)$(cgidir); chown $(webuser):$(webgroup) zms; ln -f zms nph-zms )
-
-uninstall-hook:
-	( cd $(DESTDIR)$(cgidir); rm -f zms nph-zms )
-
diff --git a/src/zm.h b/src/zm.h
index a60ab655d..0c780b244 100644
--- a/src/zm.h
+++ b/src/zm.h
@@ -26,8 +26,8 @@
 
 #include "zm_config.h"
 #ifdef SOLARIS
-#undef DEFAULT_TYPE    // pthread defines this which breaks StreamType DEFAULT_TYPE
-#include <string.h>    // define strerror() and friends
+#undef DEFAULT_TYPE  // pthread defines this which breaks StreamType DEFAULT_TYPE
+#include <string.h>  // define strerror() and friends
 #endif
 #include "zm_logger.h"
 
diff --git a/src/zm_bigfont.h b/src/zm_bigfont.h
index b653a7f4f..96ba479dd 100644
--- a/src/zm_bigfont.h
+++ b/src/zm_bigfont.h
@@ -1,6155 +1,6155 @@
 /***********************************************************/
-/*                                                         */
-/*       Font file generated by schrorg                    */
-/*       based on the font file generated by rthelen       */
-/*       using utils/mk_bigfont.pl                         */
-/*                                                         */
+/*                             */
+/*     Font file generated by schrorg          */
+/*     based on the font file generated by rthelen     */
+/*     using utils/mk_bigfont.pl             */
+/*                             */
 /***********************************************************/
 
 static unsigned int bigfontdata[] = {
 
-	/* 0 0x00 '^A' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 1 0x01 '^B' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 2 0x02 '^C' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 3 0x03 '^D' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 4 0x04 '^E' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 5 0x05 '^F' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 6 0x06 '^G' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 7 0x07 '^H' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 8 0x08 '^I' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 9 0x09 '^J' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 10 0x0a '^K' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 11 0x0b '^L' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 12 0x0c '^M' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 13 0x0d '^N' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 14 0x0e '^O' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 15 0x0f '^P' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 16 0x10 '^Q' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 17 0x11 '^R' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 18 0x12 '^S' */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 19 0x13 '^T' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 20 0x14 '^U' */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 21 0x15 '^V' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 22 0x16 '^W' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 23 0x17 '^X' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 24 0x18 '^Y' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 25 0x19 '^Z' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 26 0x1a '^[' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 27 0x1b '^\' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 28 0x1c '^]' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 29 0x1d '^^' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 30 0x1e '^_' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 31 0x1f '^`' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 32 0x20 ' ' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 33 0x21 '!' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 34 0x22 '"' */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 35 0x23 '#' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 36 0x24 '$' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 37 0x25 '%' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 38 0x26 '&' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 39 0x27 ''' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 40 0x28 '(' */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 41 0x29 ')' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 42 0x2a '*' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 43 0x2b '+' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 44 0x2c ',' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 45 0x2d '-' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 46 0x2e '.' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 47 0x2f '/' */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 48 0x30 '0' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 49 0x31 '1' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x3f0, /* 000000      0000 */
-	     0x3f0, /* 000000      0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 50 0x32 '2' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 51 0x33 '3' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 52 0x34 '4' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x3f0, /* 000000      0000 */
-	     0x3f0, /* 000000      0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 53 0x35 '5' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 54 0x36 '6' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 55 0x37 '7' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 56 0x38 '8' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 57 0x39 '9' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 58 0x3a ':' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 59 0x3b ';' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 60 0x3c '<' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 61 0x3d '=' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 62 0x3e '>' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 63 0x3f '?' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 64 0x40 '@' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3f30, /* 00      00  0000 */
-	    0x3f30, /* 00      00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 65 0x41 'A' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 66 0x42 'B' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 67 0x43 'C' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 68 0x44 'D' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 69 0x45 'E' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 70 0x46 'F' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 71 0x47 'G' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 72 0x48 'H' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 73 0x49 'I' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 74 0x4a 'J' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 75 0x4b 'K' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3c00, /* 00    0000000000 */
-	    0x3c00, /* 00    0000000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 76 0x4c 'L' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 77 0x4d 'M' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 78 0x4e 'N' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 79 0x4f 'O' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 80 0x50 'P' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 81 0x51 'Q' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 82 0x52 'R' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 83 0x53 'S' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 84 0x54 'T' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 85 0x55 'U' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 86 0x56 'V' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 87 0x57 'W' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 88 0x58 'X' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 89 0x59 'Y' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 90 0x5a 'Z' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 91 0x5b '[' */
-	      0xf0, /* 00000000    0000 */
-	      0xf0, /* 00000000    0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xf0, /* 00000000    0000 */
-	      0xf0, /* 00000000    0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 92 0x5c '\' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0xc, /* 000000000000  00 */
-	       0xc, /* 000000000000  00 */
-	       0xc, /* 000000000000  00 */
-	       0xc, /* 000000000000  00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 93 0x5d ']' */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 94 0x5e '^' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 95 0x5f '_' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ffc, /* 00            00 */
-	    0x3ffc, /* 00            00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 96 0x60 '`' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 97 0x61 'a' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 98 0x62 'b' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 99 0x63 'c' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 100 0x64 'd' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 101 0x65 'e' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 102 0x66 'f' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xf0, /* 00000000    0000 */
-	      0xf0, /* 00000000    0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 103 0x67 'g' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 104 0x68 'h' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 105 0x69 'i' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 106 0x6a 'j' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3c00, /* 00    0000000000 */
-	    0x3c00, /* 00    0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 107 0x6b 'k' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 108 0x6c 'l' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 109 0x6d 'm' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 110 0x6e 'n' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 111 0x6f 'o' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 112 0x70 'p' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 113 0x71 'q' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 114 0x72 'r' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 115 0x73 's' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 116 0x74 't' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xf0, /* 00000000    0000 */
-	      0xf0, /* 00000000    0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 117 0x75 'u' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 118 0x76 'v' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 119 0x77 'w' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 120 0x78 'x' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 121 0x79 'y' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 122 0x7a 'z' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 123 0x7b '{' */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 124 0x7c '|' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 125 0x7d '}' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 126 0x7e '~' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 127 0x7f '^?' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 128 0x80 '\200' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 129 0x81 '\201' */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 130 0x82 '\202' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 131 0x83 '\203' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 132 0x84 '\204' */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 133 0x85 '\205' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 134 0x86 '\206' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 135 0x87 '\207' */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 136 0x88 '\210' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 137 0x89 '\211' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 138 0x8a '\212' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 139 0x8b '\213' */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 140 0x8c '\214' */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 141 0x8d '\215' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 142 0x8e '\216' */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 143 0x8f '\217' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 144 0x90 '\220' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 145 0x91 '\221' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 146 0x92 '\222' */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 147 0x93 '\223' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 148 0x94 '\224' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 149 0x95 '\225' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 150 0x96 '\226' */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 151 0x97 '\227' */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 152 0x98 '\230' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 153 0x99 '\231' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 154 0x9a '\232' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 155 0x9b '\233' */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 156 0x9c '\234' */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 157 0x9d '\235' */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 158 0x9e '\236' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 159 0x9f '\237' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 160 0xa0 '\240' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 161 0xa1 '\241' */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 162 0xa2 '\242' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 163 0xa3 '\243' */
-	     0xf00, /* 0000    00000000 */
-	     0xf00, /* 0000    00000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 164 0xa4 '\244' */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 165 0xa5 '\245' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 166 0xa6 '\246' */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 167 0xa7 '\247' */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 168 0xa8 '\250' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x3f00, /* 00      00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 169 0xa9 '\251' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x3f00, /* 00      00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xf30, /* 0000    00  0000 */
-	     0xf30, /* 0000    00  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	    0x3f00, /* 00      00000000 */
-	    0x3f00, /* 00      00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 170 0xaa '\252' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3fcc, /* 00        00  00 */
-	    0x3fcc, /* 00        00  00 */
-	     0xcfc, /* 0000  00      00 */
-	     0xcfc, /* 0000  00      00 */
-	     0xcfc, /* 0000  00      00 */
-	     0xcfc, /* 0000  00      00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 171 0xab '\253' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 172 0xac '\254' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 173 0xad '\255' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 174 0xae '\256' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3fc0, /* 00        000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x33f0, /* 00  00      0000 */
-	    0x33f0, /* 00  00      0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 175 0xaf '\257' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 176 0xb0 '\260' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3cf0, /* 00    00    0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 177 0xb1 '\261' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 178 0xb2 '\262' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 179 0xb3 '\263' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3f0, /* 000000      0000 */
-	     0x3f0, /* 000000      0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 180 0xb4 '\264' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 181 0xb5 '\265' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x3f30, /* 00      00  0000 */
-	    0x3f30, /* 00      00  0000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 182 0xb6 '\266' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xf0, /* 00000000    0000 */
-	      0xf0, /* 00000000    0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 183 0xb7 '\267' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 184 0xb8 '\270' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 185 0xb9 '\271' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 186 0xba '\272' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3c00, /* 00    0000000000 */
-	    0x3c00, /* 00    0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 187 0xbb '\273' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3f0, /* 000000      0000 */
-	     0x3f0, /* 000000      0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x3f0, /* 000000      0000 */
-	     0x3f0, /* 000000      0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 188 0xbc '\274' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 189 0xbd '\275' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3cf0, /* 00    00    0000 */
-	    0x3cf0, /* 00    00    0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 190 0xbe '\276' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x33f0, /* 00  00      0000 */
-	    0x33f0, /* 00  00      0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 191 0xbf '\277' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x30f0, /* 00  0000    0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	    0x3c30, /* 00    0000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 192 0xc0 '\300' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 193 0xc1 '\301' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 194 0xc2 '\302' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 195 0xc3 '\303' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xf0, /* 00000000    0000 */
-	      0xf0, /* 00000000    0000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	     0xc00, /* 0000  0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 196 0xc4 '\304' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	    0x3c00, /* 00    0000000000 */
-	    0x3c00, /* 00    0000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 197 0xc5 '\305' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3000, /* 00  000000000000 */
-	    0x3000, /* 00  000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 198 0xc6 '\306' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 199 0xc7 '\307' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 200 0xc8 '\310' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	     0xc30, /* 0000  0000  0000 */
-	    0x30c0, /* 00  0000  000000 */
-	    0x30c0, /* 00  0000  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 201 0xc9 '\311' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 202 0xca '\312' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 203 0xcb '\313' */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 204 0xcc '\314' */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 205 0xcd '\315' */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 206 0xce '\316' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x33c0, /* 00  00    000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 207 0xcf '\317' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x3330, /* 00  00  00  0000 */
-	    0x33f0, /* 00  00      0000 */
-	    0x33f0, /* 00  00      0000 */
-	    0x3300, /* 00  00  00000000 */
-	    0x3300, /* 00  00  00000000 */
-	     0xcf0, /* 0000  00    0000 */
-	     0xcf0, /* 0000  00    0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 208 0xd0 '\320' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 209 0xd1 '\321' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ffc, /* 00            00 */
-	    0x3ffc, /* 00            00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 210 0xd2 '\322' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 211 0xd3 '\323' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0x330, /* 000000  00  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 212 0xd4 '\324' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 213 0xd5 '\325' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x3c0, /* 000000    000000 */
-	     0x3c0, /* 000000    000000 */
-	      0xc0, /* 00000000  000000 */
-	      0xc0, /* 00000000  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 214 0xd6 '\326' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ff0, /* 00          0000 */
-	    0x3ff0, /* 00          0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 215 0xd7 '\327' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0x300, /* 000000  00000000 */
-	     0x300, /* 000000  00000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 216 0xd8 '\330' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xcc0, /* 0000  00  000000 */
-	     0xcc0, /* 0000  00  000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	    0x3030, /* 00  000000  0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	      0x30, /* 0000000000  0000 */
-	      0x30, /* 0000000000  0000 */
-	     0xfc0, /* 0000      000000 */
-	     0xfc0, /* 0000      000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 217 0xd9 '\331' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ffc, /* 00            00 */
-	    0x3ffc, /* 00            00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ffc, /* 00            00 */
-	    0x3ffc, /* 00            00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	    0x3ffc, /* 00            00 */
-	    0x3ffc, /* 00            00 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 218 0xda '\332' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 219 0xdb '\333' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 220 0xdc '\334' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 221 0xdd '\335' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 222 0xde '\336' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 223 0xdf '\337' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 224 0xe0 '\340' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 225 0xe1 '\341' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 226 0xe2 '\342' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 227 0xe3 '\343' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 228 0xe4 '\344' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 229 0xe5 '\345' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 230 0xe6 '\346' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 231 0xe7 '\347' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 232 0xe8 '\350' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 233 0xe9 '\351' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 234 0xea '\352' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 235 0xeb '\353' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 236 0xec '\354' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 237 0xed '\355' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 238 0xee '\356' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 239 0xef '\357' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 240 0xf0 '\360' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 241 0xf1 '\361' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 242 0xf2 '\362' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 243 0xf3 '\363' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 244 0xf4 '\364' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 245 0xf5 '\365' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 246 0xf6 '\366' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 247 0xf7 '\367' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 248 0xf8 '\370' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 249 0xf9 '\371' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 250 0xfa '\372' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 251 0xfb '\373' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 252 0xfc '\374' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 253 0xfd '\375' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 254 0xfe '\376' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-
-	/* 255 0xff '\377' */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	     0xff0, /* 0000        0000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
-	       0x0, /* 0000000000000000 */
+  /* 0 0x00 '^A' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 1 0x01 '^B' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 2 0x02 '^C' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 3 0x03 '^D' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 4 0x04 '^E' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 5 0x05 '^F' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 6 0x06 '^G' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 7 0x07 '^H' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 8 0x08 '^I' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 9 0x09 '^J' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 10 0x0a '^K' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 11 0x0b '^L' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 12 0x0c '^M' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 13 0x0d '^N' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 14 0x0e '^O' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 15 0x0f '^P' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 16 0x10 '^Q' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 17 0x11 '^R' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 18 0x12 '^S' */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 19 0x13 '^T' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 20 0x14 '^U' */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 21 0x15 '^V' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 22 0x16 '^W' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 23 0x17 '^X' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 24 0x18 '^Y' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 25 0x19 '^Z' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 26 0x1a '^[' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 27 0x1b '^\' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 28 0x1c '^]' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 29 0x1d '^^' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 30 0x1e '^_' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 31 0x1f '^`' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 32 0x20 ' ' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 33 0x21 '!' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 34 0x22 '"' */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 35 0x23 '#' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 36 0x24 '$' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 37 0x25 '%' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 38 0x26 '&' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 39 0x27 ''' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 40 0x28 '(' */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 41 0x29 ')' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 42 0x2a '*' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 43 0x2b '+' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 44 0x2c ',' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 45 0x2d '-' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 46 0x2e '.' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 47 0x2f '/' */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 48 0x30 '0' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 49 0x31 '1' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x3f0, /* 000000    0000 */
+     0x3f0, /* 000000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 50 0x32 '2' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 51 0x33 '3' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 52 0x34 '4' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x3f0, /* 000000    0000 */
+     0x3f0, /* 000000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 53 0x35 '5' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 54 0x36 '6' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 55 0x37 '7' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 56 0x38 '8' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 57 0x39 '9' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 58 0x3a ':' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 59 0x3b ';' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 60 0x3c '<' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 61 0x3d '=' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 62 0x3e '>' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 63 0x3f '?' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 64 0x40 '@' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3f30, /* 00    00  0000 */
+    0x3f30, /* 00    00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 65 0x41 'A' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 66 0x42 'B' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 67 0x43 'C' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 68 0x44 'D' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 69 0x45 'E' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 70 0x46 'F' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 71 0x47 'G' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 72 0x48 'H' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 73 0x49 'I' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 74 0x4a 'J' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 75 0x4b 'K' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3c00, /* 00  0000000000 */
+    0x3c00, /* 00  0000000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 76 0x4c 'L' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 77 0x4d 'M' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 78 0x4e 'N' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 79 0x4f 'O' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 80 0x50 'P' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 81 0x51 'Q' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 82 0x52 'R' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 83 0x53 'S' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 84 0x54 'T' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 85 0x55 'U' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 86 0x56 'V' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 87 0x57 'W' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 88 0x58 'X' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 89 0x59 'Y' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 90 0x5a 'Z' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 91 0x5b '[' */
+      0xf0, /* 00000000  0000 */
+      0xf0, /* 00000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xf0, /* 00000000  0000 */
+      0xf0, /* 00000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 92 0x5c '\' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0xc, /* 000000000000  00 */
+       0xc, /* 000000000000  00 */
+       0xc, /* 000000000000  00 */
+       0xc, /* 000000000000  00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 93 0x5d ']' */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 94 0x5e '^' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 95 0x5f '_' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ffc, /* 00      00 */
+    0x3ffc, /* 00      00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 96 0x60 '`' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 97 0x61 'a' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 98 0x62 'b' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 99 0x63 'c' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 100 0x64 'd' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 101 0x65 'e' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 102 0x66 'f' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xf0, /* 00000000  0000 */
+      0xf0, /* 00000000  0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 103 0x67 'g' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 104 0x68 'h' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 105 0x69 'i' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 106 0x6a 'j' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3c00, /* 00  0000000000 */
+    0x3c00, /* 00  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 107 0x6b 'k' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3f00, /* 00    00000000 */
+    0x3f00, /* 00    00000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 108 0x6c 'l' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 109 0x6d 'm' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 110 0x6e 'n' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 111 0x6f 'o' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 112 0x70 'p' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 113 0x71 'q' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 114 0x72 'r' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 115 0x73 's' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 116 0x74 't' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xf0, /* 00000000  0000 */
+      0xf0, /* 00000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 117 0x75 'u' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 118 0x76 'v' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 119 0x77 'w' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 120 0x78 'x' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 121 0x79 'y' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 122 0x7a 'z' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 123 0x7b '{' */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 124 0x7c '|' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 125 0x7d '}' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 126 0x7e '~' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 127 0x7f '^?' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 128 0x80 '\200' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 129 0x81 '\201' */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 130 0x82 '\202' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 131 0x83 '\203' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 132 0x84 '\204' */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 133 0x85 '\205' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 134 0x86 '\206' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 135 0x87 '\207' */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 136 0x88 '\210' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 137 0x89 '\211' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 138 0x8a '\212' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 139 0x8b '\213' */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 140 0x8c '\214' */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 141 0x8d '\215' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 142 0x8e '\216' */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 143 0x8f '\217' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 144 0x90 '\220' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 145 0x91 '\221' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 146 0x92 '\222' */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 147 0x93 '\223' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 148 0x94 '\224' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 149 0x95 '\225' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 150 0x96 '\226' */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 151 0x97 '\227' */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 152 0x98 '\230' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 153 0x99 '\231' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 154 0x9a '\232' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 155 0x9b '\233' */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 156 0x9c '\234' */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 157 0x9d '\235' */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 158 0x9e '\236' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 159 0x9f '\237' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 160 0xa0 '\240' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 161 0xa1 '\241' */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 162 0xa2 '\242' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 163 0xa3 '\243' */
+     0xf00, /* 0000  00000000 */
+     0xf00, /* 0000  00000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3f00, /* 00    00000000 */
+    0x3f00, /* 00    00000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 164 0xa4 '\244' */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 165 0xa5 '\245' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 166 0xa6 '\246' */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 167 0xa7 '\247' */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 168 0xa8 '\250' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3f00, /* 00    00000000 */
+    0x3f00, /* 00    00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 169 0xa9 '\251' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3f00, /* 00    00000000 */
+    0x3f00, /* 00    00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xf30, /* 0000  00  0000 */
+     0xf30, /* 0000  00  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+    0x3f00, /* 00    00000000 */
+    0x3f00, /* 00    00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 170 0xaa '\252' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3fcc, /* 00    00  00 */
+    0x3fcc, /* 00    00  00 */
+     0xcfc, /* 0000  00    00 */
+     0xcfc, /* 0000  00    00 */
+     0xcfc, /* 0000  00    00 */
+     0xcfc, /* 0000  00    00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 171 0xab '\253' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 172 0xac '\254' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 173 0xad '\255' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 174 0xae '\256' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3fc0, /* 00    000000 */
+    0x3fc0, /* 00    000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x33f0, /* 00  00    0000 */
+    0x33f0, /* 00  00    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 175 0xaf '\257' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 176 0xb0 '\260' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 177 0xb1 '\261' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 178 0xb2 '\262' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 179 0xb3 '\263' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3f0, /* 000000    0000 */
+     0x3f0, /* 000000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 180 0xb4 '\264' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 181 0xb5 '\265' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x3f30, /* 00    00  0000 */
+    0x3f30, /* 00    00  0000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 182 0xb6 '\266' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xf0, /* 00000000  0000 */
+      0xf0, /* 00000000  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 183 0xb7 '\267' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 184 0xb8 '\270' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 185 0xb9 '\271' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 186 0xba '\272' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3c00, /* 00  0000000000 */
+    0x3c00, /* 00  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 187 0xbb '\273' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3f0, /* 000000    0000 */
+     0x3f0, /* 000000    0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x3f0, /* 000000    0000 */
+     0x3f0, /* 000000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 188 0xbc '\274' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 189 0xbd '\275' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3cf0, /* 00  00  0000 */
+    0x3cf0, /* 00  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 190 0xbe '\276' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x33f0, /* 00  00    0000 */
+    0x33f0, /* 00  00    0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 191 0xbf '\277' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x30f0, /* 00  0000  0000 */
+    0x30f0, /* 00  0000  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3c30, /* 00  0000  0000 */
+    0x3c30, /* 00  0000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 192 0xc0 '\300' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 193 0xc1 '\301' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 194 0xc2 '\302' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 195 0xc3 '\303' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xf0, /* 00000000  0000 */
+      0xf0, /* 00000000  0000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+     0xc00, /* 0000  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 196 0xc4 '\304' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+    0x3c00, /* 00  0000000000 */
+    0x3c00, /* 00  0000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 197 0xc5 '\305' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3000, /* 00  000000000000 */
+    0x3000, /* 00  000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 198 0xc6 '\306' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 199 0xc7 '\307' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 200 0xc8 '\310' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+     0xc30, /* 0000  0000  0000 */
+    0x30c0, /* 00  0000  000000 */
+    0x30c0, /* 00  0000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 201 0xc9 '\311' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 202 0xca '\312' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 203 0xcb '\313' */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 204 0xcc '\314' */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 205 0xcd '\315' */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 206 0xce '\316' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x33c0, /* 00  00  000000 */
+    0x33c0, /* 00  00  000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 207 0xcf '\317' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3330, /* 00  00  00  0000 */
+    0x3330, /* 00  00  00  0000 */
+    0x33f0, /* 00  00    0000 */
+    0x33f0, /* 00  00    0000 */
+    0x3300, /* 00  00  00000000 */
+    0x3300, /* 00  00  00000000 */
+     0xcf0, /* 0000  00  0000 */
+     0xcf0, /* 0000  00  0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 208 0xd0 '\320' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 209 0xd1 '\321' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ffc, /* 00      00 */
+    0x3ffc, /* 00      00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 210 0xd2 '\322' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 211 0xd3 '\323' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0x330, /* 000000  00  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 212 0xd4 '\324' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 213 0xd5 '\325' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x3c0, /* 000000  000000 */
+     0x3c0, /* 000000  000000 */
+      0xc0, /* 00000000  000000 */
+      0xc0, /* 00000000  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 214 0xd6 '\326' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ff0, /* 00      0000 */
+    0x3ff0, /* 00      0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 215 0xd7 '\327' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+     0x300, /* 000000  00000000 */
+     0x300, /* 000000  00000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 216 0xd8 '\330' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xcc0, /* 0000  00  000000 */
+     0xcc0, /* 0000  00  000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+    0x3030, /* 00  000000  0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+      0x30, /* 0000000000  0000 */
+      0x30, /* 0000000000  0000 */
+     0xfc0, /* 0000    000000 */
+     0xfc0, /* 0000    000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 217 0xd9 '\331' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ffc, /* 00      00 */
+    0x3ffc, /* 00      00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ffc, /* 00      00 */
+    0x3ffc, /* 00      00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+    0x3ffc, /* 00      00 */
+    0x3ffc, /* 00      00 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 218 0xda '\332' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 219 0xdb '\333' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 220 0xdc '\334' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 221 0xdd '\335' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 222 0xde '\336' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 223 0xdf '\337' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 224 0xe0 '\340' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 225 0xe1 '\341' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 226 0xe2 '\342' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 227 0xe3 '\343' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 228 0xe4 '\344' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 229 0xe5 '\345' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 230 0xe6 '\346' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 231 0xe7 '\347' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 232 0xe8 '\350' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 233 0xe9 '\351' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 234 0xea '\352' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 235 0xeb '\353' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 236 0xec '\354' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 237 0xed '\355' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 238 0xee '\356' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 239 0xef '\357' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 240 0xf0 '\360' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 241 0xf1 '\361' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 242 0xf2 '\362' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 243 0xf3 '\363' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 244 0xf4 '\364' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 245 0xf5 '\365' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 246 0xf6 '\366' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 247 0xf7 '\367' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 248 0xf8 '\370' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 249 0xf9 '\371' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 250 0xfa '\372' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 251 0xfb '\373' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 252 0xfc '\374' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 253 0xfd '\375' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 254 0xfe '\376' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+
+  /* 255 0xff '\377' */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+     0xff0, /* 0000    0000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
+       0x0, /* 0000000000000000 */
 
 };
diff --git a/src/zm_box.h b/src/zm_box.h
index 8aa341d73..f5fe69a38 100644
--- a/src/zm_box.h
+++ b/src/zm_box.h
@@ -36,39 +36,39 @@
 class Box
 {
 private:
-	Coord lo, hi;
-	Coord size;
+  Coord lo, hi;
+  Coord size;
 
 public:
-	inline Box()
-	{
-	}
-	inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
-	inline Box( int p_x_size, int p_y_size ) : lo( 0, 0 ), hi ( p_x_size-1, p_y_size-1 ), size( Coord::Range( hi, lo ) ) { }
-	inline Box( int lo_x, int lo_y, int hi_x, int hi_y ) : lo( lo_x, lo_y ), hi( hi_x, hi_y ), size( Coord::Range( hi, lo ) ) { }
-	inline Box( const Coord &p_lo, const Coord &p_hi ) : lo( p_lo ), hi( p_hi ), size( Coord::Range( hi, lo ) ) { }
+  inline Box()
+  {
+  }
+  inline Box( int p_size ) : lo( 0, 0 ), hi ( p_size-1, p_size-1 ), size( Coord::Range( hi, lo ) ) { }
+  inline Box( int p_x_size, int p_y_size ) : lo( 0, 0 ), hi ( p_x_size-1, p_y_size-1 ), size( Coord::Range( hi, lo ) ) { }
+  inline Box( int lo_x, int lo_y, int hi_x, int hi_y ) : lo( lo_x, lo_y ), hi( hi_x, hi_y ), size( Coord::Range( hi, lo ) ) { }
+  inline Box( const Coord &p_lo, const Coord &p_hi ) : lo( p_lo ), hi( p_hi ), size( Coord::Range( hi, lo ) ) { }
 
-	inline const Coord &Lo() const { return( lo ); }
-	inline int LoX() const { return( lo.X() ); }
-	inline int LoY() const { return( lo.Y() ); }
-	inline const Coord &Hi() const { return( hi ); }
-	inline int HiX() const { return( hi.X() ); }
-	inline int HiY() const { return( hi.Y() ); }
-	inline const Coord &Size() const { return( size ); }
-	inline int Width() const { return( size.X() ); }
-	inline int Height() const { return( size.Y() ); }
-	inline int Area() const { return( size.X()*size.Y() ); }
+  inline const Coord &Lo() const { return( lo ); }
+  inline int LoX() const { return( lo.X() ); }
+  inline int LoY() const { return( lo.Y() ); }
+  inline const Coord &Hi() const { return( hi ); }
+  inline int HiX() const { return( hi.X() ); }
+  inline int HiY() const { return( hi.Y() ); }
+  inline const Coord &Size() const { return( size ); }
+  inline int Width() const { return( size.X() ); }
+  inline int Height() const { return( size.Y() ); }
+  inline int Area() const { return( size.X()*size.Y() ); }
 
-	inline const Coord Centre() const
-	{
-		int mid_x = int(round(lo.X()+(size.X()/2.0)));
-		int mid_y = int(round(lo.Y()+(size.Y()/2.0)));
-		return( Coord( mid_x, mid_y ) );
-	}
-	inline bool Inside( const Coord &coord ) const
-	{
-		return( coord.X() >= lo.X() && coord.X() <= hi.X() && coord.Y() >= lo.Y() && coord.Y() <= hi.Y() );
-	}
+  inline const Coord Centre() const
+  {
+    int mid_x = int(round(lo.X()+(size.X()/2.0)));
+    int mid_y = int(round(lo.Y()+(size.Y()/2.0)));
+    return( Coord( mid_x, mid_y ) );
+  }
+  inline bool Inside( const Coord &coord ) const
+  {
+    return( coord.X() >= lo.X() && coord.X() <= hi.X() && coord.Y() >= lo.Y() && coord.Y() <= hi.Y() );
+  }
 };
 
 #endif // ZM_BOX_H
diff --git a/src/zm_buffer.cpp b/src/zm_buffer.cpp
index d2fb2ef72..b46cb2f15 100644
--- a/src/zm_buffer.cpp
+++ b/src/zm_buffer.cpp
@@ -25,57 +25,57 @@
 
 unsigned int Buffer::assign( const unsigned char *pStorage, unsigned int pSize )
 {
-    if ( mAllocation < pSize )
-    {
-        delete[] mStorage;
-        mAllocation = pSize;
-        mHead = mStorage = new unsigned char[pSize];
-    }
-    mSize = pSize;
-    memcpy( mStorage, pStorage, mSize );
-    mHead = mStorage;
-    mTail = mHead + mSize;
-    return( mSize );
+  if ( mAllocation < pSize )
+  {
+    delete[] mStorage;
+    mAllocation = pSize;
+    mHead = mStorage = new unsigned char[pSize];
+  }
+  mSize = pSize;
+  memcpy( mStorage, pStorage, mSize );
+  mHead = mStorage;
+  mTail = mHead + mSize;
+  return( mSize );
 }
 
 unsigned int Buffer::expand( unsigned int count )
 {
-    int spare = mAllocation - mSize;
-    int headSpace = mHead - mStorage;
-    int tailSpace = spare - headSpace;
-    int width = mTail - mHead;
-    if ( spare > (int)count )
+  int spare = mAllocation - mSize;
+  int headSpace = mHead - mStorage;
+  int tailSpace = spare - headSpace;
+  int width = mTail - mHead;
+  if ( spare > (int)count )
+  {
+    if ( tailSpace < (int)count )
     {
-        if ( tailSpace < (int)count )
-        {
-            memmove( mStorage, mHead, mSize );
-            mHead = mStorage;
-            mTail = mHead + width;
-        }
+      memmove( mStorage, mHead, mSize );
+      mHead = mStorage;
+      mTail = mHead + width;
     }
-    else
+  }
+  else
+  {
+    mAllocation += count;
+    unsigned char *newStorage = new unsigned char[mAllocation];
+    if ( mStorage )
     {
-        mAllocation += count;
-        unsigned char *newStorage = new unsigned char[mAllocation];
-        if ( mStorage )
-        {
-            memcpy( newStorage, mHead, mSize );
-            delete[] mStorage;
-        }
-        mStorage = newStorage;
-        mHead = mStorage;
-        mTail = mHead + width;
+      memcpy( newStorage, mHead, mSize );
+      delete[] mStorage;
     }
-    return( mSize );
+    mStorage = newStorage;
+    mHead = mStorage;
+    mTail = mHead + width;
+  }
+  return( mSize );
 }
 
 int Buffer::read_into( int sd, unsigned int bytes ) {
-    // Make sure there is enough space
-    this->expand(bytes);
-    int bytes_read = read( sd, mTail, bytes );
-    if ( bytes_read > 0 ) {
-        mTail += bytes_read;
-        mSize += bytes_read;
-    }
-    return bytes_read;
+  // Make sure there is enough space
+  this->expand(bytes);
+  int bytes_read = read( sd, mTail, bytes );
+  if ( bytes_read > 0 ) {
+    mTail += bytes_read;
+    mSize += bytes_read;
+  }
+  return bytes_read;
 }
diff --git a/src/zm_buffer.h b/src/zm_buffer.h
index 007df4459..620fce1a8 100644
--- a/src/zm_buffer.h
+++ b/src/zm_buffer.h
@@ -27,183 +27,183 @@
 class Buffer
 {
 protected:
-    unsigned char *mStorage;
-    unsigned int mAllocation;
-    unsigned int mSize;
-    unsigned char *mHead;
-    unsigned char *mTail;
+  unsigned char *mStorage;
+  unsigned int mAllocation;
+  unsigned int mSize;
+  unsigned char *mHead;
+  unsigned char *mTail;
 
 public:
-    Buffer() : mStorage( 0 ), mAllocation( 0 ), mSize( 0 ), mHead( 0 ), mTail( 0 )
+  Buffer() : mStorage( 0 ), mAllocation( 0 ), mSize( 0 ), mHead( 0 ), mTail( 0 )
+  {
+  }
+  Buffer( unsigned int pSize ) : mAllocation( pSize ), mSize( 0 )
+  {
+    mHead = mStorage = new unsigned char[mAllocation];
+    mTail = mHead;
+  }
+  Buffer( const unsigned char *pStorage, unsigned int pSize ) : mAllocation( pSize ), mSize( pSize )
+  {
+    mHead = mStorage = new unsigned char[mSize];
+    memcpy( mStorage, pStorage, mSize );
+    mTail = mHead + mSize;
+  }
+  Buffer( const Buffer &buffer ) : mAllocation( buffer.mSize ), mSize( buffer.mSize )
+  {
+    mHead = mStorage = new unsigned char[mSize];
+    memcpy( mStorage, buffer.mHead, mSize );
+    mTail = mHead + mSize;
+  }
+  ~Buffer()
+  {
+    delete[] mStorage;
+  }
+  unsigned char *head() const { return( mHead ); }
+  unsigned char *tail() const { return( mTail ); }
+  unsigned int size() const { return( mSize ); }
+  bool empty() const { return( mSize == 0 ); }
+  unsigned int size( unsigned int pSize )
+  {
+    if ( mSize < pSize )
     {
+      expand( pSize-mSize );
     }
-    Buffer( unsigned int pSize ) : mAllocation( pSize ), mSize( 0 )
-    {
-        mHead = mStorage = new unsigned char[mAllocation];
-        mTail = mHead;
-    }
-    Buffer( const unsigned char *pStorage, unsigned int pSize ) : mAllocation( pSize ), mSize( pSize )
-    {
-        mHead = mStorage = new unsigned char[mSize];
-        memcpy( mStorage, pStorage, mSize );
-        mTail = mHead + mSize;
-    }
-    Buffer( const Buffer &buffer ) : mAllocation( buffer.mSize ), mSize( buffer.mSize )
-    {
-        mHead = mStorage = new unsigned char[mSize];
-        memcpy( mStorage, buffer.mHead, mSize );
-        mTail = mHead + mSize;
-    }
-    ~Buffer()
-    {
-        delete[] mStorage;
-    }
-    unsigned char *head() const { return( mHead ); }
-    unsigned char *tail() const { return( mTail ); }
-    unsigned int size() const { return( mSize ); }
-    bool empty() const { return( mSize == 0 ); }
-    unsigned int size( unsigned int pSize )
-    {
-        if ( mSize < pSize )
-        {
-            expand( pSize-mSize );
-        }
-        return( mSize );
-    }
-    //unsigned int Allocation() const { return( mAllocation ); }
+    return( mSize );
+  }
+  //unsigned int Allocation() const { return( mAllocation ); }
 
-    void clear()
+  void clear()
+  {
+    mSize = 0;
+    mHead = mTail = mStorage;
+  }
+
+  unsigned int assign( const unsigned char *pStorage, unsigned int pSize );
+  unsigned int assign( const Buffer &buffer )
+  {
+    return( assign( buffer.mHead, buffer.mSize ) );
+  }
+
+  // Trim from the front of the buffer
+  unsigned int consume( unsigned int count )
+  {
+    if ( count > mSize )
     {
-        mSize = 0;
+      Warning( "Attempt to consume %d bytes of buffer, size is only %d bytes", count, mSize );
+      count = mSize;
+    }
+    mHead += count;
+    mSize -= count;
+    tidy( 0 );
+    return( count );
+  }
+  // Trim from the end of the buffer
+  unsigned int shrink( unsigned int count )
+  {
+    if ( count > mSize )
+    {
+      Warning( "Attempt to shrink buffer by %d bytes, size is only %d bytes", count, mSize );
+      count = mSize;
+    }
+    mSize -= count;
+    if ( mTail > (mHead + mSize) )
+      mTail = mHead + mSize;
+    tidy( 0 );
+    return( count );
+  }
+  // Add to the end of the buffer
+  unsigned int expand( unsigned int count );
+
+  // Return pointer to the first pSize bytes and advance the head
+  unsigned char *extract( unsigned int pSize )
+  {
+    if ( pSize > mSize )
+    {
+      Warning( "Attempt to extract %d bytes of buffer, size is only %d bytes", pSize, mSize );
+      pSize = mSize;
+    }
+    unsigned char *oldHead = mHead;
+    mHead += pSize;
+    mSize -= pSize;
+    tidy( 0 );
+    return( oldHead );
+  }
+  // Add bytes to the end of the buffer
+  unsigned int append( const unsigned char *pStorage, unsigned int pSize )
+  {
+    expand( pSize );
+    memcpy( mTail, pStorage, pSize );
+    mTail += pSize;
+    mSize += pSize;
+    return( mSize );
+  }
+  unsigned int append( const char *pStorage, unsigned int pSize )
+  {
+    return( append( (const unsigned char *)pStorage, pSize ) );
+  }
+  unsigned int append( const Buffer &buffer )
+  {
+    return( append( buffer.mHead, buffer.mSize ) );
+  }
+  void tidy( bool level=0 )
+  {
+    if ( mHead != mStorage )
+    {
+      if ( mSize == 0 )
         mHead = mTail = mStorage;
-    }
-
-    unsigned int assign( const unsigned char *pStorage, unsigned int pSize );
-    unsigned int assign( const Buffer &buffer )
-    {
-        return( assign( buffer.mHead, buffer.mSize ) );
-    }
-
-    // Trim from the front of the buffer
-    unsigned int consume( unsigned int count )
-    {
-        if ( count > mSize )
+      else if ( level )
+      {
+        if ( (mHead-mStorage) > mSize )
         {
-            Warning( "Attempt to consume %d bytes of buffer, size is only %d bytes", count, mSize );
-            count = mSize;
+          memcpy( mStorage, mHead, mSize );
+          mHead = mStorage;
+          mTail = mHead + mSize;
         }
-        mHead += count;
-        mSize -= count;
-        tidy( 0 );
-        return( count );
+      }
     }
-    // Trim from the end of the buffer
-    unsigned int shrink( unsigned int count )
-    {
-        if ( count > mSize )
-        {
-            Warning( "Attempt to shrink buffer by %d bytes, size is only %d bytes", count, mSize );
-            count = mSize;
-        }
-        mSize -= count;
-        if ( mTail > (mHead + mSize) )
-            mTail = mHead + mSize;
-        tidy( 0 );
-        return( count );
-    }
-    // Add to the end of the buffer
-    unsigned int expand( unsigned int count );
+  }
 
-    // Return pointer to the first pSize bytes and advance the head
-    unsigned char *extract( unsigned int pSize )
-    {
-        if ( pSize > mSize )
-        {
-            Warning( "Attempt to extract %d bytes of buffer, size is only %d bytes", pSize, mSize );
-            pSize = mSize;
-        }
-        unsigned char *oldHead = mHead;
-        mHead += pSize;
-        mSize -= pSize;
-        tidy( 0 );
-        return( oldHead );
-    }
-    // Add bytes to the end of the buffer
-    unsigned int append( const unsigned char *pStorage, unsigned int pSize )
-    {
-        expand( pSize );
-        memcpy( mTail, pStorage, pSize );
-        mTail += pSize;
-        mSize += pSize;
-        return( mSize );
-    }
-    unsigned int append( const char *pStorage, unsigned int pSize )
-    {
-        return( append( (const unsigned char *)pStorage, pSize ) );
-    }
-    unsigned int append( const Buffer &buffer )
-    {
-        return( append( buffer.mHead, buffer.mSize ) );
-    }
-    void tidy( bool level=0 )
-    {
-        if ( mHead != mStorage )
-        {
-            if ( mSize == 0 )
-                mHead = mTail = mStorage;
-            else if ( level )
-            {
-                if ( (mHead-mStorage) > mSize )
-                {
-                    memcpy( mStorage, mHead, mSize );
-                    mHead = mStorage;
-                    mTail = mHead + mSize;
-                }
-            }
-        }
-    }
-
-    Buffer &operator=( const Buffer &buffer )
-    {
-        assign( buffer );
-        return( *this );
-    }
-    Buffer &operator+=( const Buffer &buffer )
-    {
-        append( buffer );
-        return( *this );
-    }
-    Buffer &operator+=( unsigned int count )
-    {
-        expand( count );
-        return( *this );
-    }
-    Buffer &operator-=( unsigned int count )
-    {
-        consume( count );
-        return( *this );
-    }
-    operator unsigned char *() const
-    {
-        return( mHead );
-    }
-    operator char *() const
-    {
-        return( (char *)mHead );
-    }
-    unsigned char *operator+(int offset) const
-    {
-        return( (unsigned char *)(mHead+offset) );
-    }
-    unsigned char operator[](int index) const
-    {
-        return( *(mHead+index) );
-    }
-    operator int () const
-    {
-        return( (int)mSize );
-    }
-	int read_into( int sd, unsigned int bytes );
+  Buffer &operator=( const Buffer &buffer )
+  {
+    assign( buffer );
+    return( *this );
+  }
+  Buffer &operator+=( const Buffer &buffer )
+  {
+    append( buffer );
+    return( *this );
+  }
+  Buffer &operator+=( unsigned int count )
+  {
+    expand( count );
+    return( *this );
+  }
+  Buffer &operator-=( unsigned int count )
+  {
+    consume( count );
+    return( *this );
+  }
+  operator unsigned char *() const
+  {
+    return( mHead );
+  }
+  operator char *() const
+  {
+    return( (char *)mHead );
+  }
+  unsigned char *operator+(int offset) const
+  {
+    return( (unsigned char *)(mHead+offset) );
+  }
+  unsigned char operator[](int index) const
+  {
+    return( *(mHead+index) );
+  }
+  operator int () const
+  {
+    return( (int)mSize );
+  }
+  int read_into( int sd, unsigned int bytes );
 };
 
 #endif // ZM_BUFFER_H
diff --git a/src/zm_camera.cpp b/src/zm_camera.cpp
index 18950d341..6f2c5b023 100644
--- a/src/zm_camera.cpp
+++ b/src/zm_camera.cpp
@@ -20,7 +20,7 @@
 #include "zm.h"
 #include "zm_camera.h"
 
-Camera::Camera( int p_id, SourceType p_type, int p_width, int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
+Camera::Camera( int p_id, SourceType p_type, int p_width, int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
     id( p_id ),
     type( p_type ),
     width( p_width),
@@ -31,19 +31,20 @@ Camera::Camera( int p_id, SourceType p_type, int p_width, int p_height, int p_co
     hue( p_hue ),
     colour( p_colour ),
     contrast( p_contrast ),
-    capture( p_capture )
+    capture( p_capture ),
+    record_audio( p_record_audio )
 {
-	pixels = width * height;
-	imagesize = pixels * colours;
-	
-	Debug(2,"New camera id: %d width: %d height: %d colours: %d subpixelorder: %d capture: %d",id,width,height,colours,subpixelorder,capture);
-	
-	/* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */
-	if((colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB32) && (imagesize % 16) != 0) {
-		Fatal("Image size is not multiples of 16");
-	} else if(colours == ZM_COLOUR_RGB24 && ((imagesize % 16) != 0 || (imagesize % 12) != 0)) {
-		Fatal("Image size is not multiples of 12 and 16");
-	}
+  pixels = width * height;
+  imagesize = pixels * colours;
+  
+  Debug(2,"New camera id: %d width: %d height: %d colours: %d subpixelorder: %d capture: %d",id,width,height,colours,subpixelorder,capture);
+  
+  /* Because many loops are unrolled and work on 16 colours/time or 4 pixels/time, we have to meet requirements */
+  if((colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB32) && (imagesize % 16) != 0) {
+    Fatal("Image size is not multiples of 16");
+  } else if(colours == ZM_COLOUR_RGB24 && ((imagesize % 16) != 0 || (imagesize % 12) != 0)) {
+    Fatal("Image size is not multiples of 12 and 16");
+  }
 }
 
 Camera::~Camera()
diff --git a/src/zm_camera.h b/src/zm_camera.h
old mode 100755
new mode 100644
index 5d54919f1..461789178
--- a/src/zm_camera.h
+++ b/src/zm_camera.h
@@ -32,55 +32,56 @@
 class Camera
 {
 protected:
-	typedef enum { LOCAL_SRC, REMOTE_SRC, FILE_SRC, FFMPEG_SRC, LIBVLC_SRC, CURL_SRC } SourceType;
+  typedef enum { LOCAL_SRC, REMOTE_SRC, FILE_SRC, FFMPEG_SRC, LIBVLC_SRC, CURL_SRC } SourceType;
 
-    int             id;
-	SourceType		type;
-	unsigned int	width;
-	unsigned int	height;
-	unsigned int	colours;
-	unsigned int	subpixelorder;
-	unsigned int	pixels;
-	unsigned int	imagesize;
-	int				brightness;
-	int				hue;
-	int				colour;
-	int				contrast;
-    bool            capture;
+  int     id;
+  SourceType    type;
+  unsigned int  width;
+  unsigned int  height;
+  unsigned int  colours;
+  unsigned int  subpixelorder;
+  unsigned int  pixels;
+  unsigned int  imagesize;
+  int        brightness;
+  int        hue;
+  int        colour;
+  int        contrast;
+  bool    capture;
+  bool    record_audio;
 
 public:
-	Camera( int p_id, SourceType p_type, int p_width, int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	virtual ~Camera();
+  Camera( int p_id, SourceType p_type, int p_width, int p_height, int p_colours, int p_subpixelorder, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  virtual ~Camera();
 
-    int getId() const { return( id ); }
-	SourceType Type() const { return( type ); }
-	bool IsLocal() const { return( type == LOCAL_SRC ); }
-	bool IsRemote() const { return( type == REMOTE_SRC ); }
-	bool IsFile() const { return( type == FILE_SRC ); }
-	bool IsFfmpeg() const { return( type == FFMPEG_SRC ); }
-    bool IsLibvlc() const { return( type == LIBVLC_SRC ); }
-	bool IscURL() const { return( type == CURL_SRC ); }
-	unsigned int Width() const { return( width ); }
-	unsigned int Height() const { return( height ); }
-	unsigned int Colours() const { return( colours ); }
-	unsigned int SubpixelOrder() const { return( subpixelorder ); }
-	unsigned int Pixels() const { return( pixels ); }
-	unsigned int ImageSize() const { return( imagesize ); }
+  int getId() const { return( id ); }
+  SourceType Type() const { return( type ); }
+  bool IsLocal() const { return( type == LOCAL_SRC ); }
+  bool IsRemote() const { return( type == REMOTE_SRC ); }
+  bool IsFile() const { return( type == FILE_SRC ); }
+  bool IsFfmpeg() const { return( type == FFMPEG_SRC ); }
+  bool IsLibvlc() const { return( type == LIBVLC_SRC ); }
+  bool IscURL() const { return( type == CURL_SRC ); }
+  unsigned int Width() const { return( width ); }
+  unsigned int Height() const { return( height ); }
+  unsigned int Colours() const { return( colours ); }
+  unsigned int SubpixelOrder() const { return( subpixelorder ); }
+  unsigned int Pixels() const { return( pixels ); }
+  unsigned int ImageSize() const { return( imagesize ); }
 
-	virtual int Brightness( int/*p_brightness*/=-1 ) { return( -1 ); }
-	virtual int Hue( int/*p_hue*/=-1 ) { return( -1 ); }
-	virtual int Colour( int/*p_colour*/=-1 ) { return( -1 ); }
-	virtual int Contrast( int/*p_contrast*/=-1 ) { return( -1 ); }
+  virtual int Brightness( int/*p_brightness*/=-1 ) { return( -1 ); }
+  virtual int Hue( int/*p_hue*/=-1 ) { return( -1 ); }
+  virtual int Colour( int/*p_colour*/=-1 ) { return( -1 ); }
+  virtual int Contrast( int/*p_contrast*/=-1 ) { return( -1 ); }
 
-    bool CanCapture() const { return( capture ); }
-    
-    bool SupportsNativeVideo() const { return( type == FFMPEG_SRC ); }
-    
-	virtual int PrimeCapture() { return( 0 ); }
-	virtual int PreCapture()=0;
-	virtual int Capture( Image &image )=0;
-	virtual int PostCapture()=0;
-        virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory)=0;
+  bool CanCapture() const { return( capture ); }
+  
+  bool SupportsNativeVideo() const { return( (type == FFMPEG_SRC )||(type == REMOTE_SRC)); }
+  
+  virtual int PrimeCapture() { return( 0 ); }
+  virtual int PreCapture()=0;
+  virtual int Capture( Image &image )=0;
+  virtual int PostCapture()=0;
+	virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory)=0;
 };
 
 #endif // ZM_CAMERA_H
diff --git a/src/zm_comms.cpp b/src/zm_comms.cpp
index a109019bd..1fd224b18 100644
--- a/src/zm_comms.cpp
+++ b/src/zm_comms.cpp
@@ -42,89 +42,89 @@
 
 int CommsBase::readV( int iovcnt, /* const void *, int, */ ... )
 {
-	va_list arg_ptr;
-	//struct iovec iov[iovcnt];
-	struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
+  va_list arg_ptr;
+  //struct iovec iov[iovcnt];
+  struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
 
-	va_start( arg_ptr, iovcnt );
-	for ( int i = 0; i < iovcnt; i++ )
-	{
-		iov[i].iov_base = va_arg( arg_ptr, void * );
-		iov[i].iov_len = va_arg( arg_ptr, int );
-	}
-	va_end( arg_ptr );
+  va_start( arg_ptr, iovcnt );
+  for ( int i = 0; i < iovcnt; i++ )
+  {
+    iov[i].iov_base = va_arg( arg_ptr, void * );
+    iov[i].iov_len = va_arg( arg_ptr, int );
+  }
+  va_end( arg_ptr );
 
-    int nBytes = ::readv( mRd, iov, iovcnt );
-    if ( nBytes < 0 )
-        Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
-    return( nBytes );
+  int nBytes = ::readv( mRd, iov, iovcnt );
+  if ( nBytes < 0 )
+    Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
+  return( nBytes );
 }
 
 int CommsBase::writeV( int iovcnt, /* const void *, int, */ ... )
 {
-	va_list arg_ptr;
-	//struct iovec iov[iovcnt];
-	struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
+  va_list arg_ptr;
+  //struct iovec iov[iovcnt];
+  struct iovec *iov = (struct iovec *)alloca( sizeof(struct iovec)*iovcnt );
 
-	va_start( arg_ptr, iovcnt );
-	for ( int i = 0; i < iovcnt; i++ )
-	{
-		iov[i].iov_base = va_arg( arg_ptr, void * );
-		iov[i].iov_len = va_arg( arg_ptr, int );
-	}
-	va_end( arg_ptr );
+  va_start( arg_ptr, iovcnt );
+  for ( int i = 0; i < iovcnt; i++ )
+  {
+    iov[i].iov_base = va_arg( arg_ptr, void * );
+    iov[i].iov_len = va_arg( arg_ptr, int );
+  }
+  va_end( arg_ptr );
 
-    ssize_t nBytes = ::writev( mWd, iov, iovcnt );
-    if ( nBytes < 0 )
-        Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
-    return( nBytes );
+  ssize_t nBytes = ::writev( mWd, iov, iovcnt );
+  if ( nBytes < 0 )
+    Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
+  return( nBytes );
 }
 
 bool Pipe::open()
 {
-	if ( ::pipe( mFd ) < 0 )
-	{
-		Error( "pipe(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
+  if ( ::pipe( mFd ) < 0 )
+  {
+    Error( "pipe(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
 
-	return( true );
+  return( true );
 }
 
 bool Pipe::close()
 {
-	if ( mFd[0] > -1 ) ::close( mFd[0] );
-	mFd[0] = -1;
-	if ( mFd[1] > -1 ) ::close( mFd[1] );
-	mFd[1] = -1;
-	return( true );
+  if ( mFd[0] > -1 ) ::close( mFd[0] );
+  mFd[0] = -1;
+  if ( mFd[1] > -1 ) ::close( mFd[1] );
+  mFd[1] = -1;
+  return( true );
 }
 
 bool Pipe::setBlocking( bool blocking )
 {
-	int flags;
+  int flags;
 
-	/* Now set it for non-blocking I/O */
-	if ( (flags = fcntl( mFd[1], F_GETFL )) < 0 )
-	{
-		Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	if ( blocking )
-	{
-		flags &= ~O_NONBLOCK;
-	}
-	else
-	{
-		flags |= O_NONBLOCK;
-	}
-	if ( fcntl( mFd[1], F_SETFL, flags ) < 0 )
-	{
-		Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
+  /* Now set it for non-blocking I/O */
+  if ( (flags = fcntl( mFd[1], F_GETFL )) < 0 )
+  {
+    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  if ( blocking )
+  {
+    flags &= ~O_NONBLOCK;
+  }
+  else
+  {
+    flags |= O_NONBLOCK;
+  }
+  if ( fcntl( mFd[1], F_SETFL, flags ) < 0 )
+  {
+    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
 
-	return( true );
+  return( true );
 }
 
 SockAddr::SockAddr( const struct sockaddr *addr ) : mAddr( addr )
@@ -133,33 +133,33 @@ SockAddr::SockAddr( const struct sockaddr *addr ) : mAddr( addr )
 
 SockAddr *SockAddr::newSockAddr( const struct sockaddr &addr, socklen_t len )
 {
-    if ( addr.sa_family == AF_INET && len == SockAddrInet::addrSize() )
-    {
-        return( new SockAddrInet( (const struct sockaddr_in *)&addr ) );
-    }
-    else if ( addr.sa_family == AF_UNIX && len == SockAddrUnix::addrSize() )
-    {
-        return( new SockAddrUnix( (const struct sockaddr_un *)&addr ) );
-    }
-    Error( "Unable to create new SockAddr from addr family %d with size %d", addr.sa_family, len );
-    return( 0 );
+  if ( addr.sa_family == AF_INET && len == SockAddrInet::addrSize() )
+  {
+    return( new SockAddrInet( (const struct sockaddr_in *)&addr ) );
+  }
+  else if ( addr.sa_family == AF_UNIX && len == SockAddrUnix::addrSize() )
+  {
+    return( new SockAddrUnix( (const struct sockaddr_un *)&addr ) );
+  }
+  Error( "Unable to create new SockAddr from addr family %d with size %d", addr.sa_family, len );
+  return( 0 );
 }
 
 SockAddr *SockAddr::newSockAddr( const SockAddr *addr )
 {
-    if ( !addr )
-        return( 0 );
-
-    if ( addr->getDomain() == AF_INET )
-    {
-        return( new SockAddrInet( *(SockAddrInet *)addr ) );
-    }
-    else if ( addr->getDomain() == AF_UNIX )
-    {
-        return( new SockAddrUnix( *(SockAddrUnix *)addr ) );
-    }
-    Error( "Unable to create new SockAddr from addr family %d", addr->getDomain() );
+  if ( !addr )
     return( 0 );
+
+  if ( addr->getDomain() == AF_INET )
+  {
+    return( new SockAddrInet( *(SockAddrInet *)addr ) );
+  }
+  else if ( addr->getDomain() == AF_UNIX )
+  {
+    return( new SockAddrUnix( *(SockAddrUnix *)addr ) );
+  }
+  Error( "Unable to create new SockAddr from addr family %d", addr->getDomain() );
+  return( 0 );
 }
 
 SockAddrInet::SockAddrInet() : SockAddr( (struct sockaddr *)&mAddrIn )
@@ -168,73 +168,73 @@ SockAddrInet::SockAddrInet() : SockAddr( (struct sockaddr *)&mAddrIn )
 
 bool SockAddrInet::resolve( const char *host, const char *serv, const char *proto )
 {
-    memset( &mAddrIn, 0, sizeof(mAddrIn) );
+  memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-    struct hostent *hostent=0;
-    if ( !(hostent = ::gethostbyname( host ) ) )
-    {
-        Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
-        return( false );
-    }
+  struct hostent *hostent=0;
+  if ( !(hostent = ::gethostbyname( host ) ) )
+  {
+    Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
+    return( false );
+  }
 
-    struct servent *servent=0;
-    if ( !(servent = ::getservbyname( serv, proto ) ) )
-    {
-        Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
-        return( false );
-    }
+  struct servent *servent=0;
+  if ( !(servent = ::getservbyname( serv, proto ) ) )
+  {
+    Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
+    return( false );
+  }
 
-    mAddrIn.sin_port = servent->s_port;
-    mAddrIn.sin_family = AF_INET;
-    mAddrIn.sin_addr.s_addr = ((struct in_addr *)(hostent->h_addr))->s_addr;
+  mAddrIn.sin_port = servent->s_port;
+  mAddrIn.sin_family = AF_INET;
+  mAddrIn.sin_addr.s_addr = ((struct in_addr *)(hostent->h_addr))->s_addr;
 
-    return( true );
+  return( true );
 }
 
 bool SockAddrInet::resolve( const char *host, int port, const char *proto )
 {
-    memset( &mAddrIn, 0, sizeof(mAddrIn) );
+  memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-    struct hostent *hostent=0;
-    if ( !(hostent = ::gethostbyname( host ) ) )
-    {
-        Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
-        return( false );
-    }
+  struct hostent *hostent=0;
+  if ( !(hostent = ::gethostbyname( host ) ) )
+  {
+    Error( "gethostbyname( %s ), h_errno = %d", host, h_errno );
+    return( false );
+  }
 
-    mAddrIn.sin_port = htons(port);
-    mAddrIn.sin_family = AF_INET;
-    mAddrIn.sin_addr.s_addr = ((struct in_addr *)(hostent->h_addr))->s_addr;
-    return( true );
+  mAddrIn.sin_port = htons(port);
+  mAddrIn.sin_family = AF_INET;
+  mAddrIn.sin_addr.s_addr = ((struct in_addr *)(hostent->h_addr))->s_addr;
+  return( true );
 }
 
 bool SockAddrInet::resolve( const char *serv, const char *proto )
 {
-    memset( &mAddrIn, 0, sizeof(mAddrIn) );
+  memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-    struct servent *servent=0;
-    if ( !(servent = ::getservbyname( serv, proto ) ) )
-    {
-        Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
-        return( false );
-    }
+  struct servent *servent=0;
+  if ( !(servent = ::getservbyname( serv, proto ) ) )
+  {
+    Error( "getservbyname( %s ), errno = %d, error = %s", serv, errno, strerror(errno) );
+    return( false );
+  }
 
-    mAddrIn.sin_port = servent->s_port;
-    mAddrIn.sin_family = AF_INET;
-	mAddrIn.sin_addr.s_addr = INADDR_ANY;
+  mAddrIn.sin_port = servent->s_port;
+  mAddrIn.sin_family = AF_INET;
+  mAddrIn.sin_addr.s_addr = INADDR_ANY;
 
-    return( true );
+  return( true );
 }
 
 bool SockAddrInet::resolve( int port, const char *proto )
 {
-    memset( &mAddrIn, 0, sizeof(mAddrIn) );
+  memset( &mAddrIn, 0, sizeof(mAddrIn) );
 
-    mAddrIn.sin_port = htons(port);
-    mAddrIn.sin_family = AF_INET;
-	mAddrIn.sin_addr.s_addr = INADDR_ANY;
+  mAddrIn.sin_port = htons(port);
+  mAddrIn.sin_family = AF_INET;
+  mAddrIn.sin_addr.s_addr = INADDR_ANY;
 
-    return( true );
+  return( true );
 }
 
 SockAddrUnix::SockAddrUnix() : SockAddr( (struct sockaddr *)&mAddrUn )
@@ -243,313 +243,313 @@ SockAddrUnix::SockAddrUnix() : SockAddr( (struct sockaddr *)&mAddrUn )
 
 bool SockAddrUnix::resolve( const char *path, const char *proto )
 {
-    memset( &mAddrUn, 0, sizeof(mAddrUn) );
+  memset( &mAddrUn, 0, sizeof(mAddrUn) );
 
-    strncpy( mAddrUn.sun_path, path, sizeof(mAddrUn.sun_path) );
-    mAddrUn.sun_family = AF_UNIX;
+  strncpy( mAddrUn.sun_path, path, sizeof(mAddrUn.sun_path) );
+  mAddrUn.sun_family = AF_UNIX;
 
-    return( true );
+  return( true );
 }
 
 bool Socket::socket()
 {
-    if ( mSd >= 0 )
-        return( true );
+  if ( mSd >= 0 )
+    return( true );
 
-	if ( (mSd = ::socket( getDomain(), getType(), 0 ) ) < 0 )
-	{
-		Error( "socket(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
+  if ( (mSd = ::socket( getDomain(), getType(), 0 ) ) < 0 )
+  {
+    Error( "socket(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
 
-	int val = 1;
+  int val = 1;
 
-	(void)::setsockopt( mSd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val) );
-	(void)::setsockopt( mSd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val) );
+  (void)::setsockopt( mSd, SOL_SOCKET, SO_REUSEADDR, &val, sizeof(val) );
+  (void)::setsockopt( mSd, SOL_SOCKET, SO_KEEPALIVE, &val, sizeof(val) );
 
-    mState = DISCONNECTED;
+  mState = DISCONNECTED;
 
-	return( true );
+  return( true );
 }
 
 bool Socket::connect()
 {
-	if ( !socket() ) 
-		return( false );
+  if ( !socket() ) 
+    return( false );
 
-	if ( ::connect( mSd, mRemoteAddr->getAddr(), getAddrSize() ) == -1 )
-	{
-		Error( "connect(), errno = %d, error = %s", errno, strerror(errno) );
-		close();
-		return( false );
-	}
+  if ( ::connect( mSd, mRemoteAddr->getAddr(), getAddrSize() ) == -1 )
+  {
+    Error( "connect(), errno = %d, error = %s", errno, strerror(errno) );
+    close();
+    return( false );
+  }
 
-    mState = CONNECTED;
+  mState = CONNECTED;
 
-	return( true );
+  return( true );
 }
 
 bool Socket::bind()
 {
-	if ( !socket() )
-		return( false );
+  if ( !socket() )
+    return( false );
 
-	if ( ::bind( mSd, mLocalAddr->getAddr(), getAddrSize() ) == -1 )
-	{
-		Error( "bind(), errno = %d, error = %s", errno, strerror(errno) );
-		close();
-		return( false );
-	}
-    return( true );
+  if ( ::bind( mSd, mLocalAddr->getAddr(), getAddrSize() ) == -1 )
+  {
+    Error( "bind(), errno = %d, error = %s", errno, strerror(errno) );
+    close();
+    return( false );
+  }
+  return( true );
 }
 
 bool Socket::listen()
 {
-	if ( ::listen( mSd, SOMAXCONN ) == -1 )
-	{
-		Error( "listen(), errno = %d, error = %s", errno, strerror(errno) );
-		close();
-		return( false );
-	}
+  if ( ::listen( mSd, SOMAXCONN ) == -1 )
+  {
+    Error( "listen(), errno = %d, error = %s", errno, strerror(errno) );
+    close();
+    return( false );
+  }
 
-    mState = LISTENING;
+  mState = LISTENING;
 
-	return( true );
+  return( true );
 }
 
 bool Socket::accept()
 {
-    struct sockaddr *rem_addr = mLocalAddr->getTempAddr();
-    socklen_t rem_addr_size = getAddrSize();
+  struct sockaddr *rem_addr = mLocalAddr->getTempAddr();
+  socklen_t rem_addr_size = getAddrSize();
 
-    int newSd = -1;
-    if ( (newSd = ::accept( mSd, rem_addr, &rem_addr_size )) == -1 )
-    {
-        Error( "accept(), errno = %d, error = %s", errno, strerror(errno) );
-        close();
-        return( false );
-    }
+  int newSd = -1;
+  if ( (newSd = ::accept( mSd, rem_addr, &rem_addr_size )) == -1 )
+  {
+    Error( "accept(), errno = %d, error = %s", errno, strerror(errno) );
+    close();
+    return( false );
+  }
 
-	::close( mSd );
-	mSd = newSd;
+  ::close( mSd );
+  mSd = newSd;
 
-    mState = CONNECTED;
+  mState = CONNECTED;
 
-	return( true );
+  return( true );
 }
 
 bool Socket::accept( int &newSd )
 {
-    struct sockaddr *rem_addr = mLocalAddr->getTempAddr();
-    socklen_t rem_addr_size = getAddrSize();
+  struct sockaddr *rem_addr = mLocalAddr->getTempAddr();
+  socklen_t rem_addr_size = getAddrSize();
 
-    newSd = -1;
-    if ( (newSd = ::accept( mSd, rem_addr, &rem_addr_size )) == -1 )
-    {
-        Error( "accept(), errno = %d, error = %s", errno, strerror(errno) );
-        close();
-        return( false );
-    }
+  newSd = -1;
+  if ( (newSd = ::accept( mSd, rem_addr, &rem_addr_size )) == -1 )
+  {
+    Error( "accept(), errno = %d, error = %s", errno, strerror(errno) );
+    close();
+    return( false );
+  }
 
-	return( true );
+  return( true );
 }
 
 bool Socket::close()
 {
-	if ( mSd > -1 ) ::close( mSd );
-	mSd = -1;
-    mState = CLOSED;
-	return( true );
+  if ( mSd > -1 ) ::close( mSd );
+  mSd = -1;
+  mState = CLOSED;
+  return( true );
 }
 
 int Socket::bytesToRead() const
 {
-	int bytes_to_read = 0;
+  int bytes_to_read = 0;
 
-	if ( ioctl( mSd, FIONREAD, &bytes_to_read ) < 0 )
-	{
-		Error( "ioctl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( -1 );
-	}
-	return( bytes_to_read );
+  if ( ioctl( mSd, FIONREAD, &bytes_to_read ) < 0 )
+  {
+    Error( "ioctl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( -1 );
+  }
+  return( bytes_to_read );
 }
 
 bool Socket::getBlocking( bool &blocking )
 {
-	int flags;
+  int flags;
 
-	if ( (flags = fcntl( mSd, F_GETFL )) < 0 )
-	{
-		Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	blocking = (flags & O_NONBLOCK);
-	return( true );
+  if ( (flags = fcntl( mSd, F_GETFL )) < 0 )
+  {
+    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  blocking = (flags & O_NONBLOCK);
+  return( true );
 }
 
 bool Socket::setBlocking( bool blocking )
 {
 #if 0
-	// ioctl is apparently not recommended
-	int ioctl_arg = !blocking;
-	if ( ioctl( mSd, FIONBIO, &ioctl_arg ) < 0 )
-	{
-		Error( "ioctl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	return( true );
+  // ioctl is apparently not recommended
+  int ioctl_arg = !blocking;
+  if ( ioctl( mSd, FIONBIO, &ioctl_arg ) < 0 )
+  {
+    Error( "ioctl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  return( true );
 #endif
 
-	int flags;
+  int flags;
 
-	/* Now set it for non-blocking I/O */
-	if ( (flags = fcntl( mSd, F_GETFL )) < 0 )
-	{
-		Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	if ( blocking )
-	{
-		flags &= ~O_NONBLOCK;
-	}
-	else
-	{
-		flags |= O_NONBLOCK;
-	}
-	if ( fcntl( mSd, F_SETFL, flags ) < 0 )
-	{
-		Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
+  /* Now set it for non-blocking I/O */
+  if ( (flags = fcntl( mSd, F_GETFL )) < 0 )
+  {
+    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  if ( blocking )
+  {
+    flags &= ~O_NONBLOCK;
+  }
+  else
+  {
+    flags |= O_NONBLOCK;
+  }
+  if ( fcntl( mSd, F_SETFL, flags ) < 0 )
+  {
+    Error( "fcntl(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
 
-	return( true );
+  return( true );
 }
 
 bool Socket::getSendBufferSize( int &buffersize ) const
 {
-	socklen_t optlen = sizeof(buffersize);
-	if ( getsockopt( mSd, SOL_SOCKET, SO_SNDBUF, &buffersize, &optlen ) < 0 )
-	{
-		Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( -1 );
-	}
-	return( buffersize );
+  socklen_t optlen = sizeof(buffersize);
+  if ( getsockopt( mSd, SOL_SOCKET, SO_SNDBUF, &buffersize, &optlen ) < 0 )
+  {
+    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( -1 );
+  }
+  return( buffersize );
 }
 
 bool Socket::getRecvBufferSize( int &buffersize ) const
 {
-	socklen_t optlen = sizeof(buffersize);
-	if ( getsockopt( mSd, SOL_SOCKET, SO_RCVBUF, &buffersize, &optlen ) < 0 )
-	{
-		Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( -1 );
-	}
-	return( buffersize );
+  socklen_t optlen = sizeof(buffersize);
+  if ( getsockopt( mSd, SOL_SOCKET, SO_RCVBUF, &buffersize, &optlen ) < 0 )
+  {
+    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( -1 );
+  }
+  return( buffersize );
 }
 
 bool Socket::setSendBufferSize( int buffersize )
 {
-	if ( setsockopt( mSd, SOL_SOCKET, SO_SNDBUF, (char *)&buffersize, sizeof(buffersize)) < 0 )
-	{
-		Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	return( true );
+  if ( setsockopt( mSd, SOL_SOCKET, SO_SNDBUF, (char *)&buffersize, sizeof(buffersize)) < 0 )
+  {
+    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  return( true );
 }
 
 bool Socket::setRecvBufferSize( int buffersize )
 {
-	if ( setsockopt( mSd, SOL_SOCKET, SO_RCVBUF, (char *)&buffersize, sizeof(buffersize)) < 0 )
-	{
-		Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	return( true );
+  if ( setsockopt( mSd, SOL_SOCKET, SO_RCVBUF, (char *)&buffersize, sizeof(buffersize)) < 0 )
+  {
+    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  return( true );
 }
 
 bool Socket::getRouting( bool &route ) const
 {
-	int dontRoute;
-	socklen_t optlen = sizeof(dontRoute);
-	if ( getsockopt( mSd, SOL_SOCKET, SO_DONTROUTE, &dontRoute, &optlen ) < 0 )
-	{
-		Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	route = !dontRoute;
-	return( true );
+  int dontRoute;
+  socklen_t optlen = sizeof(dontRoute);
+  if ( getsockopt( mSd, SOL_SOCKET, SO_DONTROUTE, &dontRoute, &optlen ) < 0 )
+  {
+    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  route = !dontRoute;
+  return( true );
 }
 
 bool Socket::setRouting( bool route )
 {
-	int dontRoute = !route;
-	if ( setsockopt( mSd, SOL_SOCKET, SO_DONTROUTE, (char *)&dontRoute, sizeof(dontRoute)) < 0 )
-	{
-		Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	return( true );
+  int dontRoute = !route;
+  if ( setsockopt( mSd, SOL_SOCKET, SO_DONTROUTE, (char *)&dontRoute, sizeof(dontRoute)) < 0 )
+  {
+    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  return( true );
 }
 
 bool Socket::getNoDelay( bool &nodelay ) const
 {
-	int int_nodelay;
-	socklen_t optlen = sizeof(int_nodelay);
-	if ( getsockopt( mSd, IPPROTO_TCP, TCP_NODELAY, &int_nodelay, &optlen ) < 0 )
-	{
-		Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	nodelay = int_nodelay;
-	return( true );
+  int int_nodelay;
+  socklen_t optlen = sizeof(int_nodelay);
+  if ( getsockopt( mSd, IPPROTO_TCP, TCP_NODELAY, &int_nodelay, &optlen ) < 0 )
+  {
+    Error( "getsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  nodelay = int_nodelay;
+  return( true );
 }
 
 bool Socket::setNoDelay( bool nodelay )
 {
-	int int_nodelay = nodelay;
+  int int_nodelay = nodelay;
 
-	if ( setsockopt( mSd, IPPROTO_TCP, TCP_NODELAY, (char *)&int_nodelay, sizeof(int_nodelay)) < 0 )
-	{
-		Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
-		return( false );
-	}
-	return( true );
+  if ( setsockopt( mSd, IPPROTO_TCP, TCP_NODELAY, (char *)&int_nodelay, sizeof(int_nodelay)) < 0 )
+  {
+    Error( "setsockopt(), errno = %d, error = %s", errno, strerror(errno) );
+    return( false );
+  }
+  return( true );
 }
 
 bool TcpInetServer::listen()
 {
-    return( Socket::listen() );
+  return( Socket::listen() );
 }
 
 bool TcpInetServer::accept()
 {
-    return( Socket::accept() );
+  return( Socket::accept() );
 }
 
 bool TcpInetServer::accept( TcpInetSocket *&newSocket )
 {
-    int newSd = -1;
-    newSocket = 0;
+  int newSd = -1;
+  newSocket = 0;
 
-    if ( !Socket::accept( newSd ) )
-        return( false );
+  if ( !Socket::accept( newSd ) )
+    return( false );
 
-	newSocket = new TcpInetSocket( *this, newSd );
+  newSocket = new TcpInetSocket( *this, newSd );
 
-    return( true );
+  return( true );
 }
 
 bool TcpUnixServer::accept( TcpUnixSocket *&newSocket )
 {
-    int newSd = -1;
-    newSocket = 0;
+  int newSd = -1;
+  newSocket = 0;
 
-    if ( !Socket::accept( newSd ) )
-        return( false );
+  if ( !Socket::accept( newSd ) )
+    return( false );
 
-	newSocket = new TcpUnixSocket( *this, newSd );
+  newSocket = new TcpUnixSocket( *this, newSd );
 
-    return( true );
+  return( true );
 }
 
 Select::Select() : mHasTimeout( false ), mMaxFd( -1 )
@@ -558,160 +558,160 @@ Select::Select() : mHasTimeout( false ), mMaxFd( -1 )
 
 Select::Select( struct timeval timeout ) : mMaxFd( -1 )
 {
-    setTimeout( timeout );
+  setTimeout( timeout );
 }
 
 Select::Select( int timeout ) : mMaxFd( -1 )
 {
-    setTimeout( timeout );
+  setTimeout( timeout );
 }
 
 Select::Select( double timeout ) : mMaxFd( -1 )
 {
-    setTimeout( timeout );
+  setTimeout( timeout );
 }
 
 void Select::setTimeout( int timeout )
 {
-    mTimeout.tv_sec = timeout;
-    mTimeout.tv_usec = 0;
-    mHasTimeout = true;
+  mTimeout.tv_sec = timeout;
+  mTimeout.tv_usec = 0;
+  mHasTimeout = true;
 }
 
 void Select::setTimeout( double timeout )
 {
-    mTimeout.tv_sec = int(timeout);
-    mTimeout.tv_usec = suseconds_t((timeout-mTimeout.tv_sec)*1000000.0);
-    mHasTimeout = true;
+  mTimeout.tv_sec = int(timeout);
+  mTimeout.tv_usec = suseconds_t((timeout-mTimeout.tv_sec)*1000000.0);
+  mHasTimeout = true;
 }
 
 void Select::setTimeout( struct timeval timeout )
 {
-    mTimeout = timeout;
-    mHasTimeout = true;
+  mTimeout = timeout;
+  mHasTimeout = true;
 }
 
 void Select::clearTimeout()
 {
-    mHasTimeout = false;
+  mHasTimeout = false;
 }
 
 void Select::calcMaxFd()
 {
-    mMaxFd = -1;
-    for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
-        if ( (*iter)->getMaxDesc() > mMaxFd )
-            mMaxFd = (*iter)->getMaxDesc();
-    for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
-        if ( (*iter)->getMaxDesc() > mMaxFd )
-            mMaxFd = (*iter)->getMaxDesc();
+  mMaxFd = -1;
+  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
+    if ( (*iter)->getMaxDesc() > mMaxFd )
+      mMaxFd = (*iter)->getMaxDesc();
+  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
+    if ( (*iter)->getMaxDesc() > mMaxFd )
+      mMaxFd = (*iter)->getMaxDesc();
 }
 
 bool Select::addReader( CommsBase *comms )
 {
-    if ( !comms->isOpen() )
-    {
-        Error( "Unable to add closed reader" );
-        return( false );
-    }
-    std::pair<CommsSet::iterator,bool> result = mReaders.insert( comms );
-    if ( result.second )
-        if ( comms->getMaxDesc() > mMaxFd )
-            mMaxFd = comms->getMaxDesc();
-    return( result.second );
+  if ( !comms->isOpen() )
+  {
+    Error( "Unable to add closed reader" );
+    return( false );
+  }
+  std::pair<CommsSet::iterator,bool> result = mReaders.insert( comms );
+  if ( result.second )
+    if ( comms->getMaxDesc() > mMaxFd )
+      mMaxFd = comms->getMaxDesc();
+  return( result.second );
 }
 
 bool Select::deleteReader( CommsBase *comms )
 {
-    if ( !comms->isOpen() )
-    {
-        Error( "Unable to add closed reader" );
-        return( false );
-    }
-    if ( mReaders.erase( comms ) )
-    {
-        calcMaxFd();
-        return( true );
-    }
+  if ( !comms->isOpen() )
+  {
+    Error( "Unable to add closed reader" );
     return( false );
+  }
+  if ( mReaders.erase( comms ) )
+  {
+    calcMaxFd();
+    return( true );
+  }
+  return( false );
 }
 
 void Select::clearReaders()
 {
-    mReaders.clear();
-    mMaxFd = -1;
+  mReaders.clear();
+  mMaxFd = -1;
 }
 
 bool Select::addWriter( CommsBase *comms )
 {
-    std::pair<CommsSet::iterator,bool> result = mWriters.insert( comms );
-    if ( result.second )
-        if ( comms->getMaxDesc() > mMaxFd )
-            mMaxFd = comms->getMaxDesc();
-    return( result.second );
+  std::pair<CommsSet::iterator,bool> result = mWriters.insert( comms );
+  if ( result.second )
+    if ( comms->getMaxDesc() > mMaxFd )
+      mMaxFd = comms->getMaxDesc();
+  return( result.second );
 }
 
 bool Select::deleteWriter( CommsBase *comms )
 {
-    if ( mWriters.erase( comms ) )
-    {
-        calcMaxFd();
-        return( true );
-    }
-    return( false );
+  if ( mWriters.erase( comms ) )
+  {
+    calcMaxFd();
+    return( true );
+  }
+  return( false );
 }
 
 void Select::clearWriters()
 {
-    mWriters.clear();
-    mMaxFd = -1;
+  mWriters.clear();
+  mMaxFd = -1;
 }
 
 int Select::wait()
 {
-    struct timeval tempTimeout = mTimeout;
-    struct timeval *selectTimeout = mHasTimeout?&tempTimeout:NULL;
+  struct timeval tempTimeout = mTimeout;
+  struct timeval *selectTimeout = mHasTimeout?&tempTimeout:NULL;
 
-    fd_set rfds;
-    fd_set wfds;
+  fd_set rfds;
+  fd_set wfds;
 
-    mReadable.clear();
-    FD_ZERO(&rfds);
+  mReadable.clear();
+  FD_ZERO(&rfds);
+  for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
+    FD_SET((*iter)->getReadDesc(),&rfds);
+
+  mWriteable.clear();
+  FD_ZERO(&wfds);
+  for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
+    FD_SET((*iter)->getWriteDesc(),&wfds);
+
+  int nFound = select( mMaxFd+1, &rfds, &wfds, NULL, selectTimeout );
+  if( nFound == 0 )
+  {
+    Debug( 1, "Select timed out" );
+  }
+  else if ( nFound < 0)
+  {
+    Error( "Select error: %s", strerror(errno) );
+  }
+  else
+  {
     for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
-        FD_SET((*iter)->getReadDesc(),&rfds);
-
-    mWriteable.clear();
-    FD_ZERO(&wfds);
+      if ( FD_ISSET((*iter)->getReadDesc(),&rfds) )
+        mReadable.push_back( *iter );
     for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
-        FD_SET((*iter)->getWriteDesc(),&wfds);
-
-    int nFound = select( mMaxFd+1, &rfds, &wfds, NULL, selectTimeout );
-    if( nFound == 0 )
-    {
-        Debug( 1, "Select timed out" );
-    }
-    else if ( nFound < 0)
-    {
-        Error( "Select error: %s", strerror(errno) );
-    }
-    else
-    {
-        for ( CommsSet::iterator iter = mReaders.begin(); iter != mReaders.end(); iter++ )
-            if ( FD_ISSET((*iter)->getReadDesc(),&rfds) )
-                mReadable.push_back( *iter );
-        for ( CommsSet::iterator iter = mWriters.begin(); iter != mWriters.end(); iter++ )
-            if ( FD_ISSET((*iter)->getWriteDesc(),&rfds) )
-                mWriteable.push_back( *iter );
-    }
-    return( nFound );
+      if ( FD_ISSET((*iter)->getWriteDesc(),&rfds) )
+        mWriteable.push_back( *iter );
+  }
+  return( nFound );
 }
 
 const Select::CommsList &Select::getReadable() const
 {
-    return( mReadable );
+  return( mReadable );
 }
 
 const Select::CommsList &Select::getWriteable() const
 {
-    return( mWriteable );
+  return( mWriteable );
 }
diff --git a/src/zm_comms.h b/src/zm_comms.h
index ef1dda833..d0143917c 100644
--- a/src/zm_comms.h
+++ b/src/zm_comms.h
@@ -40,857 +40,857 @@
 class CommsException : public Exception
 {
 public:
-    CommsException( const std::string &message ) : Exception( message )
-    {
-    }
+  CommsException( const std::string &message ) : Exception( message )
+  {
+  }
 };
 
 class CommsBase
 {
 protected:
-	const int	&mRd;
-	const int	&mWd;
+  const int  &mRd;
+  const int  &mWd;
 
 protected:
-	CommsBase( int &rd, int &wd ) : mRd( rd ), mWd( wd )
-	{
-	}
-	virtual ~CommsBase()
-	{
-	}
+  CommsBase( int &rd, int &wd ) : mRd( rd ), mWd( wd )
+  {
+  }
+  virtual ~CommsBase()
+  {
+  }
 
 public:
-	virtual bool close()=0;
-	virtual bool isOpen() const=0;
-	virtual bool isClosed() const=0;
-	virtual bool setBlocking( bool blocking )=0;
+  virtual bool close()=0;
+  virtual bool isOpen() const=0;
+  virtual bool isClosed() const=0;
+  virtual bool setBlocking( bool blocking )=0;
 
 public:
-	int getReadDesc() const
-    {
-        return( mRd );
-    }
-	int getWriteDesc() const
-    {
-        return( mWd );
-    }
-	int getMaxDesc() const
-    {
-        return( mRd>mWd?mRd:mWd );
-    }
+  int getReadDesc() const
+  {
+    return( mRd );
+  }
+  int getWriteDesc() const
+  {
+    return( mWd );
+  }
+  int getMaxDesc() const
+  {
+    return( mRd>mWd?mRd:mWd );
+  }
 
-	virtual int read( void *msg, int len )
-	{
-		ssize_t nBytes = ::read( mRd, msg, len );
-        if ( nBytes < 0 )
-            Debug( 1, "Read of %d bytes max on rd %d failed: %s", len, mRd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int write( const void *msg, int len )
-	{
-		ssize_t nBytes = ::write( mWd, msg, len );
-        if ( nBytes < 0 )
-            Debug( 1, "Write of %d bytes on wd %d failed: %s", len, mWd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int readV( const struct iovec *iov, int iovcnt )
-	{
-		int nBytes = ::readv( mRd, iov, iovcnt );
-        if ( nBytes < 0 )
-            Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int writeV( const struct iovec *iov, int iovcnt )
-	{
-		ssize_t nBytes = ::writev( mWd, iov, iovcnt );
-        if ( nBytes < 0 )
-            Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int readV( int iovcnt, /* const void *msg1, int len1, */ ... );
-	virtual int writeV( int iovcnt, /* const void *msg1, int len1, */ ... );
+  virtual int read( void *msg, int len )
+  {
+    ssize_t nBytes = ::read( mRd, msg, len );
+    if ( nBytes < 0 )
+      Debug( 1, "Read of %d bytes max on rd %d failed: %s", len, mRd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int write( const void *msg, int len )
+  {
+    ssize_t nBytes = ::write( mWd, msg, len );
+    if ( nBytes < 0 )
+      Debug( 1, "Write of %d bytes on wd %d failed: %s", len, mWd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int readV( const struct iovec *iov, int iovcnt )
+  {
+    int nBytes = ::readv( mRd, iov, iovcnt );
+    if ( nBytes < 0 )
+      Debug( 1, "Readv of %d buffers max on rd %d failed: %s", iovcnt, mRd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int writeV( const struct iovec *iov, int iovcnt )
+  {
+    ssize_t nBytes = ::writev( mWd, iov, iovcnt );
+    if ( nBytes < 0 )
+      Debug( 1, "Writev of %d buffers on wd %d failed: %s", iovcnt, mWd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int readV( int iovcnt, /* const void *msg1, int len1, */ ... );
+  virtual int writeV( int iovcnt, /* const void *msg1, int len1, */ ... );
 };
 
 class Pipe : public CommsBase
 {
 protected:
-	int mFd[2];
+  int mFd[2];
 
 public:
-	Pipe() : CommsBase( mFd[0], mFd[1] )
-	{
-		mFd[0] = -1;
-		mFd[1] = -1;
-	}
-	~Pipe()
-	{
-        close();
-	}
+  Pipe() : CommsBase( mFd[0], mFd[1] )
+  {
+    mFd[0] = -1;
+    mFd[1] = -1;
+  }
+  ~Pipe()
+  {
+    close();
+  }
 
 public:
-	bool open();
-	bool close();
+  bool open();
+  bool close();
 
-	bool isOpen() const
-	{
-		return( mFd[0] != -1 && mFd[1] != -1 );
-	}
-	int getReadDesc() const
-	{
-		return( mFd[0] );
-	}
-	int getWriteDesc() const
-	{
-		return( mFd[1] );
-	}
+  bool isOpen() const
+  {
+    return( mFd[0] != -1 && mFd[1] != -1 );
+  }
+  int getReadDesc() const
+  {
+    return( mFd[0] );
+  }
+  int getWriteDesc() const
+  {
+    return( mFd[1] );
+  }
 
-	bool setBlocking( bool blocking );
+  bool setBlocking( bool blocking );
 };
 
 class SockAddr
 {
 private:
-    const struct sockaddr *mAddr;
+  const struct sockaddr *mAddr;
 
 public:
-    SockAddr( const struct sockaddr *addr );
-    virtual ~SockAddr()
-    {
-    }
+  SockAddr( const struct sockaddr *addr );
+  virtual ~SockAddr()
+  {
+  }
 
-    static SockAddr *newSockAddr( const struct sockaddr &addr, socklen_t len );
-    static SockAddr *newSockAddr( const SockAddr *addr );
+  static SockAddr *newSockAddr( const struct sockaddr &addr, socklen_t len );
+  static SockAddr *newSockAddr( const SockAddr *addr );
 
-    int getDomain() const
-    {
-        return( mAddr?mAddr->sa_family:AF_UNSPEC );
-    }
+  int getDomain() const
+  {
+    return( mAddr?mAddr->sa_family:AF_UNSPEC );
+  }
 
-    const struct sockaddr *getAddr() const
-    {
-        return( mAddr );
-    }
-    virtual socklen_t getAddrSize() const=0;
-    virtual struct sockaddr *getTempAddr() const=0;
+  const struct sockaddr *getAddr() const
+  {
+    return( mAddr );
+  }
+  virtual socklen_t getAddrSize() const=0;
+  virtual struct sockaddr *getTempAddr() const=0;
 };
 
 class SockAddrInet : public SockAddr
 {
 private:
-    struct sockaddr_in  mAddrIn;
-    struct sockaddr_in  mTempAddrIn;
+  struct sockaddr_in  mAddrIn;
+  struct sockaddr_in  mTempAddrIn;
 
 public:
-	SockAddrInet();
-	SockAddrInet( const SockAddrInet &addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( addr.mAddrIn )
-    {
-    }
-	SockAddrInet( const struct sockaddr_in *addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( *addr )
-    {
-    }
+  SockAddrInet();
+  SockAddrInet( const SockAddrInet &addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( addr.mAddrIn )
+  {
+  }
+  SockAddrInet( const struct sockaddr_in *addr ) : SockAddr( (const struct sockaddr *)&mAddrIn ), mAddrIn( *addr )
+  {
+  }
 
 
-	bool resolve( const char *host, const char *serv, const char *proto );
-	bool resolve( const char *host, int port, const char *proto );
-	bool resolve( const char *serv, const char *proto );
-	bool resolve( int port, const char *proto );
+  bool resolve( const char *host, const char *serv, const char *proto );
+  bool resolve( const char *host, int port, const char *proto );
+  bool resolve( const char *serv, const char *proto );
+  bool resolve( int port, const char *proto );
 
-    socklen_t getAddrSize() const
-    {
-        return( sizeof(mAddrIn) );
-    }
-    struct sockaddr *getTempAddr() const
-    {
-        return( (sockaddr *)&mTempAddrIn );
-    }
+  socklen_t getAddrSize() const
+  {
+    return( sizeof(mAddrIn) );
+  }
+  struct sockaddr *getTempAddr() const
+  {
+    return( (sockaddr *)&mTempAddrIn );
+  }
 
 public:
-    static socklen_t addrSize()
-    {
-        return( sizeof(sockaddr_in) );
-    }
+  static socklen_t addrSize()
+  {
+    return( sizeof(sockaddr_in) );
+  }
 };
 
 class SockAddrUnix : public SockAddr
 {
 private:
-    struct sockaddr_un  mAddrUn;
-    struct sockaddr_un  mTempAddrUn;
+  struct sockaddr_un  mAddrUn;
+  struct sockaddr_un  mTempAddrUn;
 
 public:
-	SockAddrUnix();
-	SockAddrUnix( const SockAddrUnix &addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( addr.mAddrUn )
-    {
-    }
-	SockAddrUnix( const struct sockaddr_un *addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( *addr )
-    {
-    }
+  SockAddrUnix();
+  SockAddrUnix( const SockAddrUnix &addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( addr.mAddrUn )
+  {
+  }
+  SockAddrUnix( const struct sockaddr_un *addr ) : SockAddr( (const struct sockaddr *)&mAddrUn ), mAddrUn( *addr )
+  {
+  }
 
-	bool resolve( const char *path, const char *proto );
+  bool resolve( const char *path, const char *proto );
 
-    socklen_t getAddrSize() const
-    {
-        return( sizeof(mAddrUn) );
-    }
-    struct sockaddr *getTempAddr() const
-    {
-        return( (sockaddr *)&mTempAddrUn );
-    }
+  socklen_t getAddrSize() const
+  {
+    return( sizeof(mAddrUn) );
+  }
+  struct sockaddr *getTempAddr() const
+  {
+    return( (sockaddr *)&mTempAddrUn );
+  }
 
 public:
-    static socklen_t addrSize()
-    {
-        return( sizeof(sockaddr_un) );
-    }
+  static socklen_t addrSize()
+  {
+    return( sizeof(sockaddr_un) );
+  }
 };
 
 class Socket : public CommsBase
 {
 protected:
-    typedef enum { CLOSED, DISCONNECTED, LISTENING, CONNECTED } State;
+  typedef enum { CLOSED, DISCONNECTED, LISTENING, CONNECTED } State;
 
 protected:
-	int	mSd;
-    State mState;
-    SockAddr *mLocalAddr;
-    SockAddr *mRemoteAddr;
+  int  mSd;
+  State mState;
+  SockAddr *mLocalAddr;
+  SockAddr *mRemoteAddr;
 
 protected:
-	Socket() : CommsBase( mSd, mSd ), mSd( -1 ), mState( CLOSED ), mLocalAddr( 0 ), mRemoteAddr( 0 )
-	{
-	}
-	Socket( const Socket &socket, int newSd ) : CommsBase( mSd, mSd ), mSd( newSd ), mState( CONNECTED ), mLocalAddr( 0 ), mRemoteAddr( 0 )
-	{
-        if ( socket.mLocalAddr )
-            mLocalAddr = SockAddr::newSockAddr( mLocalAddr );
-        if ( socket.mRemoteAddr )
-            mRemoteAddr = SockAddr::newSockAddr( mRemoteAddr );
-	}
-	virtual ~Socket()
-	{
-		close();
-        delete mLocalAddr;
-        delete mRemoteAddr;
-	}
+  Socket() : CommsBase( mSd, mSd ), mSd( -1 ), mState( CLOSED ), mLocalAddr( 0 ), mRemoteAddr( 0 )
+  {
+  }
+  Socket( const Socket &socket, int newSd ) : CommsBase( mSd, mSd ), mSd( newSd ), mState( CONNECTED ), mLocalAddr( 0 ), mRemoteAddr( 0 )
+  {
+    if ( socket.mLocalAddr )
+      mLocalAddr = SockAddr::newSockAddr( mLocalAddr );
+    if ( socket.mRemoteAddr )
+      mRemoteAddr = SockAddr::newSockAddr( mRemoteAddr );
+  }
+  virtual ~Socket()
+  {
+    close();
+    delete mLocalAddr;
+    delete mRemoteAddr;
+  }
 
 public:
-    bool isOpen() const
-    {
-        return( !isClosed() );
-    }
-    bool isClosed() const
-    {
-        return( mState == CLOSED );
-    }
-    bool isDisconnected() const
-    {
-        return( mState == DISCONNECTED );
-    }
-    bool isConnected() const
-    {
-        return( mState == CONNECTED );
-    }
-	virtual bool close();
+  bool isOpen() const
+  {
+    return( !isClosed() );
+  }
+  bool isClosed() const
+  {
+    return( mState == CLOSED );
+  }
+  bool isDisconnected() const
+  {
+    return( mState == DISCONNECTED );
+  }
+  bool isConnected() const
+  {
+    return( mState == CONNECTED );
+  }
+  virtual bool close();
 
 protected:
-    bool isListening() const
-    {
-        return( mState == LISTENING );
-    }
+  bool isListening() const
+  {
+    return( mState == LISTENING );
+  }
 
 protected:
-	virtual bool socket();
-	virtual bool bind();
+  virtual bool socket();
+  virtual bool bind();
 
 protected:
-	virtual bool connect();
-	virtual bool listen();
-	virtual bool accept();
-	virtual bool accept( int & );
+  virtual bool connect();
+  virtual bool listen();
+  virtual bool accept();
+  virtual bool accept( int & );
 
 public:
-	virtual int send( const void *msg, int len ) const
-	{
-		ssize_t nBytes = ::send( mSd, msg, len, 0 );
-        if ( nBytes < 0 )
-            Debug( 1, "Send of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int recv( void *msg, int len ) const
-	{
-		ssize_t nBytes = ::recv( mSd, msg, len, 0 );
-        if ( nBytes < 0 )
-            Debug( 1, "Recv of %d bytes max on sd %d failed: %s", len, mSd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int send( const std::string &msg ) const
-	{
-		ssize_t nBytes = ::send( mSd, msg.data(), msg.size(), 0 );
-        if ( nBytes < 0 )
-            Debug( 1, "Send of string '%s' (%zd bytes) on sd %d failed: %s", msg.c_str(), msg.size(), mSd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int recv( std::string &msg ) const
-	{
-        char buffer[msg.capacity()];
-        int nBytes = 0;
-		if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 )
-        {
-            Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", sizeof(buffer), mSd, strerror(errno) );
-            return( nBytes );
-        }
-        buffer[nBytes] = '\0';
-        msg = buffer;
-        return( nBytes );
-	}
-	virtual int recv( std::string &msg, size_t maxLen ) const
-	{
-        char buffer[maxLen];
-        int nBytes = 0;
-		if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 )
-        {
-            Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", maxLen, mSd, strerror(errno) );
-            return( nBytes );
-        }
-        buffer[nBytes] = '\0';
-        msg = buffer;
-        return( nBytes );
-	}
-	virtual int bytesToRead() const;
-
-	int getDesc() const
-	{
-		return( mSd );
-	}
-	//virtual bool isOpen() const
-	//{
-		//return( mSd != -1 );
-	//}
-
-    virtual int getDomain() const=0;
-    virtual int getType() const=0;
-    virtual const char *getProtocol() const=0;
-
-    const SockAddr *getLocalAddr() const
+  virtual int send( const void *msg, int len ) const
+  {
+    ssize_t nBytes = ::send( mSd, msg, len, 0 );
+    if ( nBytes < 0 )
+      Debug( 1, "Send of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int recv( void *msg, int len ) const
+  {
+    ssize_t nBytes = ::recv( mSd, msg, len, 0 );
+    if ( nBytes < 0 )
+      Debug( 1, "Recv of %d bytes max on sd %d failed: %s", len, mSd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int send( const std::string &msg ) const
+  {
+    ssize_t nBytes = ::send( mSd, msg.data(), msg.size(), 0 );
+    if ( nBytes < 0 )
+      Debug( 1, "Send of string '%s' (%zd bytes) on sd %d failed: %s", msg.c_str(), msg.size(), mSd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int recv( std::string &msg ) const
+  {
+    char buffer[msg.capacity()];
+    int nBytes = 0;
+    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 )
     {
-        return( mLocalAddr );
+      Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", sizeof(buffer), mSd, strerror(errno) );
+      return( nBytes );
     }
-    const SockAddr *getRemoteAddr() const
+    buffer[nBytes] = '\0';
+    msg = buffer;
+    return( nBytes );
+  }
+  virtual int recv( std::string &msg, size_t maxLen ) const
+  {
+    char buffer[maxLen];
+    int nBytes = 0;
+    if ( (nBytes = ::recv( mSd, buffer, sizeof(buffer), 0 )) < 0 )
     {
-        return( mRemoteAddr );
+      Debug( 1, "Recv of %zd bytes max to string on sd %d failed: %s", maxLen, mSd, strerror(errno) );
+      return( nBytes );
     }
-    virtual socklen_t getAddrSize() const=0;
+    buffer[nBytes] = '\0';
+    msg = buffer;
+    return( nBytes );
+  }
+  virtual int bytesToRead() const;
 
-	bool getBlocking( bool &blocking );
-	bool setBlocking( bool blocking );
+  int getDesc() const
+  {
+    return( mSd );
+  }
+  //virtual bool isOpen() const
+  //{
+    //return( mSd != -1 );
+  //}
 
-	bool getSendBufferSize( int & ) const;
-	bool getRecvBufferSize( int & ) const;
+  virtual int getDomain() const=0;
+  virtual int getType() const=0;
+  virtual const char *getProtocol() const=0;
 
-	bool setSendBufferSize( int );
-	bool setRecvBufferSize( int );
+  const SockAddr *getLocalAddr() const
+  {
+    return( mLocalAddr );
+  }
+  const SockAddr *getRemoteAddr() const
+  {
+    return( mRemoteAddr );
+  }
+  virtual socklen_t getAddrSize() const=0;
 
-	bool getRouting( bool & ) const;
-	bool setRouting( bool );
+  bool getBlocking( bool &blocking );
+  bool setBlocking( bool blocking );
 
-	bool getNoDelay( bool & ) const;
-	bool setNoDelay( bool );
+  bool getSendBufferSize( int & ) const;
+  bool getRecvBufferSize( int & ) const;
+
+  bool setSendBufferSize( int );
+  bool setRecvBufferSize( int );
+
+  bool getRouting( bool & ) const;
+  bool setRouting( bool );
+
+  bool getNoDelay( bool & ) const;
+  bool setNoDelay( bool );
 };
 
 class InetSocket : virtual public Socket
 {
 public:
-    int getDomain() const
-    {
-        return( AF_INET );
-    }
-    virtual socklen_t getAddrSize() const
-    {
-        return( SockAddrInet::addrSize() );
-    }
+  int getDomain() const
+  {
+    return( AF_INET );
+  }
+  virtual socklen_t getAddrSize() const
+  {
+    return( SockAddrInet::addrSize() );
+  }
 
 protected:
-    bool resolveLocal( const char *host, const char *serv, const char *proto )
-    {
-        SockAddrInet *addr = new SockAddrInet;
-        mLocalAddr = addr;
-        return( addr->resolve( host, serv, proto ) );
-    }
-    bool resolveLocal( const char *host, int port, const char *proto )
-    {
-        SockAddrInet *addr = new SockAddrInet;
-        mLocalAddr = addr;
-        return( addr->resolve( host, port, proto ) );
-    }
-    bool resolveLocal( const char *serv, const char *proto )
-    {
-        SockAddrInet *addr = new SockAddrInet;
-        mLocalAddr = addr;
-        return( addr->resolve( serv, proto ) );
-    }
-    bool resolveLocal( int port, const char *proto )
-    {
-        SockAddrInet *addr = new SockAddrInet;
-        mLocalAddr = addr;
-        return( addr->resolve( port, proto ) );
-    }
+  bool resolveLocal( const char *host, const char *serv, const char *proto )
+  {
+    SockAddrInet *addr = new SockAddrInet;
+    mLocalAddr = addr;
+    return( addr->resolve( host, serv, proto ) );
+  }
+  bool resolveLocal( const char *host, int port, const char *proto )
+  {
+    SockAddrInet *addr = new SockAddrInet;
+    mLocalAddr = addr;
+    return( addr->resolve( host, port, proto ) );
+  }
+  bool resolveLocal( const char *serv, const char *proto )
+  {
+    SockAddrInet *addr = new SockAddrInet;
+    mLocalAddr = addr;
+    return( addr->resolve( serv, proto ) );
+  }
+  bool resolveLocal( int port, const char *proto )
+  {
+    SockAddrInet *addr = new SockAddrInet;
+    mLocalAddr = addr;
+    return( addr->resolve( port, proto ) );
+  }
 
-    bool resolveRemote( const char *host, const char *serv, const char *proto )
-    {
-        SockAddrInet *addr = new SockAddrInet;
-        mRemoteAddr = addr;
-        return( addr->resolve( host, serv, proto ) );
-    }
-    bool resolveRemote( const char *host, int port, const char *proto )
-    {
-        SockAddrInet *addr = new SockAddrInet;
-        mRemoteAddr = addr;
-        return( addr->resolve( host, port, proto ) );
-    }
+  bool resolveRemote( const char *host, const char *serv, const char *proto )
+  {
+    SockAddrInet *addr = new SockAddrInet;
+    mRemoteAddr = addr;
+    return( addr->resolve( host, serv, proto ) );
+  }
+  bool resolveRemote( const char *host, int port, const char *proto )
+  {
+    SockAddrInet *addr = new SockAddrInet;
+    mRemoteAddr = addr;
+    return( addr->resolve( host, port, proto ) );
+  }
 
 protected:
-    bool bind( const SockAddrInet &addr )
-    {
-        mLocalAddr = new SockAddrInet( addr );
-        return( Socket::bind() );
-    }
-    bool bind( const char *host, const char *serv ) 
-    {
-        if ( !resolveLocal( host, serv, getProtocol() ) )
-            return( false );
-        return( Socket::bind() );
-    }
-    bool bind( const char *host, int port )
-    {
-        if ( !resolveLocal( host, port, getProtocol() ) )
-            return( false );
-        return( Socket::bind() );
-    }
-    bool bind( const char *serv )
-    {
-        if ( !resolveLocal( serv, getProtocol() ) )
-            return( false );
-        return( Socket::bind() );
-    }
-    bool bind( int port )
-    {
-        if ( !resolveLocal( port, getProtocol() ) )
-            return( false );
-        return( Socket::bind() );
-    }
+  bool bind( const SockAddrInet &addr )
+  {
+    mLocalAddr = new SockAddrInet( addr );
+    return( Socket::bind() );
+  }
+  bool bind( const char *host, const char *serv ) 
+  {
+    if ( !resolveLocal( host, serv, getProtocol() ) )
+      return( false );
+    return( Socket::bind() );
+  }
+  bool bind( const char *host, int port )
+  {
+    if ( !resolveLocal( host, port, getProtocol() ) )
+      return( false );
+    return( Socket::bind() );
+  }
+  bool bind( const char *serv )
+  {
+    if ( !resolveLocal( serv, getProtocol() ) )
+      return( false );
+    return( Socket::bind() );
+  }
+  bool bind( int port )
+  {
+    if ( !resolveLocal( port, getProtocol() ) )
+      return( false );
+    return( Socket::bind() );
+  }
 
-    bool connect( const SockAddrInet &addr )
-    {
-        mRemoteAddr = new SockAddrInet( addr );
-        return( Socket::connect() );
-    }
-    bool connect( const char *host, const char *serv )
-    {
-        if ( !resolveRemote( host, serv, getProtocol() ) )
-            return( false );
-        return( Socket::connect() );
-    }
-    bool connect( const char *host, int port )
-    {
-        if ( !resolveRemote( host, port, getProtocol() ) )
-            return( false );
-        return( Socket::connect() );
-    }
+  bool connect( const SockAddrInet &addr )
+  {
+    mRemoteAddr = new SockAddrInet( addr );
+    return( Socket::connect() );
+  }
+  bool connect( const char *host, const char *serv )
+  {
+    if ( !resolveRemote( host, serv, getProtocol() ) )
+      return( false );
+    return( Socket::connect() );
+  }
+  bool connect( const char *host, int port )
+  {
+    if ( !resolveRemote( host, port, getProtocol() ) )
+      return( false );
+    return( Socket::connect() );
+  }
 };
 
 class UnixSocket : virtual public Socket
 {
 public:
-    int getDomain() const
-    {
-        return( AF_UNIX );
-    }
-    virtual socklen_t getAddrSize() const
-    {
-        return( SockAddrUnix::addrSize() );
-    }
+  int getDomain() const
+  {
+    return( AF_UNIX );
+  }
+  virtual socklen_t getAddrSize() const
+  {
+    return( SockAddrUnix::addrSize() );
+  }
 
 protected:
-    bool resolveLocal( const char *serv, const char *proto )
-    {
-        SockAddrUnix *addr = new SockAddrUnix;
-        mLocalAddr = addr;
-        return( addr->resolve( serv, proto ) );
-    }
+  bool resolveLocal( const char *serv, const char *proto )
+  {
+    SockAddrUnix *addr = new SockAddrUnix;
+    mLocalAddr = addr;
+    return( addr->resolve( serv, proto ) );
+  }
 
-    bool resolveRemote( const char *path, const char *proto )
-    {
-        SockAddrUnix *addr = new SockAddrUnix;
-        mRemoteAddr = addr;
-        return( addr->resolve( path, proto ) );
-    }
+  bool resolveRemote( const char *path, const char *proto )
+  {
+    SockAddrUnix *addr = new SockAddrUnix;
+    mRemoteAddr = addr;
+    return( addr->resolve( path, proto ) );
+  }
 
 protected:
-    bool bind( const char *path )
-    {
-        if ( !UnixSocket::resolveLocal( path, getProtocol() ) )
-            return( false );
-        return( Socket::bind() );
-    }
+  bool bind( const char *path )
+  {
+    if ( !UnixSocket::resolveLocal( path, getProtocol() ) )
+      return( false );
+    return( Socket::bind() );
+  }
 
-    bool connect( const char *path )
-    {
-        if ( !UnixSocket::resolveRemote( path, getProtocol() ) )
-            return( false );
-        return( Socket::connect() );
-    }
+  bool connect( const char *path )
+  {
+    if ( !UnixSocket::resolveRemote( path, getProtocol() ) )
+      return( false );
+    return( Socket::connect() );
+  }
 };
 
 class UdpSocket : virtual public Socket
 {
 public:
-    int getType() const
-    {
-        return( SOCK_DGRAM );
-    }
-    const char *getProtocol() const
-    {
-        return( "udp" );
-    }
+  int getType() const
+  {
+    return( SOCK_DGRAM );
+  }
+  const char *getProtocol() const
+  {
+    return( "udp" );
+  }
 
 public:
-	virtual int sendto( const void *msg, int len, const SockAddr *addr=0 ) const
-	{
-		ssize_t nBytes = ::sendto( mSd, msg, len, 0, addr?addr->getAddr():NULL, addr?addr->getAddrSize():0 );
-        if ( nBytes < 0 )
-            Debug( 1, "Sendto of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
-		return( nBytes );
-	}
-	virtual int recvfrom( void *msg, int len, SockAddr *addr=0 ) const
-	{
-        ssize_t nBytes = 0;
-        if ( addr )
-        {
-            struct sockaddr sockAddr;
-            socklen_t sockLen;
-		    nBytes = ::recvfrom( mSd, msg, len, 0, &sockAddr, &sockLen );
-            if ( nBytes < 0 )
-            {
-                Debug( 1, "Recvfrom of %d bytes max on sd %d (with address) failed: %s", len, mSd, strerror(errno) );
-            }
-            else if ( sockLen )
-            {
-                addr = SockAddr::newSockAddr( sockAddr, sockLen );
-            }
-        }   
-        else
-        {
-		    nBytes = ::recvfrom( mSd, msg, len, 0, NULL, 0 );
-            if ( nBytes < 0 )
-                Debug( 1, "Recvfrom of %d bytes max on sd %d (no address) failed: %s", len, mSd, strerror(errno) );
-        }
-        return( nBytes );
-	}
+  virtual int sendto( const void *msg, int len, const SockAddr *addr=0 ) const
+  {
+    ssize_t nBytes = ::sendto( mSd, msg, len, 0, addr?addr->getAddr():NULL, addr?addr->getAddrSize():0 );
+    if ( nBytes < 0 )
+      Debug( 1, "Sendto of %d bytes on sd %d failed: %s", len, mSd, strerror(errno) );
+    return( nBytes );
+  }
+  virtual int recvfrom( void *msg, int len, SockAddr *addr=0 ) const
+  {
+    ssize_t nBytes = 0;
+    if ( addr )
+    {
+      struct sockaddr sockAddr;
+      socklen_t sockLen;
+      nBytes = ::recvfrom( mSd, msg, len, 0, &sockAddr, &sockLen );
+      if ( nBytes < 0 )
+      {
+        Debug( 1, "Recvfrom of %d bytes max on sd %d (with address) failed: %s", len, mSd, strerror(errno) );
+      }
+      else if ( sockLen )
+      {
+        addr = SockAddr::newSockAddr( sockAddr, sockLen );
+      }
+    }   
+    else
+    {
+      nBytes = ::recvfrom( mSd, msg, len, 0, NULL, 0 );
+      if ( nBytes < 0 )
+        Debug( 1, "Recvfrom of %d bytes max on sd %d (no address) failed: %s", len, mSd, strerror(errno) );
+    }
+    return( nBytes );
+  }
 };
 
 class UdpInetSocket : virtual public UdpSocket, virtual public InetSocket
 {
 public:
-    bool bind( const SockAddrInet &addr ) 
-    {
-        return( InetSocket::bind( addr ) );
-    }
-    bool bind( const char *host, const char *serv ) 
-    {
-        return( InetSocket::bind( host, serv ) );
-    }
-    bool bind( const char *host, int port )
-    {
-        return( InetSocket::bind( host, port ) );
-    }
-    bool bind( const char *serv )
-    {
-        return( InetSocket::bind( serv ) );
-    }
-    bool bind( int port )
-    {
-        return( InetSocket::bind( port ) );
-    }
+  bool bind( const SockAddrInet &addr ) 
+  {
+    return( InetSocket::bind( addr ) );
+  }
+  bool bind( const char *host, const char *serv ) 
+  {
+    return( InetSocket::bind( host, serv ) );
+  }
+  bool bind( const char *host, int port )
+  {
+    return( InetSocket::bind( host, port ) );
+  }
+  bool bind( const char *serv )
+  {
+    return( InetSocket::bind( serv ) );
+  }
+  bool bind( int port )
+  {
+    return( InetSocket::bind( port ) );
+  }
 
-    bool connect( const SockAddrInet &addr ) 
-    {
-        return( InetSocket::connect( addr ) );
-    }
-    bool connect( const char *host, const char *serv )
-    {
-        return( InetSocket::connect( host, serv ) );
-    }
-    bool connect( const char *host, int port )
-    {
-        return( InetSocket::connect( host, port ) );
-    }
+  bool connect( const SockAddrInet &addr ) 
+  {
+    return( InetSocket::connect( addr ) );
+  }
+  bool connect( const char *host, const char *serv )
+  {
+    return( InetSocket::connect( host, serv ) );
+  }
+  bool connect( const char *host, int port )
+  {
+    return( InetSocket::connect( host, port ) );
+  }
 };
 
 class UdpUnixSocket : virtual public UdpSocket, virtual public UnixSocket
 {
 public:
-    bool bind( const char *path )
-    {
-        return( UnixSocket::bind( path ) );
-    }
+  bool bind( const char *path )
+  {
+    return( UnixSocket::bind( path ) );
+  }
 
-    bool connect( const char *path )
-    {
-        return( UnixSocket::connect( path ) );
-    }
+  bool connect( const char *path )
+  {
+    return( UnixSocket::connect( path ) );
+  }
 };
 
 class UdpInetClient : public UdpInetSocket
 {
 protected:
-    bool bind( const SockAddrInet &addr ) 
-    {
-        return( UdpInetSocket::bind( addr ) );
-    }
-    bool bind( const char *host, const char *serv )
-    {
-        return( UdpInetSocket::bind( host, serv ) );
-    }
-    bool bind( const char *host, int port )
-    {
-        return( UdpInetSocket::bind( host, port ) );
-    }
-    bool bind( const char *serv )
-    {
-        return( UdpInetSocket::bind( serv ) );
-    }
-    bool bind( int port )
-    {
-        return( UdpInetSocket::bind( port ) );
-    }
+  bool bind( const SockAddrInet &addr ) 
+  {
+    return( UdpInetSocket::bind( addr ) );
+  }
+  bool bind( const char *host, const char *serv )
+  {
+    return( UdpInetSocket::bind( host, serv ) );
+  }
+  bool bind( const char *host, int port )
+  {
+    return( UdpInetSocket::bind( host, port ) );
+  }
+  bool bind( const char *serv )
+  {
+    return( UdpInetSocket::bind( serv ) );
+  }
+  bool bind( int port )
+  {
+    return( UdpInetSocket::bind( port ) );
+  }
 
 public:
-    bool connect( const SockAddrInet &addr ) 
-    {
-        return( UdpInetSocket::connect( addr ) );
-    }
-    bool connect( const char *host, const char *serv )
-    {
-        return( UdpInetSocket::connect( host, serv ) );
-    }
-    bool connect( const char *host, int port )
-    {
-        return( UdpInetSocket::connect( host, port ) );
-    }
+  bool connect( const SockAddrInet &addr ) 
+  {
+    return( UdpInetSocket::connect( addr ) );
+  }
+  bool connect( const char *host, const char *serv )
+  {
+    return( UdpInetSocket::connect( host, serv ) );
+  }
+  bool connect( const char *host, int port )
+  {
+    return( UdpInetSocket::connect( host, port ) );
+  }
 };
 
 class UdpUnixClient : public UdpUnixSocket
 {
 public:
-    bool bind( const char *path )
-    {
-        return( UdpUnixSocket::bind( path ) );
-    }
+  bool bind( const char *path )
+  {
+    return( UdpUnixSocket::bind( path ) );
+  }
 
 public:
-    bool connect( const char *path )
-    {
-        return( UdpUnixSocket::connect( path) );
-    }
+  bool connect( const char *path )
+  {
+    return( UdpUnixSocket::connect( path) );
+  }
 };
 
 class UdpInetServer : public UdpInetSocket
 {
 public:
-    bool bind( const SockAddrInet &addr ) 
-    {
-        return( UdpInetSocket::bind( addr ) );
-    }
-    bool bind( const char *host, const char *serv )
-    {
-        return( UdpInetSocket::bind( host, serv ) );
-    }
-    bool bind( const char *host, int port )
-    {
-        return( UdpInetSocket::bind( host, port ) );
-    }
-    bool bind( const char *serv )
-    {
-        return( UdpInetSocket::bind( serv ) );
-    }
-    bool bind( int port )
-    {
-        return( UdpInetSocket::bind( port ) );
-    }
+  bool bind( const SockAddrInet &addr ) 
+  {
+    return( UdpInetSocket::bind( addr ) );
+  }
+  bool bind( const char *host, const char *serv )
+  {
+    return( UdpInetSocket::bind( host, serv ) );
+  }
+  bool bind( const char *host, int port )
+  {
+    return( UdpInetSocket::bind( host, port ) );
+  }
+  bool bind( const char *serv )
+  {
+    return( UdpInetSocket::bind( serv ) );
+  }
+  bool bind( int port )
+  {
+    return( UdpInetSocket::bind( port ) );
+  }
 
 protected:
-    bool connect( const char *host, const char *serv )
-    {
-        return( UdpInetSocket::connect( host, serv ) );
-    }
-    bool connect( const char *host, int port )
-    {
-        return( UdpInetSocket::connect( host, port ) );
-    }
+  bool connect( const char *host, const char *serv )
+  {
+    return( UdpInetSocket::connect( host, serv ) );
+  }
+  bool connect( const char *host, int port )
+  {
+    return( UdpInetSocket::connect( host, port ) );
+  }
 };
 
 class UdpUnixServer : public UdpUnixSocket
 {
 public:
-    bool bind( const char *path )
-    {
-        return( UdpUnixSocket::bind( path ) );
-    }
+  bool bind( const char *path )
+  {
+    return( UdpUnixSocket::bind( path ) );
+  }
 
 protected:
-    bool connect( const char *path )
-    {
-        return( UdpUnixSocket::connect( path ) );
-    }
+  bool connect( const char *path )
+  {
+    return( UdpUnixSocket::connect( path ) );
+  }
 };
 
 class TcpSocket : virtual public Socket
 {
 public:
-    TcpSocket()
-    {
-    }
-    TcpSocket( const TcpSocket &socket, int newSd ) : Socket( socket, newSd )
-    {
-    }
+  TcpSocket()
+  {
+  }
+  TcpSocket( const TcpSocket &socket, int newSd ) : Socket( socket, newSd )
+  {
+  }
 
 public:
-    int getType() const
-    {
-        return( SOCK_STREAM );
-    }
-    const char *getProtocol() const
-    {
-        return( "tcp" );
-    }
+  int getType() const
+  {
+    return( SOCK_STREAM );
+  }
+  const char *getProtocol() const
+  {
+    return( "tcp" );
+  }
 };
 
 class TcpInetSocket : virtual public TcpSocket, virtual public InetSocket
 {
 public:
-    TcpInetSocket()
-    {
-    }
-    TcpInetSocket( const TcpInetSocket &socket, int newSd ) : TcpSocket( socket, newSd )
-    {
-    }
+  TcpInetSocket()
+  {
+  }
+  TcpInetSocket( const TcpInetSocket &socket, int newSd ) : TcpSocket( socket, newSd )
+  {
+  }
 };
 
 class TcpUnixSocket : virtual public TcpSocket, virtual public UnixSocket
 {
 public:
-    TcpUnixSocket()
-    {
-    }
-    TcpUnixSocket( const TcpUnixSocket &socket, int newSd ) : TcpSocket( socket, newSd )
-    {
-    }
+  TcpUnixSocket()
+  {
+  }
+  TcpUnixSocket( const TcpUnixSocket &socket, int newSd ) : TcpSocket( socket, newSd )
+  {
+  }
 };
 
 class TcpInetClient : public TcpInetSocket
 {
 public:
-    bool connect( const char *host, const char *serv )
-    {
-        return( TcpInetSocket::connect( host, serv ) );
-    }
-    bool connect( const char *host, int port )
-    {
-        return( TcpInetSocket::connect( host, port ) );
-    }
+  bool connect( const char *host, const char *serv )
+  {
+    return( TcpInetSocket::connect( host, serv ) );
+  }
+  bool connect( const char *host, int port )
+  {
+    return( TcpInetSocket::connect( host, port ) );
+  }
 };
 
 class TcpUnixClient : public TcpUnixSocket
 {
 public:
-    bool connect( const char *path )
-    {
-        return( TcpUnixSocket::connect( path) );
-    }
+  bool connect( const char *path )
+  {
+    return( TcpUnixSocket::connect( path) );
+  }
 };
 
 class TcpInetServer : public TcpInetSocket
 {
 public:
-    bool bind( const char *host, const char *serv )
-    {
-        return( TcpInetSocket::bind( host, serv ) );
-    }
-    bool bind( const char *host, int port )
-    {
-        return( TcpInetSocket::bind( host, port ) );
-    }
-    bool bind( const char *serv )
-    {
-        return( TcpInetSocket::bind( serv ) );
-    }
-    bool bind( int port )
-    {
-        return( TcpInetSocket::bind( port ) );
-    }
+  bool bind( const char *host, const char *serv )
+  {
+    return( TcpInetSocket::bind( host, serv ) );
+  }
+  bool bind( const char *host, int port )
+  {
+    return( TcpInetSocket::bind( host, port ) );
+  }
+  bool bind( const char *serv )
+  {
+    return( TcpInetSocket::bind( serv ) );
+  }
+  bool bind( int port )
+  {
+    return( TcpInetSocket::bind( port ) );
+  }
 
 public:
-    bool isListening() const { return( Socket::isListening() ); }
-    bool listen();
-    bool accept();
-    bool accept( TcpInetSocket *&newSocket );
+  bool isListening() const { return( Socket::isListening() ); }
+  bool listen();
+  bool accept();
+  bool accept( TcpInetSocket *&newSocket );
 };
 
 class TcpUnixServer : public TcpUnixSocket
 {
 public:
-    bool bind( const char *path )
-    {
-        return( TcpUnixSocket::bind( path ) );
-    }
+  bool bind( const char *path )
+  {
+    return( TcpUnixSocket::bind( path ) );
+  }
 
 public:
-    bool isListening() const { return( Socket::isListening() ); }
-    bool listen();
-    bool accept();
-    bool accept( TcpUnixSocket *&newSocket );
+  bool isListening() const { return( Socket::isListening() ); }
+  bool listen();
+  bool accept();
+  bool accept( TcpUnixSocket *&newSocket );
 };
 
 class Select
 {
 public:
-    typedef std::set<CommsBase *> CommsSet;
-    typedef std::vector<CommsBase *> CommsList;
+  typedef std::set<CommsBase *> CommsSet;
+  typedef std::vector<CommsBase *> CommsList;
 
 protected:
-    CommsSet        mReaders;
-    CommsSet        mWriters;
-    CommsList       mReadable;
-    CommsList       mWriteable;
-    bool            mHasTimeout;
-    struct timeval  mTimeout;
-    int             mMaxFd;
+  CommsSet    mReaders;
+  CommsSet    mWriters;
+  CommsList     mReadable;
+  CommsList     mWriteable;
+  bool      mHasTimeout;
+  struct timeval  mTimeout;
+  int       mMaxFd;
 
 public:
-    Select();
-    Select( struct timeval timeout );
-    Select( int timeout );
-    Select( double timeout );
+  Select();
+  Select( struct timeval timeout );
+  Select( int timeout );
+  Select( double timeout );
 
-    void setTimeout( int timeout );
-    void setTimeout( double timeout );
-    void setTimeout( struct timeval timeout );
-    void clearTimeout();
+  void setTimeout( int timeout );
+  void setTimeout( double timeout );
+  void setTimeout( struct timeval timeout );
+  void clearTimeout();
 
-    void calcMaxFd();
+  void calcMaxFd();
 
-    bool addReader( CommsBase *comms );
-    bool deleteReader( CommsBase *comms );
-    void clearReaders();
+  bool addReader( CommsBase *comms );
+  bool deleteReader( CommsBase *comms );
+  void clearReaders();
 
-    bool addWriter( CommsBase *comms );
-    bool deleteWriter( CommsBase *comms );
-    void clearWriters();
+  bool addWriter( CommsBase *comms );
+  bool deleteWriter( CommsBase *comms );
+  void clearWriters();
 
-    int wait();
+  int wait();
 
-    const CommsList &getReadable() const;
-    const CommsList &getWriteable() const;
+  const CommsList &getReadable() const;
+  const CommsList &getWriteable() const;
 };
 
 #endif // ZM_COMMS_H
diff --git a/src/zm_config.cpp b/src/zm_config.cpp
index 5a7454a7b..26051f113 100644
--- a/src/zm_config.cpp
+++ b/src/zm_config.cpp
@@ -29,277 +29,277 @@
 
 void zmLoadConfig()
 {
-	FILE *cfg;
-	char line[512];
-	if ( (cfg = fopen( ZM_CONFIG, "r")) == NULL )
-	{
-		Fatal( "Can't open %s: %s", ZM_CONFIG, strerror(errno) );
-	}
-	while ( fgets( line, sizeof(line), cfg ) != NULL )
-	{
-		char *line_ptr = line;
+  FILE *cfg;
+  char line[512];
+  if ( (cfg = fopen( ZM_CONFIG, "r")) == NULL )
+  {
+    Fatal( "Can't open %s: %s", ZM_CONFIG, strerror(errno) );
+  }
+  while ( fgets( line, sizeof(line), cfg ) != NULL )
+  {
+    char *line_ptr = line;
 
-		// Trim off any cr/lf line endings
-		int chomp_len = strcspn( line_ptr, "\r\n" );
-		line_ptr[chomp_len] = '\0';
+    // Trim off any cr/lf line endings
+    int chomp_len = strcspn( line_ptr, "\r\n" );
+    line_ptr[chomp_len] = '\0';
 
-		// Remove leading white space
-		int white_len = strspn( line_ptr, " \t" );
-		line_ptr += white_len;
+    // Remove leading white space
+    int white_len = strspn( line_ptr, " \t" );
+    line_ptr += white_len;
 
-		// Check for comment or empty line
-		if ( *line_ptr == '\0' || *line_ptr == '#' )
-			continue;
+    // Check for comment or empty line
+    if ( *line_ptr == '\0' || *line_ptr == '#' )
+      continue;
 
-		// Remove trailing white space
-		char *temp_ptr = line_ptr+strlen(line_ptr)-1;
-		while ( *temp_ptr == ' ' || *temp_ptr == '\t' )
-		{
-			*temp_ptr-- = '\0';
-			temp_ptr--;
-		}
+    // Remove trailing white space
+    char *temp_ptr = line_ptr+strlen(line_ptr)-1;
+    while ( *temp_ptr == ' ' || *temp_ptr == '\t' )
+    {
+      *temp_ptr-- = '\0';
+      temp_ptr--;
+    }
 
-		// Now look for the '=' in the middle of the line
-		temp_ptr = strchr( line_ptr, '=' );
-		if ( !temp_ptr )
-		{
-			Warning( "Invalid data in %s: '%s'", ZM_CONFIG, line );
-			continue;
-		}
+    // Now look for the '=' in the middle of the line
+    temp_ptr = strchr( line_ptr, '=' );
+    if ( !temp_ptr )
+    {
+      Warning( "Invalid data in %s: '%s'", ZM_CONFIG, line );
+      continue;
+    }
 
-		// Assign the name and value parts
-		char *name_ptr = line_ptr;
-		char *val_ptr = temp_ptr+1;
+    // Assign the name and value parts
+    char *name_ptr = line_ptr;
+    char *val_ptr = temp_ptr+1;
 
-		// Trim trailing space from the name part
-		do
-		{
-			*temp_ptr = '\0';
-			temp_ptr--;
-		}
-		while ( *temp_ptr == ' ' || *temp_ptr == '\t' );
+    // Trim trailing space from the name part
+    do
+    {
+      *temp_ptr = '\0';
+      temp_ptr--;
+    }
+    while ( *temp_ptr == ' ' || *temp_ptr == '\t' );
 
-		// Remove leading white space from the value part
-		white_len = strspn( val_ptr, " \t" );
-		val_ptr += white_len;
+    // Remove leading white space from the value part
+    white_len = strspn( val_ptr, " \t" );
+    val_ptr += white_len;
 
-		if ( strcasecmp( name_ptr, "ZM_DB_HOST" ) == 0 )
-            staticConfig.DB_HOST = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_DB_NAME" ) == 0 )
-            staticConfig.DB_NAME = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_DB_USER" ) == 0 )
-            staticConfig.DB_USER = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_DB_PASS" ) == 0 )
-            staticConfig.DB_PASS = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_PATH_WEB" ) == 0 )
-            staticConfig.PATH_WEB = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_SERVER_HOST" ) == 0 )
-			staticConfig.SERVER_NAME = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_SERVER_NAME" ) == 0 )
-			staticConfig.SERVER_NAME = std::string(val_ptr);
-		else if ( strcasecmp( name_ptr, "ZM_SERVER_ID" ) == 0 )
-			staticConfig.SERVER_ID = atoi(val_ptr);
-		else
-		{
-			// We ignore this now as there may be more parameters than the
-			// c/c++ binaries are bothered about
-			// Warning( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG );
-		}
-	} // end foreach line of the config
-	fclose( cfg );
-	zmDbConnect();
-	config.Load();
-	config.Assign();
+    if ( strcasecmp( name_ptr, "ZM_DB_HOST" ) == 0 )
+      staticConfig.DB_HOST = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_DB_NAME" ) == 0 )
+      staticConfig.DB_NAME = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_DB_USER" ) == 0 )
+      staticConfig.DB_USER = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_DB_PASS" ) == 0 )
+      staticConfig.DB_PASS = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_PATH_WEB" ) == 0 )
+      staticConfig.PATH_WEB = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_SERVER_HOST" ) == 0 )
+      staticConfig.SERVER_NAME = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_SERVER_NAME" ) == 0 )
+      staticConfig.SERVER_NAME = std::string(val_ptr);
+    else if ( strcasecmp( name_ptr, "ZM_SERVER_ID" ) == 0 )
+      staticConfig.SERVER_ID = atoi(val_ptr);
+    else
+    {
+      // We ignore this now as there may be more parameters than the
+      // c/c++ binaries are bothered about
+      // Warning( "Invalid parameter '%s' in %s", name_ptr, ZM_CONFIG );
+    }
+  } // end foreach line of the config
+  fclose( cfg );
+  zmDbConnect();
+  config.Load();
+  config.Assign();
 
-	// Populate the server config entries
-	if ( ! staticConfig.SERVER_ID ) {
-		if ( ! staticConfig.SERVER_NAME.empty() ) {
+  // Populate the server config entries
+  if ( ! staticConfig.SERVER_ID ) {
+    if ( ! staticConfig.SERVER_NAME.empty() ) {
 
-			Debug( 1, "Fetching ZM_SERVER_ID For Name = %s", staticConfig.SERVER_NAME.c_str() );
-			std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
-			if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
-				staticConfig.SERVER_ID = atoi(dbrow[0]);
-			} else {
-				Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
-			}
+      Debug( 1, "Fetching ZM_SERVER_ID For Name = %s", staticConfig.SERVER_NAME.c_str() );
+      std::string sql = stringtf("SELECT Id FROM Servers WHERE Name='%s'", staticConfig.SERVER_NAME.c_str() );
+      if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
+        staticConfig.SERVER_ID = atoi(dbrow[0]);
+      } else {
+        Fatal("Can't get ServerId for Server %s", staticConfig.SERVER_NAME.c_str() );
+      }
 
-		} // end if has SERVER_NAME
-	} else if ( staticConfig.SERVER_NAME.empty() ) {
-		Debug( 1, "Fetching ZM_SERVER_NAME For Id = %d", staticConfig.SERVER_ID );
-		std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
-		
-		if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
-			staticConfig.SERVER_NAME = std::string(dbrow[0]);
-		} else {
-			Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
-		}
-	
-	}	
-	if ( ! staticConfig.SERVER_ID ) {
-		Debug( 1, "No Server ID or Name specified in config.  Not using Multi-Server Mode." );
-	} else {
-		Debug( 1, "Server is %d: using Multi-Server Mode.", staticConfig.SERVER_ID );
-	}
+    } // end if has SERVER_NAME
+  } else if ( staticConfig.SERVER_NAME.empty() ) {
+    Debug( 1, "Fetching ZM_SERVER_NAME For Id = %d", staticConfig.SERVER_ID );
+    std::string sql = stringtf("SELECT Name FROM Servers WHERE Id='%d'", staticConfig.SERVER_ID );
+    
+    if ( MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() ) ) {
+      staticConfig.SERVER_NAME = std::string(dbrow[0]);
+    } else {
+      Fatal("Can't get ServerName for Server ID %d", staticConfig.SERVER_ID );
+    }
+  
+  }  
+  if ( ! staticConfig.SERVER_ID ) {
+    Debug( 1, "No Server ID or Name specified in config.  Not using Multi-Server Mode." );
+  } else {
+    Debug( 1, "Server is %d: using Multi-Server Mode.", staticConfig.SERVER_ID );
+  }
 }
 
 StaticConfig staticConfig;
 
 ConfigItem::ConfigItem( const char *p_name, const char *p_value, const char *const p_type )
 {
-	name = new char[strlen(p_name)+1];
-	strcpy( name, p_name );
-	value = new char[strlen(p_value)+1];
-	strcpy( value, p_value );
-	type = new char[strlen(p_type)+1];
-	strcpy( type, p_type );
+  name = new char[strlen(p_name)+1];
+  strcpy( name, p_name );
+  value = new char[strlen(p_value)+1];
+  strcpy( value, p_value );
+  type = new char[strlen(p_type)+1];
+  strcpy( type, p_type );
 
-	//Info( "Created new config item %s = %s (%s)\n", name, value, type );
+  //Info( "Created new config item %s = %s (%s)\n", name, value, type );
 
-	accessed = false;
+  accessed = false;
 }
 
 ConfigItem::~ConfigItem()
 {
-	delete[] name;
-	delete[] value;
-	delete[] type;
+  delete[] name;
+  delete[] value;
+  delete[] type;
 }
 
 void ConfigItem::ConvertValue() const
 {
-	if ( !strcmp( type, "boolean" ) )
-	{
-		cfg_type = CFG_BOOLEAN;
-		cfg_value.boolean_value = (bool)strtol( value, 0, 0 );
-	}
-	else if ( !strcmp( type, "integer" ) )
-	{
-		cfg_type = CFG_INTEGER;
-		cfg_value.integer_value = strtol( value, 0, 10 );
-	}
-	else if ( !strcmp( type, "hexadecimal" ) )
-	{
-		cfg_type = CFG_INTEGER;
-		cfg_value.integer_value = strtol( value, 0, 16 );
-	}
-	else if ( !strcmp( type, "decimal" ) )
-	{
-		cfg_type = CFG_DECIMAL;
-		cfg_value.decimal_value = strtod( value, 0 );
-	}
-	else
-	{
-		cfg_type = CFG_STRING;
-		cfg_value.string_value = value;
-	}
-	accessed = true;
+  if ( !strcmp( type, "boolean" ) )
+  {
+    cfg_type = CFG_BOOLEAN;
+    cfg_value.boolean_value = (bool)strtol( value, 0, 0 );
+  }
+  else if ( !strcmp( type, "integer" ) )
+  {
+    cfg_type = CFG_INTEGER;
+    cfg_value.integer_value = strtol( value, 0, 10 );
+  }
+  else if ( !strcmp( type, "hexadecimal" ) )
+  {
+    cfg_type = CFG_INTEGER;
+    cfg_value.integer_value = strtol( value, 0, 16 );
+  }
+  else if ( !strcmp( type, "decimal" ) )
+  {
+    cfg_type = CFG_DECIMAL;
+    cfg_value.decimal_value = strtod( value, 0 );
+  }
+  else
+  {
+    cfg_type = CFG_STRING;
+    cfg_value.string_value = value;
+  }
+  accessed = true;
 }
 
 bool ConfigItem::BooleanValue() const
 {
-	if ( !accessed )
-		ConvertValue();
+  if ( !accessed )
+    ConvertValue();
 
-	if ( cfg_type != CFG_BOOLEAN )
-	{
-		Error( "Attempt to fetch boolean value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-		exit( -1 );
-	}
+  if ( cfg_type != CFG_BOOLEAN )
+  {
+    Error( "Attempt to fetch boolean value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
+    exit( -1 );
+  }
 
-	return( cfg_value.boolean_value );
+  return( cfg_value.boolean_value );
 }
 
 int ConfigItem::IntegerValue() const
 {
-	if ( !accessed )
-		ConvertValue();
+  if ( !accessed )
+    ConvertValue();
 
-	if ( cfg_type != CFG_INTEGER )
-	{
-		Error( "Attempt to fetch integer value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-		exit( -1 );
-	}
+  if ( cfg_type != CFG_INTEGER )
+  {
+    Error( "Attempt to fetch integer value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
+    exit( -1 );
+  }
 
-	return( cfg_value.integer_value );
+  return( cfg_value.integer_value );
 }
 
 double ConfigItem::DecimalValue() const
 {
-	if ( !accessed )
-		ConvertValue();
+  if ( !accessed )
+    ConvertValue();
 
-	if ( cfg_type != CFG_DECIMAL )
-	{
-		Error( "Attempt to fetch decimal value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-		exit( -1 );
-	}
+  if ( cfg_type != CFG_DECIMAL )
+  {
+    Error( "Attempt to fetch decimal value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
+    exit( -1 );
+  }
 
-	return( cfg_value.decimal_value );
+  return( cfg_value.decimal_value );
 }
 
 const char *ConfigItem::StringValue() const
 {
-	if ( !accessed )
-		ConvertValue();
+  if ( !accessed )
+    ConvertValue();
 
-	if ( cfg_type != CFG_STRING )
-	{
-		Error( "Attempt to fetch string value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
-		exit( -1 );
-	}
+  if ( cfg_type != CFG_STRING )
+  {
+    Error( "Attempt to fetch string value for %s, actual type is %s. Try running 'zmupdate.pl -f' to reload config.", name, type );
+    exit( -1 );
+  }
 
-	return( cfg_value.string_value );
+  return( cfg_value.string_value );
 }
 
 Config::Config()
 {
-	n_items = 0;
-	items = 0;
+  n_items = 0;
+  items = 0;
 }
 
 Config::~Config()
 {
-	if ( items )
-	{
-		for ( int i = 0; i < n_items; i++ )
-		{
-			delete items[i];
-		}
-		delete[] items;
-	}
+  if ( items )
+  {
+    for ( int i = 0; i < n_items; i++ )
+    {
+      delete items[i];
+    }
+    delete[] items;
+  }
 }
 
 void Config::Load()
 {
-    static char sql[ZM_SQL_SML_BUFSIZ];
+  static char sql[ZM_SQL_SML_BUFSIZ];
    
-    strncpy( sql, "select Name, Value, Type from Config order by Id", sizeof(sql) );
-	if ( mysql_query( &dbconn, sql ) )
-	{
-		Error( "Can't run query: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
+  strncpy( sql, "select Name, Value, Type from Config order by Id", sizeof(sql) );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-	MYSQL_RES *result = mysql_store_result( &dbconn );
-	if ( !result )
-	{
-		Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-	n_items = mysql_num_rows( result );
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  n_items = mysql_num_rows( result );
 
-	if ( n_items <= ZM_MAX_CFG_ID )
-	{
-		Error( "Config mismatch, expected %d items, read %d. Try running 'zmupdate.pl -f' to reload config.", ZM_MAX_CFG_ID+1, n_items );
-		exit( -1 );
-	}
+  if ( n_items <= ZM_MAX_CFG_ID )
+  {
+    Error( "Config mismatch, expected %d items, read %d. Try running 'zmupdate.pl -f' to reload config.", ZM_MAX_CFG_ID+1, n_items );
+    exit( -1 );
+  }
 
-	items = new ConfigItem *[n_items];
-	for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-	{
-		items[i] = new ConfigItem( dbrow[0], dbrow[1], dbrow[2] );
-	}
-	mysql_free_result( result );
+  items = new ConfigItem *[n_items];
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+  {
+    items[i] = new ConfigItem( dbrow[0], dbrow[1], dbrow[2] );
+  }
+  mysql_free_result( result );
 }
 
 void Config::Assign()
@@ -309,27 +309,27 @@ ZM_CFG_ASSIGN_LIST
 
 const ConfigItem &Config::Item( int id )
 {
-	if ( !n_items )
-	{
-		Load();
-		Assign();
-	}
+  if ( !n_items )
+  {
+    Load();
+    Assign();
+  }
 
-	if ( id < 0 || id > ZM_MAX_CFG_ID )
-	{
-		Error( "Attempt to access invalid config, id = %d. Try running 'zmupdate.pl -f' to reload config.", id );
-		exit( -1 );
-	}
+  if ( id < 0 || id > ZM_MAX_CFG_ID )
+  {
+    Error( "Attempt to access invalid config, id = %d. Try running 'zmupdate.pl -f' to reload config.", id );
+    exit( -1 );
+  }
 
-	ConfigItem *item = items[id];
-	
-	if ( !item )
-	{
-		Error( "Can't find config item %d", id );
-		exit( -1 );
-	}
-		
-	return( *item );
+  ConfigItem *item = items[id];
+  
+  if ( !item )
+  {
+    Error( "Can't find config item %d", id );
+    exit( -1 );
+  }
+    
+  return( *item );
 }
 
 Config config;
diff --git a/src/zm_config.h.in b/src/zm_config.h.in
index 83aa19210..1deeff861 100644
--- a/src/zm_config.h.in
+++ b/src/zm_config.h.in
@@ -25,48 +25,48 @@
 
 #include <string>
 
-#define ZM_CONFIG				"@ZM_CONFIG@"	// Path to config file
-#define ZM_VERSION				"@VERSION@"	// ZoneMinder Version
+#define ZM_CONFIG        "@ZM_CONFIG@"  // Path to config file
+#define ZM_VERSION        "@VERSION@"  // ZoneMinder Version
 
-#define ZM_HAS_V4L1             @ZM_HAS_V4L1@
-#define ZM_HAS_V4L2             @ZM_HAS_V4L2@
-#define ZM_HAS_V4L              @ZM_HAS_V4L@
+#define ZM_HAS_V4L1       @ZM_HAS_V4L1@
+#define ZM_HAS_V4L2       @ZM_HAS_V4L2@
+#define ZM_HAS_V4L        @ZM_HAS_V4L@
 
 #ifdef HAVE_LIBAVFORMAT
-#define ZM_HAS_FFMPEG           1
+#define ZM_HAS_FFMPEG       1
 #endif // HAVE_LIBAVFORMAT
 
-#define ZM_MAX_IMAGE_WIDTH		2048				// The largest image we imagine ever handling
-#define ZM_MAX_IMAGE_HEIGHT		1536				// The largest image we imagine ever handling
-#define ZM_MAX_IMAGE_COLOURS		4				// The largest image we imagine ever handling
-#define ZM_MAX_IMAGE_DIM		(ZM_MAX_IMAGE_WIDTH*ZM_MAX_IMAGE_HEIGHT)
-#define ZM_MAX_IMAGE_SIZE		(ZM_MAX_IMAGE_DIM*ZM_MAX_IMAGE_COLOURS)
+#define ZM_MAX_IMAGE_WIDTH    2048        // The largest image we imagine ever handling
+#define ZM_MAX_IMAGE_HEIGHT    1536        // The largest image we imagine ever handling
+#define ZM_MAX_IMAGE_COLOURS    4        // The largest image we imagine ever handling
+#define ZM_MAX_IMAGE_DIM    (ZM_MAX_IMAGE_WIDTH*ZM_MAX_IMAGE_HEIGHT)
+#define ZM_MAX_IMAGE_SIZE    (ZM_MAX_IMAGE_DIM*ZM_MAX_IMAGE_COLOURS)
 
-#define ZM_SCALE_BASE			100					// The factor by which we bump up 'scale' to simulate FP
-#define ZM_RATE_BASE			100					// The factor by which we bump up 'rate' to simulate FP
+#define ZM_SCALE_BASE      100          // The factor by which we bump up 'scale' to simulate FP
+#define ZM_RATE_BASE      100          // The factor by which we bump up 'rate' to simulate FP
 
-#define ZM_SQL_BATCH_SIZE       50                  // Limit the size of multi-row SQL statements
-#define ZM_SQL_SML_BUFSIZ       256                 // Size of SQL buffer
-#define ZM_SQL_MED_BUFSIZ       1024                // Size of SQL buffer
-#define ZM_SQL_LGE_BUFSIZ       8192                // Size of SQL buffer
+#define ZM_SQL_BATCH_SIZE     50          // Limit the size of multi-row SQL statements
+#define ZM_SQL_SML_BUFSIZ     256         // Size of SQL buffer
+#define ZM_SQL_MED_BUFSIZ     1024        // Size of SQL buffer
+#define ZM_SQL_LGE_BUFSIZ     8192        // Size of SQL buffer
 
-#define ZM_NETWORK_BUFSIZ       32768               // Size of network buffer
+#define ZM_NETWORK_BUFSIZ     32768         // Size of network buffer
 
-#define ZM_MAX_FPS              30                  // The maximum frame rate we expect to handle
-#define ZM_SAMPLE_RATE          int(1000000/ZM_MAX_FPS) // A general nyquist sample frequency for delays etc
-#define ZM_SUSPENDED_RATE       int(1000000/4) // A slower rate for when disabled etc
+#define ZM_MAX_FPS        30          // The maximum frame rate we expect to handle
+#define ZM_SAMPLE_RATE      int(1000000/ZM_MAX_FPS) // A general nyquist sample frequency for delays etc
+#define ZM_SUSPENDED_RATE     int(1000000/4) // A slower rate for when disabled etc
 
 extern void zmLoadConfig();
 
 struct StaticConfig
 {
-    std::string DB_HOST;
-    std::string DB_NAME;
-    std::string DB_USER;
-    std::string DB_PASS;
-    std::string PATH_WEB;
-	std::string SERVER_NAME;
-	unsigned int SERVER_ID;
+  std::string DB_HOST;
+  std::string DB_NAME;
+  std::string DB_USER;
+  std::string DB_PASS;
+  std::string PATH_WEB;
+  std::string SERVER_NAME;
+  unsigned int SERVER_ID;
 };
 
 extern StaticConfig staticConfig;
@@ -74,63 +74,63 @@ extern StaticConfig staticConfig;
 class ConfigItem
 {
 private:
-	char *name;
-	char *value;
-	char *type;
+  char *name;
+  char *value;
+  char *type;
 
-	mutable enum { CFG_BOOLEAN, CFG_INTEGER, CFG_DECIMAL, CFG_STRING } cfg_type;
-	mutable union
-	{
-		bool boolean_value;
-		int integer_value;
-		double decimal_value;
-		char *string_value;
-	} cfg_value;
-	mutable bool accessed;
+  mutable enum { CFG_BOOLEAN, CFG_INTEGER, CFG_DECIMAL, CFG_STRING } cfg_type;
+  mutable union
+  {
+    bool boolean_value;
+    int integer_value;
+    double decimal_value;
+    char *string_value;
+  } cfg_value;
+  mutable bool accessed;
 
 public:
-	ConfigItem( const char *p_name, const char *p_value, const char *const p_type );
-	~ConfigItem();
-	void ConvertValue() const;
-	bool BooleanValue() const;
-	int IntegerValue() const;
-	double DecimalValue() const;
-	const char *StringValue() const;
+  ConfigItem( const char *p_name, const char *p_value, const char *const p_type );
+  ~ConfigItem();
+  void ConvertValue() const;
+  bool BooleanValue() const;
+  int IntegerValue() const;
+  double DecimalValue() const;
+  const char *StringValue() const;
 
-	inline operator bool() const
-	{
-		return( BooleanValue() );
-	}
-	inline operator int() const
-	{
-		return( IntegerValue() );
-	}
-	inline operator double() const
-	{
-		return( DecimalValue() );
-	}
-	inline operator const char *() const
-	{
-		return( StringValue() );
-	}
+  inline operator bool() const
+  {
+    return( BooleanValue() );
+  }
+  inline operator int() const
+  {
+    return( IntegerValue() );
+  }
+  inline operator double() const
+  {
+    return( DecimalValue() );
+  }
+  inline operator const char *() const
+  {
+    return( StringValue() );
+  }
 };
 
 class Config
 {
 public:
-	ZM_CFG_DECLARE_LIST
+  ZM_CFG_DECLARE_LIST
 
 private:
-	int n_items;
-	ConfigItem **items;
+  int n_items;
+  ConfigItem **items;
 
 public:
-	Config();
-	~Config();
+  Config();
+  ~Config();
 
-	void Load();
-	void Assign();
-	const ConfigItem &Item( int id );
+  void Load();
+  void Assign();
+  const ConfigItem &Item( int id );
 };
 
 extern Config config;
diff --git a/src/zm_coord.h b/src/zm_coord.h
index 6a6620529..7316244a2 100644
--- a/src/zm_coord.h
+++ b/src/zm_coord.h
@@ -28,40 +28,40 @@
 class Coord
 {
 private:
-	int x, y;
+  int x, y;
 
 public:
-	inline Coord() : x(0), y(0)
-	{
-	}
-	inline Coord( int p_x, int p_y ) : x(p_x), y(p_y)
-	{
-	}
-	inline Coord( const Coord &p_coord ) : x(p_coord.x), y(p_coord.y)
-	{
-	}
-	inline int &X() { return( x ); }
-	inline const int &X() const { return( x ); }
-	inline int &Y() { return( y ); }
-	inline const int &Y() const { return( y ); }
+  inline Coord() : x(0), y(0)
+  {
+  }
+  inline Coord( int p_x, int p_y ) : x(p_x), y(p_y)
+  {
+  }
+  inline Coord( const Coord &p_coord ) : x(p_coord.x), y(p_coord.y)
+  {
+  }
+  inline int &X() { return( x ); }
+  inline const int &X() const { return( x ); }
+  inline int &Y() { return( y ); }
+  inline const int &Y() const { return( y ); }
 
-	inline static Coord Range( const Coord &coord1, const Coord &coord2 )
-	{
-		Coord result( (coord1.x-coord2.x)+1, (coord1.y-coord2.y)+1 );
-		return( result );
-	}
+  inline static Coord Range( const Coord &coord1, const Coord &coord2 )
+  {
+    Coord result( (coord1.x-coord2.x)+1, (coord1.y-coord2.y)+1 );
+    return( result );
+  }
 
-	inline bool operator==( const Coord &coord ) { return( x == coord.x && y == coord.y ); }
-	inline bool operator!=( const Coord &coord ) { return( x != coord.x || y != coord.y ); }
-	inline bool operator>( const Coord &coord ) { return( x > coord.x && y > coord.y ); }
-	inline bool operator>=( const Coord &coord ) { return( !(operator<(coord)) ); }
-	inline bool operator<( const Coord &coord ) { return( x < coord.x && y < coord.y ); }
-	inline bool operator<=( const Coord &coord ) { return( !(operator>(coord)) ); }
-	inline Coord &operator+=( const Coord &coord ) { x += coord.x; y += coord.y; return( *this ); }
-	inline Coord &operator-=( const Coord &coord ) { x -= coord.x; y -= coord.y; return( *this ); }
+  inline bool operator==( const Coord &coord ) { return( x == coord.x && y == coord.y ); }
+  inline bool operator!=( const Coord &coord ) { return( x != coord.x || y != coord.y ); }
+  inline bool operator>( const Coord &coord ) { return( x > coord.x && y > coord.y ); }
+  inline bool operator>=( const Coord &coord ) { return( !(operator<(coord)) ); }
+  inline bool operator<( const Coord &coord ) { return( x < coord.x && y < coord.y ); }
+  inline bool operator<=( const Coord &coord ) { return( !(operator>(coord)) ); }
+  inline Coord &operator+=( const Coord &coord ) { x += coord.x; y += coord.y; return( *this ); }
+  inline Coord &operator-=( const Coord &coord ) { x -= coord.x; y -= coord.y; return( *this ); }
 
-	inline friend Coord operator+( const Coord &coord1, const Coord &coord2 ) { Coord result( coord1 ); result += coord2; return( result ); }
-	inline friend Coord operator-( const Coord &coord1, const Coord &coord2 ) { Coord result( coord1 ); result -= coord2; return( result ); }
+  inline friend Coord operator+( const Coord &coord1, const Coord &coord2 ) { Coord result( coord1 ); result += coord2; return( result ); }
+  inline friend Coord operator-( const Coord &coord1, const Coord &coord2 ) { Coord result( coord1 ); result -= coord2; return( result ); }
 };
 
 #endif // ZM_COORD_H
diff --git a/src/zm_curl_camera.cpp b/src/zm_curl_camera.cpp
index 44786a527..2701bdde4 100644
--- a/src/zm_curl_camera.cpp
+++ b/src/zm_curl_camera.cpp
@@ -30,289 +30,290 @@ const char* content_type_match = "Content-Type:";
 size_t content_length_match_len;
 size_t content_type_match_len;
 
-cURLCamera::cURLCamera( int p_id, const std::string &p_path, const std::string &p_user, const std::string &p_pass, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
-    mPath( p_path ), mUser( p_user ), mPass ( p_pass ), bTerminate( false ), bReset( false ), mode ( MODE_UNSET )
+cURLCamera::cURLCamera( int p_id, const std::string &p_path, const std::string &p_user, const std::string &p_pass, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+  Camera( p_id, CURL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+  mPath( p_path ), mUser( p_user ), mPass ( p_pass ), bTerminate( false ), bReset( false ), mode ( MODE_UNSET )
 {
 
-	if ( capture )
-	{
-		Initialise();
-	}
+  if ( capture )
+  {
+    Initialise();
+  }
 }
 
 cURLCamera::~cURLCamera()
 {
-	if ( capture )
-	{
+  if ( capture )
+  {
 
-		Terminate();
-	}
+    Terminate();
+  }
 }
 
 void cURLCamera::Initialise()
 {
-	content_length_match_len = strlen(content_length_match);
-	content_type_match_len = strlen(content_type_match);
+  content_length_match_len = strlen(content_length_match);
+  content_type_match_len = strlen(content_type_match);
 
-	databuffer.expand(CURL_BUFFER_INITIAL_SIZE);
+  databuffer.expand(CURL_BUFFER_INITIAL_SIZE);
 
-	/* cURL initialization */
-	cRet = curl_global_init(CURL_GLOBAL_ALL);
-	if(cRet != CURLE_OK) {
-		Fatal("libcurl initialization failed: ", curl_easy_strerror(cRet));
-	}
+  /* cURL initialization */
+  cRet = curl_global_init(CURL_GLOBAL_ALL);
+  if(cRet != CURLE_OK) {
+    Fatal("libcurl initialization failed: ", curl_easy_strerror(cRet));
+  }
 
-	Debug(2,"libcurl version: %s",curl_version());
+  Debug(2,"libcurl version: %s",curl_version());
 
-	/* Create the shared data mutex */
-	nRet = pthread_mutex_init(&shareddata_mutex, NULL);
-	if(nRet != 0) {
-		Fatal("Shared data mutex creation failed: %s",strerror(nRet));
-	}
-	/* Create the data available condition variable */
-	nRet = pthread_cond_init(&data_available_cond, NULL);
-	if(nRet != 0) {
-		Fatal("Data available condition variable creation failed: %s",strerror(nRet));
-	}
-	/* Create the request complete condition variable */
-	nRet = pthread_cond_init(&request_complete_cond, NULL);
-	if(nRet != 0) {
-		Fatal("Request complete condition variable creation failed: %s",strerror(nRet));
-	}
+  /* Create the shared data mutex */
+  nRet = pthread_mutex_init(&shareddata_mutex, NULL);
+  if(nRet != 0) {
+    Fatal("Shared data mutex creation failed: %s",strerror(nRet));
+  }
+  /* Create the data available condition variable */
+  nRet = pthread_cond_init(&data_available_cond, NULL);
+  if(nRet != 0) {
+    Fatal("Data available condition variable creation failed: %s",strerror(nRet));
+  }
+  /* Create the request complete condition variable */
+  nRet = pthread_cond_init(&request_complete_cond, NULL);
+  if(nRet != 0) {
+    Fatal("Request complete condition variable creation failed: %s",strerror(nRet));
+  }
 
-	/* Create the thread */
-	nRet = pthread_create(&thread, NULL, thread_func_dispatcher, this);
-	if(nRet != 0) {
-		Fatal("Thread creation failed: %s",strerror(nRet));
-	}
+  /* Create the thread */
+  nRet = pthread_create(&thread, NULL, thread_func_dispatcher, this);
+  if(nRet != 0) {
+    Fatal("Thread creation failed: %s",strerror(nRet));
+  }
 }
 
 void cURLCamera::Terminate()
 {
-	/* Signal the thread to terminate */
-	bTerminate = true;
+  /* Signal the thread to terminate */
+  bTerminate = true;
 
-	/* Wait for thread termination */
-	pthread_join(thread, NULL);
+  /* Wait for thread termination */
+  pthread_join(thread, NULL);
 
-	/* Destroy condition variables */
-	pthread_cond_destroy(&request_complete_cond);
-	pthread_cond_destroy(&data_available_cond);
+  /* Destroy condition variables */
+  pthread_cond_destroy(&request_complete_cond);
+  pthread_cond_destroy(&data_available_cond);
 
-	/* Destroy mutex */
-	pthread_mutex_destroy(&shareddata_mutex);
+  /* Destroy mutex */
+  pthread_mutex_destroy(&shareddata_mutex);
 
-	/* cURL cleanup */
-	curl_global_cleanup();
+  /* cURL cleanup */
+  curl_global_cleanup();
 
 }
 
 int cURLCamera::PrimeCapture()
 {
-	//Info( "Priming capture from %s", mPath.c_str() );
-	return 0;
+  //Info( "Priming capture from %s", mPath.c_str() );
+  return 0;
 }
 
 int cURLCamera::PreCapture()
 {
-    // Nothing to do here
-    return( 0 );
+  // Nothing to do here
+  return( 0 );
 }
 
 int cURLCamera::Capture( Image &image )
 {
-	bool frameComplete = false;
+  bool frameComplete = false;
 
-	/* MODE_STREAM specific variables */
-	bool SubHeadersParsingComplete = false;
-	unsigned int frame_content_length = 0;
-	std::string frame_content_type;
-	bool need_more_data = false;
+  /* MODE_STREAM specific variables */
+  bool SubHeadersParsingComplete = false;
+  unsigned int frame_content_length = 0;
+  std::string frame_content_type;
+  bool need_more_data = false;
 
-	/* Grab the mutex to ensure exclusive access to the shared data */
-	lock();
+  /* Grab the mutex to ensure exclusive access to the shared data */
+  lock();
 
-	while (!frameComplete) {
+  while (!frameComplete) {
 
-		/* If the work thread did a reset, reset our local variables */
-		if(bReset) {
-			SubHeadersParsingComplete = false;
-			frame_content_length = 0;
-			frame_content_type.clear();
-			need_more_data = false;
-			bReset = false;
-		}
+    /* If the work thread did a reset, reset our local variables */
+    if(bReset) {
+      SubHeadersParsingComplete = false;
+      frame_content_length = 0;
+      frame_content_type.clear();
+      need_more_data = false;
+      bReset = false;
+    }
 
-		if(mode == MODE_UNSET) {
-			/* Don't have a mode yet. Sleep while waiting for data */
-			nRet = pthread_cond_wait(&data_available_cond,&shareddata_mutex);
-			if(nRet != 0) {
-				Error("Failed waiting for available data condition variable: %s",strerror(nRet));
-				return -20;
-			}
-		}
+    if(mode == MODE_UNSET) {
+      /* Don't have a mode yet. Sleep while waiting for data */
+      nRet = pthread_cond_wait(&data_available_cond,&shareddata_mutex);
+      if(nRet != 0) {
+        Error("Failed waiting for available data condition variable: %s",strerror(nRet));
+        return -20;
+      }
+    }
 
-		if(mode == MODE_STREAM) {
+    if(mode == MODE_STREAM) {
 
-			/* Subheader parsing */
-			while(!SubHeadersParsingComplete && !need_more_data) {
+      /* Subheader parsing */
+      while(!SubHeadersParsingComplete && !need_more_data) {
 
-				size_t crlf_start, crlf_end, crlf_size;
-				std::string subheader;
+        size_t crlf_start, crlf_end, crlf_size;
+        std::string subheader;
 
-				/* Check if the buffer contains something */
-				if(databuffer.empty()) {
-					/* Empty buffer, wait for data */
-					need_more_data = true;
-					break;
-				}
-		 
-				/* Find crlf start */
-				crlf_start = memcspn(databuffer,"\r\n",databuffer.size());
-				if(crlf_start == databuffer.size()) {
-					/* Not found, wait for more data */
-					need_more_data = true;
-					break;
-				}
+        /* Check if the buffer contains something */
+        if(databuffer.empty()) {
+          /* Empty buffer, wait for data */
+          need_more_data = true;
+          break;
+        }
+     
+        /* Find crlf start */
+        crlf_start = memcspn(databuffer,"\r\n",databuffer.size());
+        if(crlf_start == databuffer.size()) {
+          /* Not found, wait for more data */
+          need_more_data = true;
+          break;
+        }
 
-				/* See if we have enough data for determining crlf length */
-				if(databuffer.size() < crlf_start+5) {
-					/* Need more data */
-					need_more_data = true;
-					break;
-				}
+        /* See if we have enough data for determining crlf length */
+        if(databuffer.size() < crlf_start+5) {
+          /* Need more data */
+          need_more_data = true;
+          break;
+        }
 
-				/* Find crlf end and calculate crlf size */
-				crlf_end = memspn(((const char*)databuffer.head())+crlf_start,"\r\n",5);
-				crlf_size = (crlf_start + crlf_end) - crlf_start;
+        /* Find crlf end and calculate crlf size */
+        crlf_end = memspn(((const char*)databuffer.head())+crlf_start,"\r\n",5);
+        crlf_size = (crlf_start + crlf_end) - crlf_start;
 
-				/* Is this the end of a previous stream? (This is just before the boundary) */
-				if(crlf_start == 0) {
-					databuffer.consume(crlf_size);
-					continue;				
-				}
+        /* Is this the end of a previous stream? (This is just before the boundary) */
+        if(crlf_start == 0) {
+          databuffer.consume(crlf_size);
+          continue;        
+        }
 
-				/* Check for invalid CRLF size */
-				if(crlf_size > 4) {
-					Error("Invalid CRLF length");
-				}
+        /* Check for invalid CRLF size */
+        if(crlf_size > 4) {
+          Error("Invalid CRLF length");
+        }
 
-				/* Check if the crlf is \n\n or \r\n\r\n (marks end of headers, this is the last header) */
-				if( (crlf_size == 2 && memcmp(((const char*)databuffer.head())+crlf_start,"\n\n",2) == 0) || (crlf_size == 4 && memcmp(((const char*)databuffer.head())+crlf_start,"\r\n\r\n",4) == 0) ) {
-					/* This is the last header */
-					SubHeadersParsingComplete = true;
-				}
+        /* Check if the crlf is \n\n or \r\n\r\n (marks end of headers, this is the last header) */
+        if( (crlf_size == 2 && memcmp(((const char*)databuffer.head())+crlf_start,"\n\n",2) == 0) || (crlf_size == 4 && memcmp(((const char*)databuffer.head())+crlf_start,"\r\n\r\n",4) == 0) ) {
+          /* This is the last header */
+          SubHeadersParsingComplete = true;
+        }
 
-				/* Copy the subheader, excluding the crlf */
-				subheader.assign(databuffer, crlf_start);
+        /* Copy the subheader, excluding the crlf */
+        subheader.assign(databuffer, crlf_start);
 
-				/* Advance the buffer past this one */
-				databuffer.consume(crlf_start+crlf_size);
+        /* Advance the buffer past this one */
+        databuffer.consume(crlf_start+crlf_size);
 
-				Debug(7,"Got subheader: %s",subheader.c_str());
+        Debug(7,"Got subheader: %s",subheader.c_str());
 
-				/* Find where the data in this header starts */
-				size_t subheader_data_start = subheader.rfind(' ');
-				if(subheader_data_start == std::string::npos) {
-					subheader_data_start = subheader.find(':');
-				}
+        /* Find where the data in this header starts */
+        size_t subheader_data_start = subheader.rfind(' ');
+        if(subheader_data_start == std::string::npos) {
+          subheader_data_start = subheader.find(':');
+        }
 
-				/* Extract the data into a string */
-				std::string subheader_data = subheader.substr(subheader_data_start+1, std::string::npos);
+        /* Extract the data into a string */
+        std::string subheader_data = subheader.substr(subheader_data_start+1, std::string::npos);
 
-				Debug(8,"Got subheader data: %s",subheader_data.c_str());
+        Debug(8,"Got subheader data: %s",subheader_data.c_str());
 
-				/* Check the header */
-				if(strncasecmp(subheader.c_str(),content_length_match,content_length_match_len) == 0) {	
-					/* Found the content-length header */
-					frame_content_length = atoi(subheader_data.c_str());
-					Debug(6,"Got content-length subheader: %d",frame_content_length);
-				} else if(strncasecmp(subheader.c_str(),content_type_match,content_type_match_len) == 0) { 
-					/* Found the content-type header */
-					frame_content_type = subheader_data;
-					Debug(6,"Got content-type subheader: %s",frame_content_type.c_str());
-				}
+        /* Check the header */
+        if(strncasecmp(subheader.c_str(),content_length_match,content_length_match_len) == 0) {  
+          /* Found the content-length header */
+          frame_content_length = atoi(subheader_data.c_str());
+          Debug(6,"Got content-length subheader: %d",frame_content_length);
+        } else if(strncasecmp(subheader.c_str(),content_type_match,content_type_match_len) == 0) { 
+          /* Found the content-type header */
+          frame_content_type = subheader_data;
+          Debug(6,"Got content-type subheader: %s",frame_content_type.c_str());
+        }
 
-			}
+      }
 
-			/* Attempt to extract the frame */
-			if(!need_more_data) {
-				if(!SubHeadersParsingComplete) {
-					/* We haven't parsed all headers yet */
-					need_more_data = true;
-				} else if(frame_content_length <= 0) {
-					/* Invalid frame */
-					Error("Invalid frame: invalid content length");
-				} else if(frame_content_type != "image/jpeg") {
-					/* Unsupported frame type */
-					Error("Unsupported frame: %s",frame_content_type.c_str());
-				} else if(frame_content_length > databuffer.size()) {
-					/* Incomplete frame, wait for more data */
-					need_more_data = true;
-				} else {
-					/* All good. decode the image */
-					image.DecodeJpeg(databuffer.extract(frame_content_length), frame_content_length, colours, subpixelorder);
-					frameComplete = true;
-				}
-			}
+      /* Attempt to extract the frame */
+      if(!need_more_data) {
+        if(!SubHeadersParsingComplete) {
+          /* We haven't parsed all headers yet */
+          need_more_data = true;
+        } else if(frame_content_length <= 0) {
+          /* Invalid frame */
+          Error("Invalid frame: invalid content length");
+        } else if(frame_content_type != "image/jpeg") {
+          /* Unsupported frame type */
+          Error("Unsupported frame: %s",frame_content_type.c_str());
+        } else if(frame_content_length > databuffer.size()) {
+          /* Incomplete frame, wait for more data */
+          need_more_data = true;
+        } else {
+          /* All good. decode the image */
+          image.DecodeJpeg(databuffer.extract(frame_content_length), frame_content_length, colours, subpixelorder);
+          frameComplete = true;
+        }
+      }
 
-			/* Attempt to get more data */
-			if(need_more_data) {
-				nRet = pthread_cond_wait(&data_available_cond,&shareddata_mutex);
-				if(nRet != 0) {
-					Error("Failed waiting for available data condition variable: %s",strerror(nRet));
-					return -18;
-				}
-				need_more_data = false;
-			}
+      /* Attempt to get more data */
+      if(need_more_data) {
+        nRet = pthread_cond_wait(&data_available_cond,&shareddata_mutex);
+        if(nRet != 0) {
+          Error("Failed waiting for available data condition variable: %s",strerror(nRet));
+          return -18;
+        }
+        need_more_data = false;
+      }
 
-		} else if(mode == MODE_SINGLE) { 
-			/* Check if we have anything */
-			if (!single_offsets.empty()) {
-				if( (single_offsets.front() > 0) && (databuffer.size() >= single_offsets.front()) ) {
-					/* Extract frame */
-					image.DecodeJpeg(databuffer.extract(single_offsets.front()), single_offsets.front(), colours, subpixelorder);
-					single_offsets.pop_front();
-					frameComplete = true;
-				} else {
-					/* This shouldn't happen */
-					Error("Internal error. Attempting recovery");
-					databuffer.consume(single_offsets.front());
-					single_offsets.pop_front();
-				}
-			} else {
-				/* Don't have a frame yet, wait for the request complete condition variable */
-				nRet = pthread_cond_wait(&request_complete_cond,&shareddata_mutex);
-				if(nRet != 0) {
-					Error("Failed waiting for request complete condition variable: %s",strerror(nRet));
-					return -19;
-				}
-			}
-		} else {
-			/* Failed to match content-type */
-			Fatal("Unable to match Content-Type. Check URL, username and password");
-		} /* mode */
+    } else if(mode == MODE_SINGLE) { 
+      /* Check if we have anything */
+      if (!single_offsets.empty()) {
+        if( (single_offsets.front() > 0) && (databuffer.size() >= single_offsets.front()) ) {
+          /* Extract frame */
+          image.DecodeJpeg(databuffer.extract(single_offsets.front()), single_offsets.front(), colours, subpixelorder);
+          single_offsets.pop_front();
+          frameComplete = true;
+        } else {
+          /* This shouldn't happen */
+          Error("Internal error. Attempting recovery");
+          databuffer.consume(single_offsets.front());
+          single_offsets.pop_front();
+        }
+      } else {
+        /* Don't have a frame yet, wait for the request complete condition variable */
+        nRet = pthread_cond_wait(&request_complete_cond,&shareddata_mutex);
+        if(nRet != 0) {
+          Error("Failed waiting for request complete condition variable: %s",strerror(nRet));
+          return -19;
+        }
+      }
+    } else {
+      /* Failed to match content-type */
+      Fatal("Unable to match Content-Type. Check URL, username and password");
+    } /* mode */
 
-	} /* frameComplete loop */
+  } /* frameComplete loop */
 
-	/* Release the mutex */
-	unlock();
+  /* Release the mutex */
+  unlock();
 
-	if(!frameComplete)
-		return -1;
+  if(!frameComplete)
+    return -1;
 
-	return 0;
+  return 0;
 }
 
 int cURLCamera::PostCapture()
 {
-    // Nothing to do here
-    return( 0 );
+  // Nothing to do here
+  return( 0 );
 }
 
 int cURLCamera::CaptureAndRecord( Image &image, bool recording, char* event_directory )
 {
+	Error("Capture and Record not implemented for the cURL camera type");
     // Nothing to do here
     return( 0 );
 }
@@ -320,241 +321,241 @@ int cURLCamera::CaptureAndRecord( Image &image, bool recording, char* event_dire
 
 size_t cURLCamera::data_callback(void *buffer, size_t size, size_t nmemb, void *userdata)
 {
-	lock();
+  lock();
 
-	/* Append the data we just received to our buffer */
-	databuffer.append((const char*)buffer, size*nmemb);
+  /* Append the data we just received to our buffer */
+  databuffer.append((const char*)buffer, size*nmemb);
 
-	/* Signal data available */
-	nRet = pthread_cond_signal(&data_available_cond);
-	if(nRet != 0) {
-		Error("Failed signaling data available condition variable: %s",strerror(nRet));
-		return -16;
-	}
+  /* Signal data available */
+  nRet = pthread_cond_signal(&data_available_cond);
+  if(nRet != 0) {
+    Error("Failed signaling data available condition variable: %s",strerror(nRet));
+    return -16;
+  }
 
-	unlock();
+  unlock();
 
-	/* Return bytes processed */
-	return size*nmemb;
+  /* Return bytes processed */
+  return size*nmemb;
 }
 
 
 
 size_t cURLCamera::header_callback( void *buffer, size_t size, size_t nmemb, void *userdata)
 {
-	std::string header;
-	header.assign((const char*)buffer, size*nmemb);
-	
-	Debug(4,"Got header: %s",header.c_str());
+  std::string header;
+  header.assign((const char*)buffer, size*nmemb);
+  
+  Debug(4,"Got header: %s",header.c_str());
 
-	/* Check Content-Type header */	
-	if(strncasecmp(header.c_str(),content_type_match,content_type_match_len) == 0) {		
-		size_t pos = header.find(';');
-		if(pos != std::string::npos) {
-			header.erase(pos, std::string::npos);
-		}
+  /* Check Content-Type header */  
+  if(strncasecmp(header.c_str(),content_type_match,content_type_match_len) == 0) {    
+    size_t pos = header.find(';');
+    if(pos != std::string::npos) {
+      header.erase(pos, std::string::npos);
+    }
 
-		pos = header.rfind(' ');
-		if(pos == std::string::npos) {
-			pos = header.find(':');
-		}
+    pos = header.rfind(' ');
+    if(pos == std::string::npos) {
+      pos = header.find(':');
+    }
 
-		std::string content_type = header.substr(pos+1, std::string::npos);
-		Debug(6,"Content-Type is: %s",content_type.c_str());
+    std::string content_type = header.substr(pos+1, std::string::npos);
+    Debug(6,"Content-Type is: %s",content_type.c_str());
 
-		lock();
+    lock();
 
-		const char* multipart_match = "multipart/x-mixed-replace";
-		const char* image_jpeg_match = "image/jpeg";
-		if(strncasecmp(content_type.c_str(),multipart_match,strlen(multipart_match)) == 0) {	
-			Debug(7,"Content type matched as multipart/x-mixed-replace");
-			mode = MODE_STREAM;
-		} else if(strncasecmp(content_type.c_str(),image_jpeg_match,strlen(image_jpeg_match)) == 0) {
-			Debug(7,"Content type matched as image/jpeg");
-			mode = MODE_SINGLE;
-		}
+    const char* multipart_match = "multipart/x-mixed-replace";
+    const char* image_jpeg_match = "image/jpeg";
+    if(strncasecmp(content_type.c_str(),multipart_match,strlen(multipart_match)) == 0) {  
+      Debug(7,"Content type matched as multipart/x-mixed-replace");
+      mode = MODE_STREAM;
+    } else if(strncasecmp(content_type.c_str(),image_jpeg_match,strlen(image_jpeg_match)) == 0) {
+      Debug(7,"Content type matched as image/jpeg");
+      mode = MODE_SINGLE;
+    }
 
-		unlock();
-	}
-	
-	/* Return bytes processed */
-	return size*nmemb;
+    unlock();
+  }
+  
+  /* Return bytes processed */
+  return size*nmemb;
 }
 
 void* cURLCamera::thread_func()
 {
-	long tRet;
-	double dSize;
+  long tRet;
+  double dSize;
 
-	c = curl_easy_init();
-	if(c == NULL) {
-		Fatal("Failed getting easy handle from libcurl");
-	}
+  c = curl_easy_init();
+  if(c == NULL) {
+    Fatal("Failed getting easy handle from libcurl");
+  }
 
-	/* Set URL */
-	cRet = curl_easy_setopt(c, CURLOPT_URL, mPath.c_str());
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl URL: %s", curl_easy_strerror(cRet));
-	
-	/* Header callback */
-	cRet = curl_easy_setopt(c, CURLOPT_HEADERFUNCTION, &header_callback_dispatcher);
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl header callback function: %s", curl_easy_strerror(cRet));
-	cRet = curl_easy_setopt(c, CURLOPT_HEADERDATA, this);
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl header callback object: %s", curl_easy_strerror(cRet));
+  /* Set URL */
+  cRet = curl_easy_setopt(c, CURLOPT_URL, mPath.c_str());
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl URL: %s", curl_easy_strerror(cRet));
+  
+  /* Header callback */
+  cRet = curl_easy_setopt(c, CURLOPT_HEADERFUNCTION, &header_callback_dispatcher);
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl header callback function: %s", curl_easy_strerror(cRet));
+  cRet = curl_easy_setopt(c, CURLOPT_HEADERDATA, this);
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl header callback object: %s", curl_easy_strerror(cRet));
 
-	/* Data callback */
-	cRet = curl_easy_setopt(c, CURLOPT_WRITEFUNCTION, &data_callback_dispatcher);
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl data callback function: %s", curl_easy_strerror(cRet));
-	cRet = curl_easy_setopt(c, CURLOPT_WRITEDATA, this);
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl data callback object: %s", curl_easy_strerror(cRet));
+  /* Data callback */
+  cRet = curl_easy_setopt(c, CURLOPT_WRITEFUNCTION, &data_callback_dispatcher);
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl data callback function: %s", curl_easy_strerror(cRet));
+  cRet = curl_easy_setopt(c, CURLOPT_WRITEDATA, this);
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl data callback object: %s", curl_easy_strerror(cRet));
 
-	/* Progress callback */
-	cRet = curl_easy_setopt(c, CURLOPT_NOPROGRESS, 0);
-	if(cRet != CURLE_OK)
-		Fatal("Failed enabling libcurl progress callback function: %s", curl_easy_strerror(cRet));	
-	cRet = curl_easy_setopt(c, CURLOPT_PROGRESSFUNCTION, &progress_callback_dispatcher);
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl progress callback function: %s", curl_easy_strerror(cRet));
-	cRet = curl_easy_setopt(c, CURLOPT_PROGRESSDATA, this);
-	if(cRet != CURLE_OK)
-		Fatal("Failed setting libcurl progress callback object: %s", curl_easy_strerror(cRet));
+  /* Progress callback */
+  cRet = curl_easy_setopt(c, CURLOPT_NOPROGRESS, 0);
+  if(cRet != CURLE_OK)
+    Fatal("Failed enabling libcurl progress callback function: %s", curl_easy_strerror(cRet));  
+  cRet = curl_easy_setopt(c, CURLOPT_PROGRESSFUNCTION, &progress_callback_dispatcher);
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl progress callback function: %s", curl_easy_strerror(cRet));
+  cRet = curl_easy_setopt(c, CURLOPT_PROGRESSDATA, this);
+  if(cRet != CURLE_OK)
+    Fatal("Failed setting libcurl progress callback object: %s", curl_easy_strerror(cRet));
 
-	/* Set username and password */
-	if(!mUser.empty()) {
-		cRet = curl_easy_setopt(c, CURLOPT_USERNAME, mUser.c_str());
-		if(cRet != CURLE_OK)
-			Error("Failed setting username: %s", curl_easy_strerror(cRet));
-	}
-	if(!mPass.empty()) {
-		cRet = curl_easy_setopt(c, CURLOPT_PASSWORD, mPass.c_str());
-		if(cRet != CURLE_OK)
-			Error("Failed setting password: %s", curl_easy_strerror(cRet));
-	}
+  /* Set username and password */
+  if(!mUser.empty()) {
+    cRet = curl_easy_setopt(c, CURLOPT_USERNAME, mUser.c_str());
+    if(cRet != CURLE_OK)
+      Error("Failed setting username: %s", curl_easy_strerror(cRet));
+  }
+  if(!mPass.empty()) {
+    cRet = curl_easy_setopt(c, CURLOPT_PASSWORD, mPass.c_str());
+    if(cRet != CURLE_OK)
+      Error("Failed setting password: %s", curl_easy_strerror(cRet));
+  }
 
-	/* Authenication preference */
-	cRet = curl_easy_setopt(c, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
-	if(cRet != CURLE_OK)
-		Warning("Failed setting libcurl acceptable http authenication methods: %s", curl_easy_strerror(cRet));
+  /* Authenication preference */
+  cRet = curl_easy_setopt(c, CURLOPT_HTTPAUTH, CURLAUTH_ANY);
+  if(cRet != CURLE_OK)
+    Warning("Failed setting libcurl acceptable http authenication methods: %s", curl_easy_strerror(cRet));
 
 
-	/* Work loop */
-	for(int attempt=1;attempt<=CURL_MAXRETRY;attempt++) {
-		tRet = 0;
-		while(!bTerminate) {
-			/* Do the work */
-			cRet = curl_easy_perform(c);
+  /* Work loop */
+  for(int attempt=1;attempt<=CURL_MAXRETRY;attempt++) {
+    tRet = 0;
+    while(!bTerminate) {
+      /* Do the work */
+      cRet = curl_easy_perform(c);
 
-			if(mode == MODE_SINGLE) {
-				if(cRet != CURLE_OK) {
-					break;
-				}
-				/* Attempt to get the size of the file */
-				cRet = curl_easy_getinfo(c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &dSize);
-				if(cRet != CURLE_OK) {
-					break;
-				}
-				/* We need to lock for the offsets array and the condition variable */
-				lock();
-				/* Push the size into our offsets array */
-				if(dSize > 0) {
-					single_offsets.push_back(dSize);
-				} else {
-					Fatal("Unable to get the size of the image");
-				}
-				/* Signal the request complete condition variable */
-				tRet = pthread_cond_signal(&request_complete_cond);
-				if(tRet != 0) {
-					Error("Failed signaling request completed condition variable: %s",strerror(tRet));
-				}
-				/* Unlock */
-				unlock();
+      if(mode == MODE_SINGLE) {
+        if(cRet != CURLE_OK) {
+          break;
+        }
+        /* Attempt to get the size of the file */
+        cRet = curl_easy_getinfo(c, CURLINFO_CONTENT_LENGTH_DOWNLOAD, &dSize);
+        if(cRet != CURLE_OK) {
+          break;
+        }
+        /* We need to lock for the offsets array and the condition variable */
+        lock();
+        /* Push the size into our offsets array */
+        if(dSize > 0) {
+          single_offsets.push_back(dSize);
+        } else {
+          Fatal("Unable to get the size of the image");
+        }
+        /* Signal the request complete condition variable */
+        tRet = pthread_cond_signal(&request_complete_cond);
+        if(tRet != 0) {
+          Error("Failed signaling request completed condition variable: %s",strerror(tRet));
+        }
+        /* Unlock */
+        unlock();
 
-			} else if (mode == MODE_STREAM) {
-				break;
-			}
-		}
+      } else if (mode == MODE_STREAM) {
+        break;
+      }
+    }
 
-		/* Return value checking */
-		if(cRet == CURLE_ABORTED_BY_CALLBACK || bTerminate) {
-			/* Aborted */
-			break;
-		} else if (cRet != CURLE_OK) {
-			/* Some error */
-			Error("cURL Request failed: %s",curl_easy_strerror(cRet));
-			if(attempt < CURL_MAXRETRY) {
-				Error("Retrying.. Attempt %d of %d",attempt,CURL_MAXRETRY);
-				/* Do a reset */
-				lock();
-				databuffer.clear();
-				single_offsets.clear();
-				mode = MODE_UNSET;
-				bReset = true;
-				unlock();
-			}
-			tRet = -50;
-		}
-	}
-			
-	/* Cleanup */
-	curl_easy_cleanup(c);
-	c = NULL;
-	
-	return (void*)tRet;
+    /* Return value checking */
+    if(cRet == CURLE_ABORTED_BY_CALLBACK || bTerminate) {
+      /* Aborted */
+      break;
+    } else if (cRet != CURLE_OK) {
+      /* Some error */
+      Error("cURL Request failed: %s",curl_easy_strerror(cRet));
+      if(attempt < CURL_MAXRETRY) {
+        Error("Retrying.. Attempt %d of %d",attempt,CURL_MAXRETRY);
+        /* Do a reset */
+        lock();
+        databuffer.clear();
+        single_offsets.clear();
+        mode = MODE_UNSET;
+        bReset = true;
+        unlock();
+      }
+      tRet = -50;
+    }
+  }
+      
+  /* Cleanup */
+  curl_easy_cleanup(c);
+  c = NULL;
+  
+  return (void*)tRet;
 }
 
 int cURLCamera::lock() {
-	int nRet;
+  int nRet;
 
-	/* Lock shared data */
-	nRet = pthread_mutex_lock(&shareddata_mutex);
-	if(nRet != 0) {
-		Error("Failed locking shared data mutex: %s",strerror(nRet));
-	}
-	return nRet;
+  /* Lock shared data */
+  nRet = pthread_mutex_lock(&shareddata_mutex);
+  if(nRet != 0) {
+    Error("Failed locking shared data mutex: %s",strerror(nRet));
+  }
+  return nRet;
 }
 
 int cURLCamera::unlock() {
-	int nRet;
+  int nRet;
 
-	/* Unlock shared data */
-	nRet = pthread_mutex_unlock(&shareddata_mutex);
-	if(nRet != 0) {
-		Error("Failed unlocking shared data mutex: %s",strerror(nRet));
-	}
-	return nRet;
+  /* Unlock shared data */
+  nRet = pthread_mutex_unlock(&shareddata_mutex);
+  if(nRet != 0) {
+    Error("Failed unlocking shared data mutex: %s",strerror(nRet));
+  }
+  return nRet;
 }
 
 int cURLCamera::progress_callback(void *userdata, double dltotal, double dlnow, double ultotal, double ulnow)
 {
-	/* Signal the curl thread to terminate */
-	if(bTerminate)
-		return -10;
-	
-	return 0;
+  /* Signal the curl thread to terminate */
+  if(bTerminate)
+    return -10;
+  
+  return 0;
 }
 
 /* These functions call the functions in the class for the correct object */
 size_t data_callback_dispatcher(void *buffer, size_t size, size_t nmemb, void *userdata)
 {
-	return ((cURLCamera*)userdata)->data_callback(buffer,size,nmemb,userdata);
+  return ((cURLCamera*)userdata)->data_callback(buffer,size,nmemb,userdata);
 }
 
 size_t header_callback_dispatcher(void *buffer, size_t size, size_t nmemb, void *userdata)
 {
-	return ((cURLCamera*)userdata)->header_callback(buffer,size,nmemb,userdata);
+  return ((cURLCamera*)userdata)->header_callback(buffer,size,nmemb,userdata);
 }
 
 int progress_callback_dispatcher(void *userdata, double dltotal, double dlnow, double ultotal, double ulnow)
 {
-	return ((cURLCamera*)userdata)->progress_callback(userdata,dltotal,dlnow,ultotal,ulnow);
+  return ((cURLCamera*)userdata)->progress_callback(userdata,dltotal,dlnow,ultotal,ulnow);
 }
 
 void* thread_func_dispatcher(void* object) {
-	return ((cURLCamera*)object)->thread_func();
+  return ((cURLCamera*)object)->thread_func();
 }
 
 
diff --git a/src/zm_curl_camera.h b/src/zm_curl_camera.h
index a05d536ba..8b959f8f3 100644
--- a/src/zm_curl_camera.h
+++ b/src/zm_curl_camera.h
@@ -42,57 +42,56 @@
 class cURLCamera : public Camera
 {
 protected:
-	typedef enum {MODE_UNSET, MODE_SINGLE, MODE_STREAM} mode_t;
+  typedef enum {MODE_UNSET, MODE_SINGLE, MODE_STREAM} mode_t;
 
-	std::string mPath;
-	std::string mUser;
-	std::string mPass;
+  std::string mPath;
+  std::string mUser;
+  std::string mPass;
 
-	/* cURL object(s) */
-	CURL* c;
+  /* cURL object(s) */
+  CURL* c;
 
-	/* Shared data */
-	volatile bool bTerminate;
-	volatile bool bReset;
-	volatile mode_t mode;
-	Buffer databuffer;
-	std::deque<size_t> single_offsets;
+  /* Shared data */
+  volatile bool bTerminate;
+  volatile bool bReset;
+  volatile mode_t mode;
+  Buffer databuffer;
+  std::deque<size_t> single_offsets;
 
-	/* pthread objects */
-	pthread_t thread;
-	pthread_mutex_t shareddata_mutex;
-	pthread_cond_t data_available_cond;
-	pthread_cond_t request_complete_cond;
+  /* pthread objects */
+  pthread_t thread;
+  pthread_mutex_t shareddata_mutex;
+  pthread_cond_t data_available_cond;
+  pthread_cond_t request_complete_cond;
 
 public:
-	cURLCamera( int p_id, const std::string &path, const std::string &username, const std::string &password,  int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	~cURLCamera();
+  cURLCamera( int p_id, const std::string &path, const std::string &username, const std::string &password,  int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  ~cURLCamera();
 
-	const std::string &Path() const { return( mPath ); }
-	const std::string &Username() const { return( mUser ); }
-	const std::string &Password() const { return( mPass ); }
+  const std::string &Path() const { return( mPath ); }
+  const std::string &Username() const { return( mUser ); }
+  const std::string &Password() const { return( mPass ); }
 
-	void Initialise();
-	void Terminate();
+  void Initialise();
+  void Terminate();
 
-	int PrimeCapture();
-	int PreCapture();
-	int Capture( Image &image );
-	int PostCapture();
+  int PrimeCapture();
+  int PreCapture();
+  int Capture( Image &image );
+  int PostCapture();
 	int CaptureAndRecord( Image &image, bool recording, char* event_directory);
 
-
-	size_t data_callback(void *buffer, size_t size, size_t nmemb, void *userdata);
-	size_t header_callback(void *buffer, size_t size, size_t nmemb, void *userdata);
-	int progress_callback(void *userdata, double dltotal, double dlnow, double ultotal, double ulnow);	
-	int debug_callback(CURL* handle, curl_infotype type, char* str, size_t strsize, void* data);
-	void* thread_func();
-	int lock();
-	int unlock();
+  size_t data_callback(void *buffer, size_t size, size_t nmemb, void *userdata);
+  size_t header_callback(void *buffer, size_t size, size_t nmemb, void *userdata);
+  int progress_callback(void *userdata, double dltotal, double dlnow, double ultotal, double ulnow);  
+  int debug_callback(CURL* handle, curl_infotype type, char* str, size_t strsize, void* data);
+  void* thread_func();
+  int lock();
+  int unlock();
 
 private:
-	int nRet;
-	CURLcode cRet;
+  int nRet;
+  CURLcode cRet;
 
 };
 
diff --git a/src/zm_db.cpp b/src/zm_db.cpp
index a342ca14b..8f2527fc2 100644
--- a/src/zm_db.cpp
+++ b/src/zm_db.cpp
@@ -29,85 +29,85 @@ int zmDbConnected = false;
 
 void zmDbConnect()
 {
-	if ( !mysql_init( &dbconn ) )
-	{
-		Error( "Can't initialise database connection: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-    my_bool reconnect = 1;
-    if ( mysql_options( &dbconn, MYSQL_OPT_RECONNECT, &reconnect ) )
-        Fatal( "Can't set database auto reconnect option: %s", mysql_error( &dbconn ) );
-    std::string::size_type colonIndex = staticConfig.DB_HOST.find( ":/" );
-    if ( colonIndex != std::string::npos )
+  if ( !mysql_init( &dbconn ) )
+  {
+    Error( "Can't initialise database connection: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  my_bool reconnect = 1;
+  if ( mysql_options( &dbconn, MYSQL_OPT_RECONNECT, &reconnect ) )
+    Fatal( "Can't set database auto reconnect option: %s", mysql_error( &dbconn ) );
+  std::string::size_type colonIndex = staticConfig.DB_HOST.find( ":/" );
+  if ( colonIndex != std::string::npos )
+  {
+    std::string dbHost = staticConfig.DB_HOST.substr( 0, colonIndex );
+    std::string dbPort = staticConfig.DB_HOST.substr( colonIndex+1 );
+    if ( !mysql_real_connect( &dbconn, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, atoi(dbPort.c_str()), 0, 0 ) )
     {
-        std::string dbHost = staticConfig.DB_HOST.substr( 0, colonIndex );
-        std::string dbPort = staticConfig.DB_HOST.substr( colonIndex+1 );
-	    if ( !mysql_real_connect( &dbconn, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, atoi(dbPort.c_str()), 0, 0 ) )
-	    {
-		    Error( "Can't connect to server: %s", mysql_error( &dbconn ) );
-		    exit( mysql_errno( &dbconn ) );
-	    }
+      Error( "Can't connect to server: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
     }
-    else
+  }
+  else
+  {
+    if ( !mysql_real_connect( &dbconn, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, 0, 0, 0 ) )
     {
-	    if ( !mysql_real_connect( &dbconn, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, 0, 0, 0 ) )
-	    {
-		    Error( "Can't connect to server: %s", mysql_error( &dbconn ) );
-		    exit( mysql_errno( &dbconn ) );
-	    }
+      Error( "Can't connect to server: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
     }
-	if ( mysql_select_db( &dbconn, staticConfig.DB_NAME.c_str() ) )
-	{
-		Error( "Can't select database: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-    zmDbConnected = true;
+  }
+  if ( mysql_select_db( &dbconn, staticConfig.DB_NAME.c_str() ) )
+  {
+    Error( "Can't select database: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  zmDbConnected = true;
 }
 
 void zmDbClose()
 {
-    if ( zmDbConnected )
-    {
-        mysql_close( &dbconn );
-        // mysql_init() call implicitly mysql_library_init() but
-        // mysql_close() does not call mysql_library_end()
-        mysql_library_end();
-        zmDbConnected = false;
-    }
+  if ( zmDbConnected )
+  {
+    mysql_close( &dbconn );
+    // mysql_init() call implicitly mysql_library_init() but
+    // mysql_close() does not call mysql_library_end()
+    mysql_library_end();
+    zmDbConnected = false;
+  }
 }
 
 MYSQL_RES * zmDbFetch( const char * query ) {
-	if ( ! zmDbConnected ) {
-		Error( "Not connected." );
-		return NULL;
-	}
+  if ( ! zmDbConnected ) {
+    Error( "Not connected." );
+    return NULL;
+  }
 
-	if ( mysql_query( &dbconn, query ) ) {
-		Error( "Can't run query: %s", mysql_error( &dbconn ) );
-		return NULL;
-	}
-	Debug( 4, "Success running query: %s", query );
-	MYSQL_RES *result = mysql_store_result( &dbconn );
-	if ( !result ) {
-		Error( "Can't use query result: %s for query %s", mysql_error( &dbconn ), query );
-		return NULL;
-	}
-	return result;
+  if ( mysql_query( &dbconn, query ) ) {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    return NULL;
+  }
+  Debug( 4, "Success running query: %s", query );
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result ) {
+    Error( "Can't use query result: %s for query %s", mysql_error( &dbconn ), query );
+    return NULL;
+  }
+  return result;
 } // end MYSQL_RES * zmDbFetch( const char * query );
 
 MYSQL_ROW zmDbFetchOne( const char *query ) {
-	MYSQL_RES *result = zmDbFetch( query );
-	int n_rows = mysql_num_rows( result );
-	if ( n_rows != 1 ) {
-		Error( "Bogus number of lines return from query, %d returned for query %s.", n_rows, query );
-		return NULL;
-	}
+  MYSQL_RES *result = zmDbFetch( query );
+  int n_rows = mysql_num_rows( result );
+  if ( n_rows != 1 ) {
+    Error( "Bogus number of lines return from query, %d returned for query %s.", n_rows, query );
+    return NULL;
+  }
 
-	MYSQL_ROW dbrow = mysql_fetch_row( result );
-	mysql_free_result( result );
-	if ( ! dbrow ) {
-		Error("Error getting row from query %s. Error is %s", query, mysql_error( &dbconn ) );
-		return NULL;
-	}
-	return dbrow;
+  MYSQL_ROW dbrow = mysql_fetch_row( result );
+  mysql_free_result( result );
+  if ( ! dbrow ) {
+    Error("Error getting row from query %s. Error is %s", query, mysql_error( &dbconn ) );
+    return NULL;
+  }
+  return dbrow;
 }
diff --git a/src/zm_event.cpp b/src/zm_event.cpp
old mode 100755
new mode 100644
index 55691395e..104900bb8
--- a/src/zm_event.cpp
+++ b/src/zm_event.cpp
@@ -60,1553 +60,1556 @@ int Event::pre_alarm_count = 0;
 Event::PreAlarmData Event::pre_alarm_data[MAX_PRE_ALARM_FRAMES] = { { 0 } };
 
 Event::Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent ) :
-    monitor( p_monitor ),
-    start_time( p_start_time ),
-    cause( p_cause ),
-    noteSetMap( p_noteSetMap ),
-    videoEvent( p_videoEvent ),
-    videowriter( NULL )
+  monitor( p_monitor ),
+  start_time( p_start_time ),
+  cause( p_cause ),
+  noteSetMap( p_noteSetMap ),
+  videoEvent( p_videoEvent ),
+  videowriter( NULL )
 {
-    if ( !initialised )
-        Initialise();
+  if ( !initialised )
+    Initialise();
 
-    std::string notes;
-    createNotes( notes );
+  std::string notes;
+  createNotes( notes );
 
-    bool untimedEvent = false;
-    if ( !start_time.tv_sec )
+  bool untimedEvent = false;
+  if ( !start_time.tv_sec )
+  {
+    untimedEvent = true;
+    gettimeofday( &start_time, 0 );
+  }
+
+  static char sql[ZM_SQL_MED_BUFSIZ];
+
+  struct tm *stime = localtime( &start_time.tv_sec );
+  snprintf( sql, sizeof(sql), "insert into Events ( MonitorId, Name, StartTime, Width, Height, Cause, Notes, Videoed ) values ( %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', '%d' )", monitor->Id(), start_time.tv_sec, monitor->Width(), monitor->Height(), cause.c_str(), notes.c_str(), videoEvent );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't insert event: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  id = mysql_insert_id( &dbconn );
+  if ( untimedEvent )
+  {
+    Warning( "Event %d has zero time, setting to current", id );
+  }
+  end_time.tv_sec = 0;
+  frames = 0;
+  alarm_frames = 0;
+  tot_score = 0;
+  max_score = 0;
+
+  if ( config.use_deep_storage )
+  {
+    char *path_ptr = path;
+    path_ptr += snprintf( path_ptr, sizeof(path), "%s/%d", config.dir_events, monitor->Id() );
+
+    int dt_parts[6];
+    dt_parts[0] = stime->tm_year-100;
+    dt_parts[1] = stime->tm_mon+1;
+    dt_parts[2] = stime->tm_mday;
+    dt_parts[3] = stime->tm_hour;
+    dt_parts[4] = stime->tm_min;
+    dt_parts[5] = stime->tm_sec;
+
+    char date_path[PATH_MAX] = "";
+    char time_path[PATH_MAX] = "";
+    char *time_path_ptr = time_path;
+    for ( unsigned int i = 0; i < sizeof(dt_parts)/sizeof(*dt_parts); i++ )
     {
-        untimedEvent = true;
-        gettimeofday( &start_time, 0 );
-    }
+      path_ptr += snprintf( path_ptr, sizeof(path)-(path_ptr-path), "/%02d", dt_parts[i] );
 
-    static char sql[ZM_SQL_MED_BUFSIZ];
-
-    struct tm *stime = localtime( &start_time.tv_sec );
-    snprintf( sql, sizeof(sql), "insert into Events ( MonitorId, Name, StartTime, Width, Height, Cause, Notes, Videoed ) values ( %d, 'New Event', from_unixtime( %ld ), %d, %d, '%s', '%s', '%d' )", monitor->Id(), start_time.tv_sec, monitor->Width(), monitor->Height(), cause.c_str(), notes.c_str(), videoEvent );
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't insert event: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    id = mysql_insert_id( &dbconn );
-    if ( untimedEvent )
-    {
-        Warning( "Event %d has zero time, setting to current", id );
-    }
-    end_time.tv_sec = 0;
-    frames = 0;
-    alarm_frames = 0;
-    tot_score = 0;
-    max_score = 0;
-
-    if ( config.use_deep_storage )
-    {
-        char *path_ptr = path;
-        path_ptr += snprintf( path_ptr, sizeof(path), "%s/%d", config.dir_events, monitor->Id() );
-
-        int dt_parts[6];
-        dt_parts[0] = stime->tm_year-100;
-        dt_parts[1] = stime->tm_mon+1;
-        dt_parts[2] = stime->tm_mday;
-        dt_parts[3] = stime->tm_hour;
-        dt_parts[4] = stime->tm_min;
-        dt_parts[5] = stime->tm_sec;
-
-        char date_path[PATH_MAX] = "";
-        char time_path[PATH_MAX] = "";
-        char *time_path_ptr = time_path;
-        for ( unsigned int i = 0; i < sizeof(dt_parts)/sizeof(*dt_parts); i++ )
-        {
-            path_ptr += snprintf( path_ptr, sizeof(path)-(path_ptr-path), "/%02d", dt_parts[i] );
-
-            struct stat statbuf;
-            errno = 0;
-            stat( path, &statbuf );
-            if ( errno == ENOENT || errno == ENOTDIR )
-            {
-                if ( mkdir( path, 0755 ) )
-                {
-                    Fatal( "Can't mkdir %s: %s", path, strerror(errno));
-                }
-            }
-            if ( i == 2 )
-                strncpy( date_path, path, sizeof(date_path) );
-            else if ( i >= 3 )
-                time_path_ptr += snprintf( time_path_ptr, sizeof(time_path)-(time_path_ptr-time_path), "%s%02d", i>3?"/":"", dt_parts[i] );
-        }
-        char id_file[PATH_MAX];
-        // Create event id symlink
-        snprintf( id_file, sizeof(id_file), "%s/.%d", date_path, id );
-        if ( symlink( time_path, id_file ) < 0 )
-            Fatal( "Can't symlink %s -> %s: %s", id_file, path, strerror(errno));
-        // Create empty id tag file
-        snprintf( id_file, sizeof(id_file), "%s/.%d", path, id );
-        if ( FILE *id_fp = fopen( id_file, "w" ) )
-            fclose( id_fp );
-        else
-            Fatal( "Can't fopen %s: %s", id_file, strerror(errno));
-    }
-    else
-    {
-        snprintf( path, sizeof(path), "%s/%d/%d", config.dir_events, monitor->Id(), id );
-        
-        struct stat statbuf;
-        errno = 0;
-        stat( path, &statbuf );
+      struct stat statbuf;
+      errno = 0;
+      if ( stat( path, &statbuf ) ) {
         if ( errno == ENOENT || errno == ENOTDIR )
         {
-            if ( mkdir( path, 0755 ) )
-            {
-                Error( "Can't mkdir %s: %s", path, strerror(errno));
-            }
+          if ( mkdir( path, 0755 ) )
+          {
+            Fatal( "Can't mkdir %s: %s", path, strerror(errno));
+          }
+        } else {
+          Warning( "Error stat'ing %s, may be fatal. error is %s", path, strerror(errno));
         }
-        char id_file[PATH_MAX];
-        // Create empty id tag file
-        snprintf( id_file, sizeof(id_file), "%s/.%d", path, id );
-        if ( FILE *id_fp = fopen( id_file, "w" ) )
-            fclose( id_fp );
-        else
-            Fatal( "Can't fopen %s: %s", id_file, strerror(errno));
+      }
+      if ( i == 2 )
+        strncpy( date_path, path, sizeof(date_path) );
+      else if ( i >= 3 )
+        time_path_ptr += snprintf( time_path_ptr, sizeof(time_path)-(time_path_ptr-time_path), "%s%02d", i>3?"/":"", dt_parts[i] );
     }
-    last_db_frame = 0;
+    char id_file[PATH_MAX];
+    // Create event id symlink
+    snprintf( id_file, sizeof(id_file), "%s/.%d", date_path, id );
+    if ( symlink( time_path, id_file ) < 0 )
+      Fatal( "Can't symlink %s -> %s: %s", id_file, path, strerror(errno));
+    // Create empty id tag file
+    snprintf( id_file, sizeof(id_file), "%s/.%d", path, id );
+    if ( FILE *id_fp = fopen( id_file, "w" ) )
+      fclose( id_fp );
+    else
+      Fatal( "Can't fopen %s: %s", id_file, strerror(errno));
+  }
+  else
+  {
+    snprintf( path, sizeof(path), "%s/%d/%d", config.dir_events, monitor->Id(), id );
+    
+    struct stat statbuf;
+    errno = 0;
+    stat( path, &statbuf );
+    if ( errno == ENOENT || errno == ENOTDIR )
+    {
+      if ( mkdir( path, 0755 ) )
+      {
+        Error( "Can't mkdir %s: %s", path, strerror(errno));
+      }
+    }
+    char id_file[PATH_MAX];
+    // Create empty id tag file
+    snprintf( id_file, sizeof(id_file), "%s/.%d", path, id );
+    if ( FILE *id_fp = fopen( id_file, "w" ) )
+      fclose( id_fp );
+    else
+      Fatal( "Can't fopen %s: %s", id_file, strerror(errno));
+  }
+  last_db_frame = 0;
 
-	video_name[0] = 0;
+  video_name[0] = 0;
 
-	/* Save as video */
+  /* Save as video */
 
-	if ( monitor->GetOptVideoWriter() != 0 ) {
-		int nRet; 
-		snprintf( video_name, sizeof(video_name), "%d-%s", id, "video.mp4" );
-		snprintf( video_file, sizeof(video_file), video_file_format, path, video_name );
-		snprintf( timecodes_name, sizeof(timecodes_name), "%d-%s", id, "video.timecodes" );
-		snprintf( timecodes_file, sizeof(timecodes_file), video_file_format, path, timecodes_name );
+  if ( monitor->GetOptVideoWriter() != 0 ) {
+    int nRet; 
+    snprintf( video_name, sizeof(video_name), "%d-%s", id, "video.mp4" );
+    snprintf( video_file, sizeof(video_file), video_file_format, path, video_name );
+    snprintf( timecodes_name, sizeof(timecodes_name), "%d-%s", id, "video.timecodes" );
+    snprintf( timecodes_file, sizeof(timecodes_file), video_file_format, path, timecodes_name );
 
-
-		/* X264 MP4 video writer */
-		if(monitor->GetOptVideoWriter() == 1) {
+    /* X264 MP4 video writer */
+    if(monitor->GetOptVideoWriter() == 1) {
 #if ZM_HAVE_VIDEOWRITER_X264MP4
-			videowriter = new X264MP4Writer(video_file, monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder(), monitor->GetOptEncoderParams());
+      videowriter = new X264MP4Writer(video_file, monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder(), monitor->GetOptEncoderParams());
 #else
-			videowriter = NULL;
-			Error("ZoneMinder was not compiled with the X264 MP4 video writer, check dependencies (x264 and mp4v2)");
+      videowriter = NULL;
+      Error("ZoneMinder was not compiled with the X264 MP4 video writer, check dependencies (x264 and mp4v2)");
 #endif
-		}
+    }
 
-		if(videowriter != NULL) {
-			/* Open the video stream */
-			nRet = videowriter->Open();
-			if(nRet != 0) {
-				Error("Failed opening video stream");
-				delete videowriter;
-				videowriter = NULL;
-			}
+    if(videowriter != NULL) {
+      /* Open the video stream */
+      nRet = videowriter->Open();
+      if(nRet != 0) {
+        Error("Failed opening video stream");
+        delete videowriter;
+        videowriter = NULL;
+      }
 
-			/* Create timecodes file */
-			timecodes_fd = fopen(timecodes_file, "wb");
-			if(timecodes_fd == NULL) {
-				Error("Failed creating timecodes file");
-			}
-		}
-	} else {
-		/* No video object */
-		videowriter = NULL;
-	}
+    /* Create timecodes file */
+    timecodes_fd = fopen(timecodes_file, "wb");
+      if(timecodes_fd == NULL) {
+        Error("Failed creating timecodes file");
+      }
+    }
+  } else {
+    /* No video object */
+    videowriter = NULL;
+  }
 
 }
 
 Event::~Event()
 {
-    if ( frames > last_db_frame )
-    {
-        struct DeltaTimeval delta_time;
-        DELTA_TIMEVAL( delta_time, end_time, start_time, DT_PREC_2 );
-
-        Debug( 1, "Adding closing frame %d to DB", frames );
-        static char sql[ZM_SQL_SML_BUFSIZ];
-        snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %ld ), %s%ld.%02ld )", id, frames, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
-        if ( mysql_query( &dbconn, sql ) )
-        {
-            Error( "Can't insert frame: %s", mysql_error( &dbconn ) );
-            exit( mysql_errno( &dbconn ) );
-        }
-    }
-
-	/* Close the video file */
-	if ( videowriter != NULL ) {
-		int nRet; 
-
-		nRet = videowriter->Close();
-		if(nRet != 0) {
-			Error("Failed closing video stream");
-		}
-		delete videowriter;
-		videowriter = NULL;
-
-		/* Close the timecodes file */
-		fclose(timecodes_fd);
-		timecodes_fd = NULL;
-	}
-
-    static char sql[ZM_SQL_MED_BUFSIZ];
-
+  if ( frames > last_db_frame )
+  {
     struct DeltaTimeval delta_time;
     DELTA_TIMEVAL( delta_time, end_time, start_time, DT_PREC_2 );
 
-    snprintf( sql, sizeof(sql), "update Events set Name='%s%d', EndTime = from_unixtime( %ld ), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, DefaultVideo = '%s' where Id = %d", monitor->EventPrefix(), id, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, frames, alarm_frames, tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score, video_name, id );
+    Debug( 1, "Adding closing frame %d to DB", frames );
+    static char sql[ZM_SQL_SML_BUFSIZ];
+    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ( %d, %d, from_unixtime( %ld ), %s%ld.%02ld )", id, frames, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
     if ( mysql_query( &dbconn, sql ) )
     {
-        Error( "Can't update event: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
+      Error( "Can't insert frame: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
     }
+  }
+
+  /* Close the video file */
+  if ( videowriter != NULL ) {
+    int nRet; 
+
+    nRet = videowriter->Close();
+    if(nRet != 0) {
+      Error("Failed closing video stream");
+    }
+    delete videowriter;
+    videowriter = NULL;
+
+    /* Close the timecodes file */
+    fclose(timecodes_fd);
+    timecodes_fd = NULL;
+  }
+
+  static char sql[ZM_SQL_MED_BUFSIZ];
+
+  struct DeltaTimeval delta_time;
+  DELTA_TIMEVAL( delta_time, end_time, start_time, DT_PREC_2 );
+
+  snprintf( sql, sizeof(sql), "update Events set Name='%s%d', EndTime = from_unixtime( %ld ), Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d, DefaultVideo = '%s' where Id = %d", monitor->EventPrefix(), id, end_time.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, frames, alarm_frames, tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score, video_name, id );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't update event: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 }
 
 void Event::createNotes( std::string &notes )
 {
-    notes.clear();
-    for ( StringSetMap::const_iterator mapIter = noteSetMap.begin(); mapIter != noteSetMap.end(); mapIter++ )
+  notes.clear();
+  for ( StringSetMap::const_iterator mapIter = noteSetMap.begin(); mapIter != noteSetMap.end(); mapIter++ )
+  {
+    notes += mapIter->first;
+    notes += ": ";
+    const StringSet &stringSet = mapIter->second;
+    for ( StringSet::const_iterator setIter = stringSet.begin(); setIter != stringSet.end(); setIter++ )
     {
-        notes += mapIter->first;
-        notes += ": ";
-        const StringSet &stringSet = mapIter->second;
-        for ( StringSet::const_iterator setIter = stringSet.begin(); setIter != stringSet.end(); setIter++ )
-        {
-            if ( setIter != stringSet.begin() )
-                notes += ", ";
-            notes += *setIter;
-        }
+      if ( setIter != stringSet.begin() )
+        notes += ", ";
+      notes += *setIter;
     }
+  }
 }
 
 int Event::sd = -1;
 
 bool Event::OpenFrameSocket( int monitor_id )
 {
-    if ( sd > 0 )
+  if ( sd > 0 )
+  {
+    close( sd );
+  }
+
+  sd = socket( AF_UNIX, SOCK_STREAM, 0);
+  if ( sd < 0 )
+  {
+    Error( "Can't create socket: %s", strerror(errno) );
+    return( false );
+  }
+
+  int socket_buffer_size = config.frame_socket_size;
+  if ( socket_buffer_size > 0 )
+  {
+    if ( setsockopt( sd, SOL_SOCKET, SO_SNDBUF, &socket_buffer_size, sizeof(socket_buffer_size) ) < 0 )
     {
-        close( sd );
+      Error( "Can't get socket buffer size to %d, error = %s", socket_buffer_size, strerror(errno) );
+      close( sd );
+      sd = -1;
+      return( false );
     }
+  }
 
-    sd = socket( AF_UNIX, SOCK_STREAM, 0);
-    if ( sd < 0 )
-    {
-        Error( "Can't create socket: %s", strerror(errno) );
-        return( false );
-    }
+  int flags;
+  if ( (flags = fcntl( sd, F_GETFL )) < 0 )
+  {
+    Error( "Can't get socket flags, error = %s", strerror(errno) );
+    close( sd );
+    sd = -1;
+    return( false );
+  }
+  flags |= O_NONBLOCK;
+  if ( fcntl( sd, F_SETFL, flags ) < 0 )
+  {
+    Error( "Can't set socket flags, error = %s", strerror(errno) );
+    close( sd );
+    sd = -1;
+    return( false );
+  }
 
-    int socket_buffer_size = config.frame_socket_size;
-    if ( socket_buffer_size > 0 )
-    {
-        if ( setsockopt( sd, SOL_SOCKET, SO_SNDBUF, &socket_buffer_size, sizeof(socket_buffer_size) ) < 0 )
-        {
-            Error( "Can't get socket buffer size to %d, error = %s", socket_buffer_size, strerror(errno) );
-            close( sd );
-            sd = -1;
-            return( false );
-        }
-    }
+  char sock_path[PATH_MAX] = "";
+  snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
 
-    int flags;
-    if ( (flags = fcntl( sd, F_GETFL )) < 0 )
-    {
-        Error( "Can't get socket flags, error = %s", strerror(errno) );
-        close( sd );
-        sd = -1;
-        return( false );
-    }
-    flags |= O_NONBLOCK;
-    if ( fcntl( sd, F_SETFL, flags ) < 0 )
-    {
-        Error( "Can't set socket flags, error = %s", strerror(errno) );
-        close( sd );
-        sd = -1;
-        return( false );
-    }
+  struct sockaddr_un addr;
 
-    char sock_path[PATH_MAX] = "";
-    snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
+  strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
+  addr.sun_family = AF_UNIX;
 
-    struct sockaddr_un addr;
+  if ( connect( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+  {
+    Warning( "Can't connect to frame server: %s", strerror(errno) );
+    close( sd );
+    sd = -1;
+    return( false );
+  }
 
-    strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
-    addr.sun_family = AF_UNIX;
-
-    if ( connect( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
-    {
-        Warning( "Can't connect to frame server: %s", strerror(errno) );
-        close( sd );
-        sd = -1;
-        return( false );
-    }
-
-    Debug( 1, "Opened connection to frame server" );
-    return( true );
+  Debug( 1, "Opened connection to frame server" );
+  return( true );
 }
 
 bool Event::ValidateFrameSocket( int monitor_id )
 {
-    if ( sd < 0 )
-    {
-        return( OpenFrameSocket( monitor_id ) );
-    }
-    return( true );
+  if ( sd < 0 )
+  {
+    return( OpenFrameSocket( monitor_id ) );
+  }
+  return( true );
 }
 
 bool Event::SendFrameImage( const Image *image, bool alarm_frame )
 {
-    if ( !ValidateFrameSocket( monitor->Id() ) )
+  if ( !ValidateFrameSocket( monitor->Id() ) )
+  {
+    return( false );
+  }
+
+  static int jpg_buffer_size = 0;
+  static unsigned char jpg_buffer[ZM_MAX_IMAGE_SIZE];
+
+  image->EncodeJpeg( jpg_buffer, &jpg_buffer_size, (alarm_frame&&(config.jpeg_alarm_file_quality>config.jpeg_file_quality))?config.jpeg_alarm_file_quality:config.jpeg_file_quality );
+
+  static FrameHeader frame_header;
+
+  frame_header.event_id = id;
+  if ( config.use_deep_storage )
+    frame_header.event_time = start_time.tv_sec;
+  frame_header.frame_id = frames;
+  frame_header.alarm_frame = alarm_frame;
+  frame_header.image_length = jpg_buffer_size;
+
+  struct iovec iovecs[2];
+  iovecs[0].iov_base = &frame_header;
+  iovecs[0].iov_len = sizeof(frame_header);
+  iovecs[1].iov_base = jpg_buffer;
+  iovecs[1].iov_len = jpg_buffer_size;
+
+  ssize_t writev_size = sizeof(frame_header)+jpg_buffer_size;
+  ssize_t writev_result = writev( sd, iovecs, sizeof(iovecs)/sizeof(*iovecs));
+  if ( writev_result != writev_size )
+  {
+    if ( writev_result < 0 )
     {
-        return( false );
+      if ( errno == EAGAIN )
+      {
+        Warning( "Blocking write detected" );
+      }
+      else
+      {
+        Error( "Can't write frame: %s", strerror(errno) );
+        close( sd );
+        sd = -1;
+      }
     }
-
-    static int jpg_buffer_size = 0;
-    static unsigned char jpg_buffer[ZM_MAX_IMAGE_SIZE];
-
-    image->EncodeJpeg( jpg_buffer, &jpg_buffer_size, (alarm_frame&&(config.jpeg_alarm_file_quality>config.jpeg_file_quality))?config.jpeg_alarm_file_quality:config.jpeg_file_quality );
-
-    static FrameHeader frame_header;
-
-    frame_header.event_id = id;
-    if ( config.use_deep_storage )
-        frame_header.event_time = start_time.tv_sec;
-    frame_header.frame_id = frames;
-    frame_header.alarm_frame = alarm_frame;
-    frame_header.image_length = jpg_buffer_size;
-
-    struct iovec iovecs[2];
-    iovecs[0].iov_base = &frame_header;
-    iovecs[0].iov_len = sizeof(frame_header);
-    iovecs[1].iov_base = jpg_buffer;
-    iovecs[1].iov_len = jpg_buffer_size;
-
-    ssize_t writev_size = sizeof(frame_header)+jpg_buffer_size;
-    ssize_t writev_result = writev( sd, iovecs, sizeof(iovecs)/sizeof(*iovecs));
-    if ( writev_result != writev_size )
+    else
     {
-        if ( writev_result < 0 )
-        {
-            if ( errno == EAGAIN )
-            {
-                Warning( "Blocking write detected" );
-            }
-            else
-            {
-                Error( "Can't write frame: %s", strerror(errno) );
-                close( sd );
-                sd = -1;
-            }
-        }
-        else
-        {
-            Error( "Incomplete frame write: %zd of %zd bytes written", writev_result, writev_size );
-            close( sd );
-            sd = -1;
-        }
-        return( false );
+      Error( "Incomplete frame write: %zd of %zd bytes written", writev_result, writev_size );
+      close( sd );
+      sd = -1;
     }
-    Debug( 1, "Wrote frame image, %d bytes", jpg_buffer_size );
+    return( false );
+  }
+  Debug( 1, "Wrote frame image, %d bytes", jpg_buffer_size );
 
-    return( true );
+  return( true );
 }
 
 bool Event::WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame )
 {
-    Image* ImgToWrite;
-    Image* ts_image = NULL;
+  Image* ImgToWrite;
+  Image* ts_image = NULL;
 
-    if ( config.timestamp_on_capture )  // stash the image we plan to use in another pointer regardless if timestamped.
-    {
-        ts_image = new Image(*image);
-        monitor->TimestampImage( ts_image, &timestamp );
-        ImgToWrite=ts_image;
-    }
-    else
-        ImgToWrite=image;
+  if ( config.timestamp_on_capture )  // stash the image we plan to use in another pointer regardless if timestamped.
+  {
+    ts_image = new Image(*image);
+    monitor->TimestampImage( ts_image, &timestamp );
+    ImgToWrite=ts_image;
+  }
+  else
+    ImgToWrite=image;
 
-    if ( !config.opt_frame_server || !SendFrameImage(ImgToWrite, alarm_frame) )
-    {
-        int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use, zero is default
-        ImgToWrite->WriteJpeg( event_file, thisquality, (monitor->Exif() ? timestamp : (timeval){0,0}) ); // exif is only timestamp at present this switches on or off for write
-    }
-    if(ts_image) delete(ts_image); // clean up if used.
-    return( true );
+  if ( !config.opt_frame_server || !SendFrameImage(ImgToWrite, alarm_frame) )
+  {
+    int thisquality = ( alarm_frame && (config.jpeg_alarm_file_quality > config.jpeg_file_quality) ) ? config.jpeg_alarm_file_quality : 0 ;   // quality to use, zero is default
+    ImgToWrite->WriteJpeg( event_file, thisquality, (monitor->Exif() ? timestamp : (timeval){0,0}) ); // exif is only timestamp at present this switches on or off for write
+  }
+  if(ts_image) delete(ts_image); // clean up if used.
+  return( true );
 }
 
 bool Event::WriteFrameVideo( const Image *image, const struct timeval timestamp, VideoWriter* videow )
 {
-	const Image* frameimg = image;
-	Image ts_image;
+  const Image* frameimg = image;
+  Image ts_image;
 
-	/* Checking for invalid parameters */
-	if ( videow == NULL ) {
-		Error("NULL Video object");
-		return false;
-	}
+  /* Checking for invalid parameters */
+  if ( videow == NULL ) 
+  {
+    Error("NULL Video object");
+    return false;
+  }
 
-	/* If the image does not contain a timestamp, add the timestamp */
-	if (!config.timestamp_on_capture) {
-		ts_image = *image;
-		monitor->TimestampImage( &ts_image, &timestamp );
-		frameimg = &ts_image;
-	}
+  /* If the image does not contain a timestamp, add the timestamp */
+  if (!config.timestamp_on_capture) {
+    ts_image = *image;
+    monitor->TimestampImage( &ts_image, &timestamp );
+    frameimg = &ts_image;
+  }
 
-	/* Calculate delta time */
-	struct DeltaTimeval delta_time3;
-	DELTA_TIMEVAL( delta_time3, timestamp, start_time, DT_PREC_3 );
-	unsigned int timeMS = (delta_time3.sec * delta_time3.prec) + delta_time3.fsec;
+  /* Calculate delta time */
+  struct DeltaTimeval delta_time3;
+  DELTA_TIMEVAL( delta_time3, timestamp, start_time, DT_PREC_3 );
+  unsigned int timeMS = (delta_time3.sec * delta_time3.prec) + delta_time3.fsec;
 
-	/* Encode and write the frame */
-	if(videowriter->Encode(frameimg, timeMS) != 0) {
-		Error("Failed encoding video frame");
-	}
+  /* Encode and write the frame */
+  if(videowriter->Encode(frameimg, timeMS) != 0) {
+    Error("Failed encoding video frame");
+  }
 
-	/* Add the frame to the timecodes file */
-	fprintf(timecodes_fd, "%u\n", timeMS); 
+  /* Add the frame to the timecodes file */
+  fprintf(timecodes_fd, "%u\n", timeMS); 
 
-	return( true );
+  return( true );
 }
 
 void Event::updateNotes( const StringSetMap &newNoteSetMap )
 {
-    bool update = false;
+  bool update = false;
 
-    //Info( "Checking notes, %d <> %d", noteSetMap.size(), newNoteSetMap.size() );
-    if ( newNoteSetMap.size() > 0 )
+  //Info( "Checking notes, %d <> %d", noteSetMap.size(), newNoteSetMap.size() );
+  if ( newNoteSetMap.size() > 0 )
+  {
+    if ( noteSetMap.size() == 0 )
     {
-        if ( noteSetMap.size() == 0 )
+      noteSetMap = newNoteSetMap;
+      update = true;
+    }
+    else
+    {
+      for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin(); newNoteSetMapIter != newNoteSetMap.end(); newNoteSetMapIter++ )
+      {
+        const std::string &newNoteGroup = newNoteSetMapIter->first;
+        const StringSet &newNoteSet = newNoteSetMapIter->second;
+        //Info( "Got %d new strings", newNoteSet.size() );
+        if ( newNoteSet.size() > 0 )
         {
-            noteSetMap = newNoteSetMap;
+          StringSetMap::iterator noteSetMapIter = noteSetMap.find( newNoteGroup );
+          if ( noteSetMapIter == noteSetMap.end() )
+          {
+            //Info( "Can't find note group %s, copying %d strings", newNoteGroup.c_str(), newNoteSet.size() );
+            noteSetMap.insert( StringSetMap::value_type( newNoteGroup, newNoteSet ) );
             update = true;
-        }
-        else
-        {
-            for ( StringSetMap::const_iterator newNoteSetMapIter = newNoteSetMap.begin(); newNoteSetMapIter != newNoteSetMap.end(); newNoteSetMapIter++ )
+          }
+          else
+          {
+            StringSet &noteSet = noteSetMapIter->second;
+            //Info( "Found note group %s, got %d strings", newNoteGroup.c_str(), newNoteSet.size() );
+            for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin(); newNoteSetIter != newNoteSet.end(); newNoteSetIter++ )
             {
-                const std::string &newNoteGroup = newNoteSetMapIter->first;
-                const StringSet &newNoteSet = newNoteSetMapIter->second;
-                //Info( "Got %d new strings", newNoteSet.size() );
-                if ( newNoteSet.size() > 0 )
-                {
-                    StringSetMap::iterator noteSetMapIter = noteSetMap.find( newNoteGroup );
-                    if ( noteSetMapIter == noteSetMap.end() )
-                    {
-                        //Info( "Can't find note group %s, copying %d strings", newNoteGroup.c_str(), newNoteSet.size() );
-                        noteSetMap.insert( StringSetMap::value_type( newNoteGroup, newNoteSet ) );
-                        update = true;
-                    }
-                    else
-                    {
-                        StringSet &noteSet = noteSetMapIter->second;
-                        //Info( "Found note group %s, got %d strings", newNoteGroup.c_str(), newNoteSet.size() );
-                        for ( StringSet::const_iterator newNoteSetIter = newNoteSet.begin(); newNoteSetIter != newNoteSet.end(); newNoteSetIter++ )
-                        {
-                            const std::string &newNote = *newNoteSetIter;
-                            StringSet::iterator noteSetIter = noteSet.find( newNote );
-                            if ( noteSetIter == noteSet.end() )
-                            {
-                                noteSet.insert( newNote );
-                                update = true;
-                            }
-                        }
-                    }
-                }
+              const std::string &newNote = *newNoteSetIter;
+              StringSet::iterator noteSetIter = noteSet.find( newNote );
+              if ( noteSetIter == noteSet.end() )
+              {
+                noteSet.insert( newNote );
+                update = true;
+              }
             }
+          }
         }
+      }
     }
+  }
 
-    if ( update )
-    {
-        std::string notes;
-        createNotes( notes );
+  if ( update )
+  {
+    std::string notes;
+    createNotes( notes );
 
-        Debug( 2, "Updating notes for event %d, '%s'", id, notes.c_str() );
-        static char sql[ZM_SQL_MED_BUFSIZ];
+    Debug( 2, "Updating notes for event %d, '%s'", id, notes.c_str() );
+    static char sql[ZM_SQL_MED_BUFSIZ];
 #if USE_PREPARED_SQL
-        static MYSQL_STMT *stmt = 0;
+    static MYSQL_STMT *stmt = 0;
 
-        char notesStr[ZM_SQL_MED_BUFSIZ] = "";
-        unsigned long notesLen = 0;
+    char notesStr[ZM_SQL_MED_BUFSIZ] = "";
+    unsigned long notesLen = 0;
 
-        if ( !stmt )
-        {
-            const char *sql = "update Events set Notes = ? where Id = ?";
+    if ( !stmt )
+    {
+      const char *sql = "update Events set Notes = ? where Id = ?";
 
-            stmt = mysql_stmt_init( &dbconn );
-            if ( mysql_stmt_prepare( stmt, sql, strlen(sql) ) )
-            {
-                Fatal( "Unable to prepare sql '%s': %s", sql, mysql_stmt_error(stmt) );
-            }
+      stmt = mysql_stmt_init( &dbconn );
+      if ( mysql_stmt_prepare( stmt, sql, strlen(sql) ) )
+      {
+        Fatal( "Unable to prepare sql '%s': %s", sql, mysql_stmt_error(stmt) );
+      }
 
-            /* Get the parameter count from the statement */
-            if ( mysql_stmt_param_count( stmt ) != 2 )
-            {
-                Fatal( "Unexpected parameter count %ld in sql '%s'", mysql_stmt_param_count( stmt ), sql );
-            }
+      /* Get the parameter count from the statement */
+      if ( mysql_stmt_param_count( stmt ) != 2 )
+      {
+        Fatal( "Unexpected parameter count %ld in sql '%s'", mysql_stmt_param_count( stmt ), sql );
+      }
 
-            MYSQL_BIND  bind[2];
-            memset(bind, 0, sizeof(bind));
+      MYSQL_BIND  bind[2];
+      memset(bind, 0, sizeof(bind));
 
-            /* STRING PARAM */
-            bind[0].buffer_type = MYSQL_TYPE_STRING;
-            bind[0].buffer = (char *)notesStr;
-            bind[0].buffer_length = sizeof(notesStr);
-            bind[0].is_null = 0;
-            bind[0].length = &notesLen;
+      /* STRING PARAM */
+      bind[0].buffer_type = MYSQL_TYPE_STRING;
+      bind[0].buffer = (char *)notesStr;
+      bind[0].buffer_length = sizeof(notesStr);
+      bind[0].is_null = 0;
+      bind[0].length = &notesLen;
 
-            bind[1].buffer_type= MYSQL_TYPE_LONG;
-            bind[1].buffer= (char *)&id;
-            bind[1].is_null= 0;
-            bind[1].length= 0;
+      bind[1].buffer_type= MYSQL_TYPE_LONG;
+      bind[1].buffer= (char *)&id;
+      bind[1].is_null= 0;
+      bind[1].length= 0;
 
-            /* Bind the buffers */
-            if ( mysql_stmt_bind_param( stmt, bind ) )
-            {
-                Fatal( "Unable to bind sql '%s': %s", sql, mysql_stmt_error(stmt) );
-            }
-        }
-
-        strncpy( notesStr, notes.c_str(), sizeof(notesStr) );
-        notesLen = notes.length();
-
-        if ( mysql_stmt_execute( stmt ) )
-        {
-            Fatal( "Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt) );
-        }
-#else
-        static char escapedNotes[ZM_SQL_MED_BUFSIZ];
-
-        mysql_real_escape_string( &dbconn, escapedNotes, notes.c_str(), notes.length() );
-
-        snprintf( sql, sizeof(sql), "update Events set Notes = '%s' where Id = %d", escapedNotes, id );
-        if ( mysql_query( &dbconn, sql ) )
-        {
-            Error( "Can't insert event: %s", mysql_error( &dbconn ) );
-        }
-#endif
+      /* Bind the buffers */
+      if ( mysql_stmt_bind_param( stmt, bind ) )
+      {
+        Fatal( "Unable to bind sql '%s': %s", sql, mysql_stmt_error(stmt) );
+      }
     }
+
+    strncpy( notesStr, notes.c_str(), sizeof(notesStr) );
+    notesLen = notes.length();
+
+    if ( mysql_stmt_execute( stmt ) )
+    {
+      Fatal( "Unable to execute sql '%s': %s", sql, mysql_stmt_error(stmt) );
+    }
+#else
+    static char escapedNotes[ZM_SQL_MED_BUFSIZ];
+
+    mysql_real_escape_string( &dbconn, escapedNotes, notes.c_str(), notes.length() );
+
+    snprintf( sql, sizeof(sql), "update Events set Notes = '%s' where Id = %d", escapedNotes, id );
+    if ( mysql_query( &dbconn, sql ) )
+    {
+      Error( "Can't insert event: %s", mysql_error( &dbconn ) );
+    }
+#endif
+  }
 }
 
 void Event::AddFrames( int n_frames, Image **images, struct timeval **timestamps )
 {
-    for (int i = 0; i < n_frames; i += ZM_SQL_BATCH_SIZE) {
-        AddFramesInternal(n_frames, i, images, timestamps);
-    }
+  for (int i = 0; i < n_frames; i += ZM_SQL_BATCH_SIZE) {
+    AddFramesInternal(n_frames, i, images, timestamps);
+  }
 }
 
 void Event::AddFramesInternal( int n_frames, int start_frame, Image **images, struct timeval **timestamps )
 {
-    static char sql[ZM_SQL_LGE_BUFSIZ];
-    strncpy( sql, "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ", sizeof(sql) );
-    int frameCount = 0;
-    for ( int i = start_frame; i < n_frames && i - start_frame < ZM_SQL_BATCH_SIZE; i++ )
+  static char sql[ZM_SQL_LGE_BUFSIZ];
+  strncpy( sql, "insert into Frames ( EventId, FrameId, TimeStamp, Delta ) values ", sizeof(sql) );
+  int frameCount = 0;
+  for ( int i = start_frame; i < n_frames && i - start_frame < ZM_SQL_BATCH_SIZE; i++ )
+  {
+    if ( !timestamps[i]->tv_sec )
     {
-        if ( !timestamps[i]->tv_sec )
-        {
-            Debug( 1, "Not adding pre-capture frame %d, zero timestamp", i );
-            continue;
-        }
-
-        frames++;
-
-        static char event_file[PATH_MAX];
-        snprintf( event_file, sizeof(event_file), capture_file_format, path, frames );
-	if ( monitor->GetOptSaveJPEGs() & 4) {
-            //If this is the first frame, we should add a thumbnail to the event directory
-            if(frames == 10){
-                char snapshot_file[PATH_MAX];
-                snprintf( snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path );
-                WriteFrameImage( images[i], *(timestamps[i]), snapshot_file );
-            }
-        }
-        if ( monitor->GetOptSaveJPEGs() & 1) {
-            Debug( 1, "Writing pre-capture frame %d", frames );
-            WriteFrameImage( images[i], *(timestamps[i]), event_file );
-        }
-	if ( videowriter != NULL ) {
- 		WriteFrameVideo( images[i], *(timestamps[i]), videowriter );
-	}
-
-        struct DeltaTimeval delta_time;
-        DELTA_TIMEVAL( delta_time, *(timestamps[i]), start_time, DT_PREC_2 );
-
-        int sql_len = strlen(sql);
-        snprintf( sql+sql_len, sizeof(sql)-sql_len, "( %d, %d, from_unixtime(%ld), %s%ld.%02ld ), ", id, frames, timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
-
-        frameCount++;
-    }
-
-    if ( frameCount )
-    {
-        Debug( 1, "Adding %d/%d frames to DB", frameCount, n_frames );
-        *(sql+strlen(sql)-2) = '\0';
-        if ( mysql_query( &dbconn, sql ) )
-        {
-            Error( "Can't insert frames: %s", mysql_error( &dbconn ) );
-            exit( mysql_errno( &dbconn ) );
-        }
-        last_db_frame = frames;
-    }
-    else
-    {
-        Debug( 1, "No valid pre-capture frames to add" );
-    }
-}
-
-void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image *alarm_image )
-{
-    if ( !timestamp.tv_sec )
-    {
-        Debug( 1, "Not adding new frame, zero timestamp" );
-        return;
+      Debug( 1, "Not adding pre-capture frame %d, zero timestamp", i );
+      continue;
     }
 
     frames++;
 
     static char event_file[PATH_MAX];
     snprintf( event_file, sizeof(event_file), capture_file_format, path, frames );
-    
     if ( monitor->GetOptSaveJPEGs() & 4) {
-        //If this is the first frame, we should add a thumbnail to the event directory
-        if(frames == 10){
-            char snapshot_file[PATH_MAX];
-            snprintf( snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path );
-            WriteFrameImage( image, timestamp, snapshot_file );
-        }
+      //If this is the first frame, we should add a thumbnail to the event directory
+      if(frames == 10){
+        char snapshot_file[PATH_MAX];
+        snprintf( snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path );
+        WriteFrameImage( images[i], *(timestamps[i]), snapshot_file );
+      }
     }
-    if( monitor->GetOptSaveJPEGs() & 1) {
-        Debug( 1, "Writing capture frame %d", frames );
-        WriteFrameImage( image, timestamp, event_file );
+    if ( monitor->GetOptSaveJPEGs() & 1) {
+      Debug( 1, "Writing pre-capture frame %d", frames );
+      WriteFrameImage( images[i], *(timestamps[i]), event_file );
     }
     if ( videowriter != NULL ) {
-        WriteFrameVideo( image, timestamp, videowriter );
+      WriteFrameVideo( images[i], *(timestamps[i]), videowriter );
     }
 
     struct DeltaTimeval delta_time;
-    DELTA_TIMEVAL( delta_time, timestamp, start_time, DT_PREC_2 );
+    DELTA_TIMEVAL( delta_time, *(timestamps[i]), start_time, DT_PREC_2 );
 
-    const char *frame_type = score>0?"Alarm":(score<0?"Bulk":"Normal");
-    if ( score < 0 )
-        score = 0;
+    int sql_len = strlen(sql);
+    snprintf( sql+sql_len, sizeof(sql)-sql_len, "( %d, %d, from_unixtime(%ld), %s%ld.%02ld ), ", id, frames, timestamps[i]->tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec );
 
-    bool db_frame = (strcmp(frame_type,"Bulk") != 0) || ((frames%config.bulk_frame_interval)==0) || !frames;
-    if ( db_frame )
+    frameCount++;
+  }
+
+  if ( frameCount )
+  {
+    Debug( 1, "Adding %d/%d frames to DB", frameCount, n_frames );
+    *(sql+strlen(sql)-2) = '\0';
+    if ( mysql_query( &dbconn, sql ) )
     {
-
-        Debug( 1, "Adding frame %d of type \"%s\" to DB", frames, frame_type );
-        static char sql[ZM_SQL_MED_BUFSIZ];
-        snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, Type, TimeStamp, Delta, Score ) values ( %d, %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d )", id, frames, frame_type, timestamp.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, score );
-        if ( mysql_query( &dbconn, sql ) )
-        {
-            Error( "Can't insert frame: %s", mysql_error( &dbconn ) );
-            exit( mysql_errno( &dbconn ) );
-        }
-        last_db_frame = frames;
-
-        // We are writing a Bulk frame
-        if ( !strcmp( frame_type,"Bulk") )
-        {
-            snprintf( sql, sizeof(sql), "update Events set Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d where Id = %d", delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, frames, alarm_frames, tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score, id );
-            if ( mysql_query( &dbconn, sql ) )
-            {
-                Error( "Can't update event: %s", mysql_error( &dbconn ) );
-                exit( mysql_errno( &dbconn ) );
-            }
-        }
+      Error( "Can't insert frames: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
     }
+    last_db_frame = frames;
+  }
+  else
+  {
+    Debug( 1, "No valid pre-capture frames to add" );
+  }
+}
 
-    end_time = timestamp;
+void Event::AddFrame( Image *image, struct timeval timestamp, int score, Image *alarm_image )
+{
+  if ( !timestamp.tv_sec )
+  {
+    Debug( 1, "Not adding new frame, zero timestamp" );
+    return;
+  }
 
-        // We are writing an Alarm frame
-        if ( !strcmp( frame_type,"Alarm") )
+  frames++;
+
+  static char event_file[PATH_MAX];
+  snprintf( event_file, sizeof(event_file), capture_file_format, path, frames );
+
+  if ( monitor->GetOptSaveJPEGs() & 4) {
+    //If this is the first frame, we should add a thumbnail to the event directory
+    if(frames == 10){
+      char snapshot_file[PATH_MAX];
+      snprintf( snapshot_file, sizeof(snapshot_file), "%s/snapshot.jpg", path );
+      WriteFrameImage( image, timestamp, snapshot_file );
+    }
+  }
+  if( monitor->GetOptSaveJPEGs() & 1) {
+    Debug( 1, "Writing capture frame %d", frames );
+    WriteFrameImage( image, timestamp, event_file );
+  }
+  if ( videowriter != NULL ) {
+    WriteFrameVideo( image, timestamp, videowriter );
+  }
+
+  struct DeltaTimeval delta_time;
+  DELTA_TIMEVAL( delta_time, timestamp, start_time, DT_PREC_2 );
+
+  const char *frame_type = score>0?"Alarm":(score<0?"Bulk":"Normal");
+  if ( score < 0 )
+    score = 0;
+
+  bool db_frame = (strcmp(frame_type,"Bulk") != 0) || ((frames%config.bulk_frame_interval)==0) || !frames;
+  if ( db_frame )
+  {
+
+    Debug( 1, "Adding frame %d of type \"%s\" to DB", frames, frame_type );
+    static char sql[ZM_SQL_MED_BUFSIZ];
+    snprintf( sql, sizeof(sql), "insert into Frames ( EventId, FrameId, Type, TimeStamp, Delta, Score ) values ( %d, %d, '%s', from_unixtime( %ld ), %s%ld.%02ld, %d )", id, frames, frame_type, timestamp.tv_sec, delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, score );
+    if ( mysql_query( &dbconn, sql ) )
     {
-        alarm_frames++;
-
-        tot_score += score;
-        if ( score > (int)max_score )
-            max_score = score;
-
-        if ( alarm_image )
-        {
-            snprintf( event_file, sizeof(event_file), analyse_file_format, path, frames );
-
-            Debug( 1, "Writing analysis frame %d", frames );
-            if ( monitor->GetOptSaveJPEGs() & 2) {
-                WriteFrameImage( alarm_image, timestamp, event_file, true );
-            }
-        }
+      Error( "Can't insert frame: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
     }
-    
-    /* This makes viewing the diagnostic images impossible because it keeps deleting them
-    if ( config.record_diag_images )
+    last_db_frame = frames;
+
+    // We are writing a Bulk frame
+    if ( !strcmp( frame_type,"Bulk") )
     {
-        char diag_glob[PATH_MAX] = "";
-
-        snprintf( diag_glob, sizeof(diag_glob), "%s/%d/diag-*.jpg", config.dir_events, monitor->Id() );
-        glob_t pglob;
-        int glob_status = glob( diag_glob, 0, 0, &pglob );
-        if ( glob_status != 0 )
-        {
-            if ( glob_status < 0 )
-            {
-                Error( "Can't glob '%s': %s", diag_glob, strerror(errno) );
-            }
-            else
-            {
-                Debug( 1, "Can't glob '%s': %d", diag_glob, glob_status );
-            }
-        }
-        else
-        {
-            char new_diag_path[PATH_MAX] = "";
-            for ( int i = 0; i < pglob.gl_pathc; i++ )
-            {
-                char *diag_path = pglob.gl_pathv[i];
-
-                char *diag_file = strstr( diag_path, "diag-" );
-
-                if ( diag_file )
-                {
-                    snprintf( new_diag_path, sizeof(new_diag_path), general_file_format, path, frames, diag_file );
-
-                    if ( rename( diag_path, new_diag_path ) < 0 )
-                    {
-                        Error( "Can't rename '%s' to '%s': %s", diag_path, new_diag_path, strerror(errno) );
-                    }
-                }
-            }
-        }
-        globfree( &pglob );
+      snprintf( sql, sizeof(sql), "update Events set Length = %s%ld.%02ld, Frames = %d, AlarmFrames = %d, TotScore = %d, AvgScore = %d, MaxScore = %d where Id = %d", delta_time.positive?"":"-", delta_time.sec, delta_time.fsec, frames, alarm_frames, tot_score, (int)(alarm_frames?(tot_score/alarm_frames):0), max_score, id );
+      if ( mysql_query( &dbconn, sql ) )
+      {
+        Error( "Can't update event: %s", mysql_error( &dbconn ) );
+        exit( mysql_errno( &dbconn ) );
+      }
     }
-    */
+  }
+
+  end_time = timestamp;
+
+    // We are writing an Alarm frame
+    if ( !strcmp( frame_type,"Alarm") )
+  {
+    alarm_frames++;
+
+    tot_score += score;
+    if ( score > (int)max_score )
+      max_score = score;
+
+    if ( alarm_image )
+    {
+      snprintf( event_file, sizeof(event_file), analyse_file_format, path, frames );
+
+      Debug( 1, "Writing analysis frame %d", frames );
+      if ( monitor->GetOptSaveJPEGs() & 2) {
+        WriteFrameImage( alarm_image, timestamp, event_file, true );
+      }
+    }
+  }
+  
+  /* This makes viewing the diagnostic images impossible because it keeps deleting them
+  if ( config.record_diag_images )
+  {
+    char diag_glob[PATH_MAX] = "";
+
+    snprintf( diag_glob, sizeof(diag_glob), "%s/%d/diag-*.jpg", config.dir_events, monitor->Id() );
+    glob_t pglob;
+    int glob_status = glob( diag_glob, 0, 0, &pglob );
+    if ( glob_status != 0 )
+    {
+      if ( glob_status < 0 )
+      {
+        Error( "Can't glob '%s': %s", diag_glob, strerror(errno) );
+      }
+      else
+      {
+        Debug( 1, "Can't glob '%s': %d", diag_glob, glob_status );
+      }
+    }
+    else
+    {
+      char new_diag_path[PATH_MAX] = "";
+      for ( int i = 0; i < pglob.gl_pathc; i++ )
+      {
+        char *diag_path = pglob.gl_pathv[i];
+
+        char *diag_file = strstr( diag_path, "diag-" );
+
+        if ( diag_file )
+        {
+          snprintf( new_diag_path, sizeof(new_diag_path), general_file_format, path, frames, diag_file );
+
+          if ( rename( diag_path, new_diag_path ) < 0 )
+          {
+            Error( "Can't rename '%s' to '%s': %s", diag_path, new_diag_path, strerror(errno) );
+          }
+        }
+      }
+    }
+    globfree( &pglob );
+  }
+  */
 }
 
 bool EventStream::loadInitialEventData( int monitor_id, time_t event_time )
 {
-    static char sql[ZM_SQL_SML_BUFSIZ];
+  static char sql[ZM_SQL_SML_BUFSIZ];
 
-    snprintf( sql, sizeof(sql), "select Id from Events where MonitorId = %d and unix_timestamp( EndTime ) > %ld order by Id asc limit 1", monitor_id, event_time );
+  snprintf( sql, sizeof(sql), "select Id from Events where MonitorId = %d and unix_timestamp( EndTime ) > %ld order by Id asc limit 1", monitor_id, event_time );
 
-    if ( mysql_query( &dbconn, sql ) )
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  MYSQL_ROW dbrow = mysql_fetch_row( result );
+
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+
+  int init_event_id = atoi( dbrow[0] );
+
+  mysql_free_result( result );
+
+  loadEventData( init_event_id );
+
+  if ( event_time )
+  {
+    curr_stream_time = event_time;
+    curr_frame_id = 1;
+    if ( event_time >= event_data->start_time )
     {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    MYSQL_ROW dbrow = mysql_fetch_row( result );
-
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-
-    int init_event_id = atoi( dbrow[0] );
-
-    mysql_free_result( result );
-
-    loadEventData( init_event_id );
-
-    if ( event_time )
-    {
-        curr_stream_time = event_time;
-        curr_frame_id = 1;
-        if ( event_time >= event_data->start_time )
+      for (unsigned int i = 0; i < event_data->frame_count; i++ )
+      {
+        //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
+        if ( event_data->frames[i].timestamp >= event_time )
         {
-            for (unsigned int i = 0; i < event_data->frame_count; i++ )
-            {
-                //Info( "eft %d > et %d", event_data->frames[i].timestamp, event_time );
-                if ( event_data->frames[i].timestamp >= event_time )
-                {
-                    curr_frame_id = i+1;
-                    Debug( 3, "Set cst:%.2f", curr_stream_time );
-                    Debug( 3, "Set cfid:%d", curr_frame_id );
-                    break;
-                }
-            }
-            Debug( 3, "Skipping %ld frames", event_data->frame_count );
+          curr_frame_id = i+1;
+          Debug( 3, "Set cst:%.2f", curr_stream_time );
+          Debug( 3, "Set cfid:%d", curr_frame_id );
+          break;
         }
+      }
+      Debug( 3, "Skipping %ld frames", event_data->frame_count );
     }
-    return( true );
+  }
+  return( true );
 }
 
-bool EventStream::loadInitialEventData( int init_event_id, int init_frame_id )
+bool EventStream::loadInitialEventData( int init_event_id, unsigned int init_frame_id )
 {
-    loadEventData( init_event_id );
+  loadEventData( init_event_id );
 
-    if ( init_frame_id )
-    {
-        curr_stream_time = event_data->frames[init_frame_id-1].timestamp;
-        curr_frame_id = init_frame_id;
-    }
-    else
-    {
-        curr_stream_time = event_data->start_time;
-    }
+  if ( init_frame_id )
+  {
+    curr_stream_time = event_data->frames[init_frame_id-1].timestamp;
+    curr_frame_id = init_frame_id;
+  }
+  else
+  {
+    curr_stream_time = event_data->start_time;
+  }
 
-    return( true );
+  return( true );
 }
 
 bool EventStream::loadEventData( int event_id )
 {
-    static char sql[ZM_SQL_MED_BUFSIZ];
+  static char sql[ZM_SQL_MED_BUFSIZ];
 
-    snprintf( sql, sizeof(sql), "select M.Id, M.Name, E.Frames, unix_timestamp( StartTime ) as StartTimestamp, max(F.Delta)-min(F.Delta) as Duration from Events as E inner join Monitors as M on E.MonitorId = M.Id inner join Frames as F on E.Id = F.EventId where E.Id = %d group by E.Id", event_id );
+  snprintf( sql, sizeof(sql), "select M.Id, M.Name, E.Frames, unix_timestamp( StartTime ) as StartTimestamp, max(F.Delta)-min(F.Delta) as Duration from Events as E inner join Monitors as M on E.MonitorId = M.Id inner join Frames as F on E.Id = F.EventId where E.Id = %d group by E.Id", event_id );
 
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-    if ( !mysql_num_rows( result ) )
-    {
-        Fatal( "Unable to load event %d, not found in DB", event_id );
-    }
+  if ( !mysql_num_rows( result ) )
+  {
+    Fatal( "Unable to load event %d, not found in DB", event_id );
+  }
 
-    MYSQL_ROW dbrow = mysql_fetch_row( result );
+  MYSQL_ROW dbrow = mysql_fetch_row( result );
 
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-    delete event_data;
-    event_data = new EventData;
-    event_data->event_id = event_id;
-    event_data->monitor_id = atoi( dbrow[0] );
-    event_data->start_time = atoi(dbrow[3]);
-    if ( config.use_deep_storage )
-    {
-        struct tm *event_time = localtime( &event_data->start_time );
-        if ( config.dir_events[0] == '/' )
-            snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", config.dir_events, event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
-        else
-            snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", staticConfig.PATH_WEB.c_str(), config.dir_events, event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
-    }
+  delete event_data;
+  event_data = new EventData;
+  event_data->event_id = event_id;
+  event_data->monitor_id = atoi( dbrow[0] );
+  event_data->start_time = atoi(dbrow[3]);
+  if ( config.use_deep_storage )
+  {
+    struct tm *event_time = localtime( &event_data->start_time );
+    if ( config.dir_events[0] == '/' )
+      snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", config.dir_events, event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
     else
+      snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%02d/%02d/%02d/%02d/%02d/%02d", staticConfig.PATH_WEB.c_str(), config.dir_events, event_data->monitor_id, event_time->tm_year-100, event_time->tm_mon+1, event_time->tm_mday, event_time->tm_hour, event_time->tm_min, event_time->tm_sec );
+  }
+  else
+  {
+    if ( config.dir_events[0] == '/' )
+      snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%ld", config.dir_events, event_data->monitor_id, event_data->event_id );
+    else
+      snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%ld", staticConfig.PATH_WEB.c_str(), config.dir_events, event_data->monitor_id, event_data->event_id );
+  }
+  event_data->frame_count = dbrow[2] == NULL ? 0 : atoi(dbrow[2]);
+  event_data->duration = atof(dbrow[4]);
+
+  updateFrameRate( (double)event_data->frame_count/event_data->duration );
+
+  mysql_free_result( result );
+
+  snprintf( sql, sizeof(sql), "select FrameId, unix_timestamp( `TimeStamp` ), Delta from Frames where EventId = %d order by FrameId asc", event_id );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+
+  result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+
+  event_data->n_frames = mysql_num_rows( result );
+
+  event_data->frames = new FrameData[event_data->frame_count];
+  int id, last_id = 0;
+  time_t timestamp, last_timestamp = event_data->start_time;
+  double delta, last_delta = 0.0;
+  while ( ( dbrow = mysql_fetch_row( result ) ) )
+  {
+    id = atoi(dbrow[0]);
+    timestamp = atoi(dbrow[1]);
+    delta = atof(dbrow[2]);
+    int id_diff = id - last_id;
+    double frame_delta = (delta-last_delta)/id_diff;
+    if ( id_diff > 1 )
     {
-        if ( config.dir_events[0] == '/' )
-            snprintf( event_data->path, sizeof(event_data->path), "%s/%ld/%ld", config.dir_events, event_data->monitor_id, event_data->event_id );
-        else
-            snprintf( event_data->path, sizeof(event_data->path), "%s/%s/%ld/%ld", staticConfig.PATH_WEB.c_str(), config.dir_events, event_data->monitor_id, event_data->event_id );
+      for ( int i = last_id+1; i < id; i++ )
+      {
+        event_data->frames[i-1].timestamp = (time_t)(last_timestamp + ((i-last_id)*frame_delta));
+        event_data->frames[i-1].offset = (time_t)(event_data->frames[i-1].timestamp-event_data->start_time);
+        event_data->frames[i-1].delta = frame_delta;
+        event_data->frames[i-1].in_db = false;
+      }
     }
-    event_data->frame_count = dbrow[2] == NULL ? 0 : atoi(dbrow[2]);
-    event_data->duration = atof(dbrow[4]);
+    event_data->frames[id-1].timestamp = timestamp;
+    event_data->frames[id-1].offset = (time_t)(event_data->frames[id-1].timestamp-event_data->start_time);
+    event_data->frames[id-1].delta = id>1?frame_delta:0.0;
+    event_data->frames[id-1].in_db = true;
+    last_id = id;
+    last_delta = delta;
+    last_timestamp = timestamp;
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-    updateFrameRate( (double)event_data->frame_count/event_data->duration );
+  //for ( int i = 0; i < 250; i++ )
+  //{
+    //Info( "%d -> %d @ %f (%d)", i+1, event_data->frames[i].timestamp, event_data->frames[i].delta, event_data->frames[i].in_db );
+  //}
 
-    mysql_free_result( result );
+  mysql_free_result( result );
 
-    snprintf( sql, sizeof(sql), "select FrameId, unix_timestamp( `TimeStamp` ), Delta from Frames where EventId = %d order by FrameId asc", event_id );
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  if ( forceEventChange || mode == MODE_ALL_GAPLESS )
+  {
+    if ( replay_rate > 0 )
+      curr_stream_time = event_data->frames[0].timestamp;
+    else
+      curr_stream_time = event_data->frames[event_data->frame_count-1].timestamp;
+  }
+  Debug( 2, "Event:%ld, Frames:%ld, Duration: %.2f", event_data->event_id, event_data->frame_count, event_data->duration );
 
-    result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-
-    event_data->n_frames = mysql_num_rows( result );
-
-    event_data->frames = new FrameData[event_data->frame_count];
-    int id, last_id = 0;
-    time_t timestamp, last_timestamp = event_data->start_time;
-    double delta, last_delta = 0.0;
-    while ( ( dbrow = mysql_fetch_row( result ) ) )
-    {
-        id = atoi(dbrow[0]);
-        timestamp = atoi(dbrow[1]);
-        delta = atof(dbrow[2]);
-        int id_diff = id - last_id;
-        double frame_delta = (delta-last_delta)/id_diff;
-        if ( id_diff > 1 )
-        {
-            for ( int i = last_id+1; i < id; i++ )
-            {
-                event_data->frames[i-1].timestamp = (time_t)(last_timestamp + ((i-last_id)*frame_delta));
-                event_data->frames[i-1].offset = (time_t)(event_data->frames[i-1].timestamp-event_data->start_time);
-                event_data->frames[i-1].delta = frame_delta;
-                event_data->frames[i-1].in_db = false;
-            }
-        }
-        event_data->frames[id-1].timestamp = timestamp;
-        event_data->frames[id-1].offset = (time_t)(event_data->frames[id-1].timestamp-event_data->start_time);
-        event_data->frames[id-1].delta = id>1?frame_delta:0.0;
-        event_data->frames[id-1].in_db = true;
-        last_id = id;
-        last_delta = delta;
-        last_timestamp = timestamp;
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-
-    //for ( int i = 0; i < 250; i++ )
-    //{
-        //Info( "%d -> %d @ %f (%d)", i+1, event_data->frames[i].timestamp, event_data->frames[i].delta, event_data->frames[i].in_db );
-    //}
-
-    mysql_free_result( result );
-
-    if ( forceEventChange || mode == MODE_ALL_GAPLESS )
-    {
-        if ( replay_rate > 0 )
-            curr_stream_time = event_data->frames[0].timestamp;
-        else
-            curr_stream_time = event_data->frames[event_data->frame_count-1].timestamp;
-    }
-    Debug( 2, "Event:%ld, Frames:%ld, Duration: %.2f", event_data->event_id, event_data->frame_count, event_data->duration );
-
-    return( true );
+  return( true );
 }
 
 void EventStream::processCommand( const CmdMsg *msg )
 {
-    Debug( 2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0] )
-    // Check for incoming command
-    switch( (MsgCommand)msg->msg_data[0] )
+  Debug( 2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0] )
+  // Check for incoming command
+  switch( (MsgCommand)msg->msg_data[0] )
+  {
+    case CMD_PAUSE :
     {
-        case CMD_PAUSE :
-        {
-            Debug( 1, "Got PAUSE command" );
+      Debug( 1, "Got PAUSE command" );
 
-            // Set paused flag
-            paused = true;
-            replay_rate = ZM_RATE_BASE;
-            last_frame_sent = TV_2_FLOAT( now );
-            break;
-        }
-        case CMD_PLAY :
-        {
-            Debug( 1, "Got PLAY command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-            }
+      // Set paused flag
+      paused = true;
+      replay_rate = ZM_RATE_BASE;
+      last_frame_sent = TV_2_FLOAT( now );
+      break;
+    }
+    case CMD_PLAY :
+    {
+      Debug( 1, "Got PLAY command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+      }
 
-	    // If we are in single event mode and at the last frame, replay the current event
-	    if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id == event_data->frame_count) )
-		curr_frame_id = 1;
+    // If we are in single event mode and at the last frame, replay the current event
+    if ( (mode == MODE_SINGLE) && ((unsigned int)curr_frame_id == event_data->frame_count) )
+    curr_frame_id = 1;
 
-            replay_rate = ZM_RATE_BASE;
-            break;
-        }
-        case CMD_VARPLAY :
-        {
-            Debug( 1, "Got VARPLAY command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-            }
-            replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
-            break;
-        }
-        case CMD_STOP :
-        {
-            Debug( 1, "Got STOP command" );
+      replay_rate = ZM_RATE_BASE;
+      break;
+    }
+    case CMD_VARPLAY :
+    {
+      Debug( 1, "Got VARPLAY command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+      }
+      replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
+      break;
+    }
+    case CMD_STOP :
+    {
+      Debug( 1, "Got STOP command" );
 
-            // Clear paused flag
-            paused = false;
-            break;
-        }
-        case CMD_FASTFWD :
-        {
-            Debug( 1, "Got FAST FWD command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-            }
-            // Set play rate
-            switch ( replay_rate )
-            {
-                case 2 * ZM_RATE_BASE :
-                    replay_rate = 5 * ZM_RATE_BASE;
-                    break;
-                case 5 * ZM_RATE_BASE :
-                    replay_rate = 10 * ZM_RATE_BASE;
-                    break;
-                case 10 * ZM_RATE_BASE :
-                    replay_rate = 25 * ZM_RATE_BASE;
-                    break;
-                case 25 * ZM_RATE_BASE :
-                case 50 * ZM_RATE_BASE :
-                    replay_rate = 50 * ZM_RATE_BASE;
-                    break;
-                default :
-                    replay_rate = 2 * ZM_RATE_BASE;
-                    break;
-            }
-            break;
-        }
-        case CMD_SLOWFWD :
-        {
-            Debug( 1, "Got SLOW FWD command" );
-            // Set paused flag
-            paused = true;
-            // Set play rate
-            replay_rate = ZM_RATE_BASE;
-            // Set step
-            step = 1;
-            break;
-        }
-        case CMD_SLOWREV :
-        {
-            Debug( 1, "Got SLOW REV command" );
-            // Set paused flag
-            paused = true;
-            // Set play rate
-            replay_rate = ZM_RATE_BASE;
-            // Set step
-            step = -1;
-            break;
-        }
-        case CMD_FASTREV :
-        {
-            Debug( 1, "Got FAST REV command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-            }
-            // Set play rate
-            switch ( replay_rate )
-            {
-                case -2 * ZM_RATE_BASE :
-                    replay_rate = -5 * ZM_RATE_BASE;
-                    break;
-                case -5 * ZM_RATE_BASE :
-                    replay_rate = -10 * ZM_RATE_BASE;
-                    break;
-                case -10 * ZM_RATE_BASE :
-                    replay_rate = -25 * ZM_RATE_BASE;
-                    break;
-                case -25 * ZM_RATE_BASE :
-                case -50 * ZM_RATE_BASE :
-                    replay_rate = -50 * ZM_RATE_BASE;
-                    break;
-                default :
-                    replay_rate = -2 * ZM_RATE_BASE;
-                    break;
-            }
-            break;
-        }
-        case CMD_ZOOMIN :
-        {
-            x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
-            y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-            Debug( 1, "Got ZOOM IN command, to %d,%d", x, y );
-            switch ( zoom )
-            {
-                case 100:
-                    zoom = 150;
-                    break;
-                case 150:
-                    zoom = 200;
-                    break;
-                case 200:
-                    zoom = 300;
-                    break;
-                case 300:
-                    zoom = 400;
-                    break;
-                case 400:
-                default :
-                    zoom = 500;
-                    break;
-            }
-            break;
-        }
-        case CMD_ZOOMOUT :
-        {
-            Debug( 1, "Got ZOOM OUT command" );
-            switch ( zoom )
-            {
-                case 500:
-                    zoom = 400;
-                    break;
-                case 400:
-                    zoom = 300;
-                    break;
-                case 300:
-                    zoom = 200;
-                    break;
-                case 200:
-                    zoom = 150;
-                    break;
-                case 150:
-                default :
-                    zoom = 100;
-                    break;
-            }
-            break;
-        }
-        case CMD_PAN :
-        {
-            x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
-            y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-            Debug( 1, "Got PAN command, to %d,%d", x, y );
-            break;
-        }
-        case CMD_SCALE :
-        {
-            scale = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
-            Debug( 1, "Got SCALE command, to %d", scale );
-            break;
-        }
-        case CMD_PREV :
-        {
-            Debug( 1, "Got PREV command" );
-            if ( replay_rate >= 0 )
-                curr_frame_id = 0;
-            else
-                curr_frame_id = event_data->frame_count+1;
-            paused = false;
-            forceEventChange = true;
-            break;
-        }
-        case CMD_NEXT :
-        {
-            Debug( 1, "Got NEXT command" );
-            if ( replay_rate >= 0 )
-                curr_frame_id = event_data->frame_count+1;
-            else
-                curr_frame_id = 0;
-            paused = false;
-            forceEventChange = true;
-            break;
-        }
-        case CMD_SEEK :
-        {
-            int offset = ((unsigned char)msg->msg_data[1]<<24)|((unsigned char)msg->msg_data[2]<<16)|((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-            curr_frame_id = (int)(event_data->frame_count*offset/event_data->duration);
-            Debug( 1, "Got SEEK command, to %d (new cfid: %d)", offset, curr_frame_id );
-            break;
-        }
-        case CMD_QUERY :
-        {
-            Debug( 1, "Got QUERY command, sending STATUS" );
-            break;
-        }
-	case CMD_QUIT :
-        {
-           Info ("User initiated exit - CMD_QUIT");
-           break;
-        }
+      // Clear paused flag
+      paused = false;
+      break;
+    }
+    case CMD_FASTFWD :
+    {
+      Debug( 1, "Got FAST FWD command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+      }
+      // Set play rate
+      switch ( replay_rate )
+      {
+        case 2 * ZM_RATE_BASE :
+          replay_rate = 5 * ZM_RATE_BASE;
+          break;
+        case 5 * ZM_RATE_BASE :
+          replay_rate = 10 * ZM_RATE_BASE;
+          break;
+        case 10 * ZM_RATE_BASE :
+          replay_rate = 25 * ZM_RATE_BASE;
+          break;
+        case 25 * ZM_RATE_BASE :
+        case 50 * ZM_RATE_BASE :
+          replay_rate = 50 * ZM_RATE_BASE;
+          break;
         default :
-        {
-            // Do nothing, for now
-        }
+          replay_rate = 2 * ZM_RATE_BASE;
+          break;
+      }
+      break;
     }
-    struct {
-        int event;
-        int progress;
-        int rate;
-        int zoom;
-        bool paused;
-    } status_data;
-
-    status_data.event = event_data->event_id;
-    status_data.progress = (int)event_data->frames[curr_frame_id-1].offset;
-    status_data.rate = replay_rate;
-    status_data.zoom = zoom;
-    status_data.paused = paused;
-    Debug( 2, "E:%d, P:%d, p:%d R:%d, Z:%d",
-        status_data.event,
-        status_data.paused,
-        status_data.progress,
-        status_data.rate,
-        status_data.zoom
-    );
-
-    DataMsg status_msg;
-    status_msg.msg_type = MSG_DATA_EVENT;
-    memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) );
-    if ( sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) ) < 0 )
+    case CMD_SLOWFWD :
     {
-        //if ( errno != EAGAIN )
-        {
-            Error( "Can't sendto on sd %d: %s", sd, strerror(errno) );
-            exit( -1 );
-        }
+      Debug( 1, "Got SLOW FWD command" );
+      // Set paused flag
+      paused = true;
+      // Set play rate
+      replay_rate = ZM_RATE_BASE;
+      // Set step
+      step = 1;
+      break;
     }
-    // quit after sending a status, if this was a quit request
-    if ((MsgCommand)msg->msg_data[0]==CMD_QUIT)
-        exit(0);
+    case CMD_SLOWREV :
+    {
+      Debug( 1, "Got SLOW REV command" );
+      // Set paused flag
+      paused = true;
+      // Set play rate
+      replay_rate = ZM_RATE_BASE;
+      // Set step
+      step = -1;
+      break;
+    }
+    case CMD_FASTREV :
+    {
+      Debug( 1, "Got FAST REV command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+      }
+      // Set play rate
+      switch ( replay_rate )
+      {
+        case -2 * ZM_RATE_BASE :
+          replay_rate = -5 * ZM_RATE_BASE;
+          break;
+        case -5 * ZM_RATE_BASE :
+          replay_rate = -10 * ZM_RATE_BASE;
+          break;
+        case -10 * ZM_RATE_BASE :
+          replay_rate = -25 * ZM_RATE_BASE;
+          break;
+        case -25 * ZM_RATE_BASE :
+        case -50 * ZM_RATE_BASE :
+          replay_rate = -50 * ZM_RATE_BASE;
+          break;
+        default :
+          replay_rate = -2 * ZM_RATE_BASE;
+          break;
+      }
+      break;
+    }
+    case CMD_ZOOMIN :
+    {
+      x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
+      y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
+      Debug( 1, "Got ZOOM IN command, to %d,%d", x, y );
+      switch ( zoom )
+      {
+        case 100:
+          zoom = 150;
+          break;
+        case 150:
+          zoom = 200;
+          break;
+        case 200:
+          zoom = 300;
+          break;
+        case 300:
+          zoom = 400;
+          break;
+        case 400:
+        default :
+          zoom = 500;
+          break;
+      }
+      break;
+    }
+    case CMD_ZOOMOUT :
+    {
+      Debug( 1, "Got ZOOM OUT command" );
+      switch ( zoom )
+      {
+        case 500:
+          zoom = 400;
+          break;
+        case 400:
+          zoom = 300;
+          break;
+        case 300:
+          zoom = 200;
+          break;
+        case 200:
+          zoom = 150;
+          break;
+        case 150:
+        default :
+          zoom = 100;
+          break;
+      }
+      break;
+    }
+    case CMD_PAN :
+    {
+      x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
+      y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
+      Debug( 1, "Got PAN command, to %d,%d", x, y );
+      break;
+    }
+    case CMD_SCALE :
+    {
+      scale = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
+      Debug( 1, "Got SCALE command, to %d", scale );
+      break;
+    }
+    case CMD_PREV :
+    {
+      Debug( 1, "Got PREV command" );
+      if ( replay_rate >= 0 )
+        curr_frame_id = 0;
+      else
+        curr_frame_id = event_data->frame_count+1;
+      paused = false;
+      forceEventChange = true;
+      break;
+    }
+    case CMD_NEXT :
+    {
+      Debug( 1, "Got NEXT command" );
+      if ( replay_rate >= 0 )
+        curr_frame_id = event_data->frame_count+1;
+      else
+        curr_frame_id = 0;
+      paused = false;
+      forceEventChange = true;
+      break;
+    }
+    case CMD_SEEK :
+    {
+      int offset = ((unsigned char)msg->msg_data[1]<<24)|((unsigned char)msg->msg_data[2]<<16)|((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
+      curr_frame_id = (int)(event_data->frame_count*offset/event_data->duration);
+      Debug( 1, "Got SEEK command, to %d (new cfid: %d)", offset, curr_frame_id );
+      break;
+    }
+    case CMD_QUERY :
+    {
+      Debug( 1, "Got QUERY command, sending STATUS" );
+      break;
+    }
+  case CMD_QUIT :
+    {
+       Info ("User initiated exit - CMD_QUIT");
+       break;
+    }
+    default :
+    {
+      // Do nothing, for now
+    }
+  }
+  struct {
+    int event;
+    int progress;
+    int rate;
+    int zoom;
+    bool paused;
+  } status_data;
 
-    updateFrameRate( (double)event_data->frame_count/event_data->duration );
+  status_data.event = event_data->event_id;
+  status_data.progress = (int)event_data->frames[curr_frame_id-1].offset;
+  status_data.rate = replay_rate;
+  status_data.zoom = zoom;
+  status_data.paused = paused;
+  Debug( 2, "E:%d, P:%d, p:%d R:%d, Z:%d",
+    status_data.event,
+    status_data.paused,
+    status_data.progress,
+    status_data.rate,
+    status_data.zoom
+  );
+
+  DataMsg status_msg;
+  status_msg.msg_type = MSG_DATA_EVENT;
+  memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) );
+  if ( sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) ) < 0 )
+  {
+    //if ( errno != EAGAIN )
+    {
+      Error( "Can't sendto on sd %d: %s", sd, strerror(errno) );
+      exit( -1 );
+    }
+  }
+  // quit after sending a status, if this was a quit request
+  if ((MsgCommand)msg->msg_data[0]==CMD_QUIT)
+    exit(0);
+
+  updateFrameRate( (double)event_data->frame_count/event_data->duration );
 }
 
 void EventStream::checkEventLoaded()
 {
-    bool reload_event = false;
-    static char sql[ZM_SQL_SML_BUFSIZ];
+  bool reload_event = false;
+  static char sql[ZM_SQL_SML_BUFSIZ];
 
-    if ( curr_frame_id <= 0 )
+  if ( curr_frame_id <= 0 )
+  {
+    snprintf( sql, sizeof(sql), "select Id from Events where MonitorId = %ld and Id < %ld order by Id desc limit 1", event_data->monitor_id, event_data->event_id );
+    reload_event = true;
+  }
+  else if ( (unsigned int)curr_frame_id > event_data->frame_count )
+  {
+    snprintf( sql, sizeof(sql), "select Id from Events where MonitorId = %ld and Id > %ld order by Id asc limit 1", event_data->monitor_id, event_data->event_id );
+    reload_event = true;
+  }
+
+  if ( reload_event )
+  {
+    if ( forceEventChange || mode != MODE_SINGLE )
     {
-        snprintf( sql, sizeof(sql), "select Id from Events where MonitorId = %ld and Id < %ld order by Id desc limit 1", event_data->monitor_id, event_data->event_id );
-        reload_event = true;
-    }
-    else if ( (unsigned int)curr_frame_id > event_data->frame_count )
-    {
-        snprintf( sql, sizeof(sql), "select Id from Events where MonitorId = %ld and Id > %ld order by Id asc limit 1", event_data->monitor_id, event_data->event_id );
-        reload_event = true;
-    }
+      //Info( "SQL:%s", sql );
+      if ( mysql_query( &dbconn, sql ) )
+      {
+        Error( "Can't run query: %s", mysql_error( &dbconn ) );
+        exit( mysql_errno( &dbconn ) );
+      }
 
-    if ( reload_event )
-    {
-        if ( forceEventChange || mode != MODE_SINGLE )
-        {
-            //Info( "SQL:%s", sql );
-            if ( mysql_query( &dbconn, sql ) )
-            {
-                Error( "Can't run query: %s", mysql_error( &dbconn ) );
-                exit( mysql_errno( &dbconn ) );
-            }
+      MYSQL_RES *result = mysql_store_result( &dbconn );
+      if ( !result )
+      {
+        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+        exit( mysql_errno( &dbconn ) );
+      }
+      MYSQL_ROW dbrow = mysql_fetch_row( result );
 
-            MYSQL_RES *result = mysql_store_result( &dbconn );
-            if ( !result )
-            {
-                Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-                exit( mysql_errno( &dbconn ) );
-            }
-            MYSQL_ROW dbrow = mysql_fetch_row( result );
+      if ( mysql_errno( &dbconn ) )
+      {
+        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+        exit( mysql_errno( &dbconn ) );
+      }
 
-            if ( mysql_errno( &dbconn ) )
-            {
-                Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-                exit( mysql_errno( &dbconn ) );
-            }
+      if ( dbrow )
+      {
+        int event_id = atoi(dbrow[0]);
+        Debug( 1, "Loading new event %d", event_id );
 
-            if ( dbrow )
-            {
-                int event_id = atoi(dbrow[0]);
-                Debug( 1, "Loading new event %d", event_id );
+        loadEventData( event_id );
 
-                loadEventData( event_id );
-
-                Debug( 2, "Current frame id = %d", curr_frame_id );
-                if ( replay_rate < 0 )
-                    curr_frame_id = event_data->frame_count;
-                else
-                    curr_frame_id = 1;
-                Debug( 2, "New frame id = %d", curr_frame_id );
-            }
-            else
-            {
-                if ( curr_frame_id <= 0 )
-                    curr_frame_id = 1;
-                else
-                    curr_frame_id = event_data->frame_count;
-                paused = true;
-            }
-            mysql_free_result( result );
-            forceEventChange = false;
-        }
+        Debug( 2, "Current frame id = %d", curr_frame_id );
+        if ( replay_rate < 0 )
+          curr_frame_id = event_data->frame_count;
         else
-        {
-            if ( curr_frame_id <= 0 )
-                curr_frame_id = 1;
-            else
-                curr_frame_id = event_data->frame_count;
-            paused = true;
-        }
+          curr_frame_id = 1;
+        Debug( 2, "New frame id = %d", curr_frame_id );
+      }
+      else
+      {
+        if ( curr_frame_id <= 0 )
+          curr_frame_id = 1;
+        else
+          curr_frame_id = event_data->frame_count;
+        paused = true;
+      }
+      mysql_free_result( result );
+      forceEventChange = false;
     }
+    else
+    {
+      if ( curr_frame_id <= 0 )
+        curr_frame_id = 1;
+      else
+        curr_frame_id = event_data->frame_count;
+      paused = true;
+    }
+  }
 }
 
 bool EventStream::sendFrame( int delta_us )
 {
-    Debug( 2, "Sending frame %d", curr_frame_id );
+  Debug( 2, "Sending frame %d", curr_frame_id );
 
-    static char filepath[PATH_MAX];
-    static struct stat filestat;
-    FILE *fdj = NULL;
-    
-    snprintf( filepath, sizeof(filepath), Event::capture_file_format, event_data->path, curr_frame_id );
+  static char filepath[PATH_MAX];
+  static struct stat filestat;
+  FILE *fdj = NULL;
+  
+  snprintf( filepath, sizeof(filepath), Event::capture_file_format, event_data->path, curr_frame_id );
 
 #if HAVE_LIBAVCODEC
-    if ( type == STREAM_MPEG )
+  if ( type == STREAM_MPEG )
+  {
+    Image image( filepath );
+
+    Image *send_image = prepareImage( &image );
+
+    if ( !vid_stream )
     {
-        Image image( filepath );
+      vid_stream = new VideoStream( "pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height() );
+      fprintf( stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType() );
+      vid_stream->OpenStream();
+    }
+    /* double pts = */ vid_stream->EncodeFrame( send_image->Buffer(), send_image->Size(), config.mpeg_timed_frames, delta_us*1000 );
+  }
+  else
+#endif // HAVE_LIBAVCODEC
+  {
+    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
 
-        Image *send_image = prepareImage( &image );
+    int img_buffer_size = 0;
+    uint8_t *img_buffer = temp_img_buffer;
 
-        if ( !vid_stream )
-        {
-            vid_stream = new VideoStream( "pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height() );
-            fprintf( stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType() );
-            vid_stream->OpenStream();
-        }
-        /* double pts = */ vid_stream->EncodeFrame( send_image->Buffer(), send_image->Size(), config.mpeg_timed_frames, delta_us*1000 );
+    bool send_raw = ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE));
+
+    fprintf( stdout, "--ZoneMinderFrame\r\n" );
+
+    if ( type != STREAM_JPEG )
+      send_raw = false;
+
+    if ( send_raw )
+    {
+      fdj = fopen( filepath, "rb" );
+      if ( !fdj )
+      {
+        Error( "Can't open %s: %s", filepath, strerror(errno) );
+        return( false );
+      }
+#if HAVE_SENDFILE      
+      if( fstat(fileno(fdj),&filestat) < 0 ) {
+    Error( "Failed getting information about file %s: %s", filepath, strerror(errno) );
+    return( false );
+    }
+#else
+    img_buffer_size = fread( img_buffer, 1, sizeof(temp_img_buffer), fdj );
+#endif
     }
     else
-#endif // HAVE_LIBAVCODEC
     {
-        static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+      Image image( filepath );
 
-        int img_buffer_size = 0;
-        uint8_t *img_buffer = temp_img_buffer;
+      Image *send_image = prepareImage( &image );
 
-        bool send_raw = ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE));
-
-        fprintf( stdout, "--ZoneMinderFrame\r\n" );
-
-        if ( type != STREAM_JPEG )
-            send_raw = false;
-
-        if ( send_raw )
-        {
-            fdj = fopen( filepath, "rb" );
-            if ( !fdj )
-            {
-                Error( "Can't open %s: %s", filepath, strerror(errno) );
-                return( false );
-            }
-#if HAVE_SENDFILE            
-            if( fstat(fileno(fdj),&filestat) < 0 ) {
-		Error( "Failed getting information about file %s: %s", filepath, strerror(errno) );
-		return( false );
-	    }
-#else
-	    img_buffer_size = fread( img_buffer, 1, sizeof(temp_img_buffer), fdj );
-#endif
-        }
-        else
-        {
-            Image image( filepath );
-
-            Image *send_image = prepareImage( &image );
-
-            switch( type )
-            {
-                case STREAM_JPEG :
-                    send_image->EncodeJpeg( img_buffer, &img_buffer_size );
-                    break;
-                case STREAM_ZIP :
+      switch( type )
+      {
+        case STREAM_JPEG :
+          send_image->EncodeJpeg( img_buffer, &img_buffer_size );
+          break;
+        case STREAM_ZIP :
 #if HAVE_ZLIB_H
-                    unsigned long zip_buffer_size;
-                    send_image->Zip( img_buffer, &zip_buffer_size );
-                    img_buffer_size = zip_buffer_size;
-                    break;
+          unsigned long zip_buffer_size;
+          send_image->Zip( img_buffer, &zip_buffer_size );
+          img_buffer_size = zip_buffer_size;
+          break;
 #else
-                    Error("zlib is required for zipped images. Falling back to raw image");
-                    type = STREAM_RAW;
+          Error("zlib is required for zipped images. Falling back to raw image");
+          type = STREAM_RAW;
 #endif // HAVE_ZLIB_H
-                case STREAM_RAW :
-                    img_buffer = (uint8_t*)(send_image->Buffer());
-                    img_buffer_size = send_image->Size();
-                    break;
-                default:
-                    Fatal( "Unexpected frame type %d", type );
-                    break;
-            }
-        }
-
-        switch( type )
-        {
-            case STREAM_JPEG :
-                fprintf( stdout, "Content-Type: image/jpeg\r\n" );
-                break;
-            case STREAM_RAW :
-                fprintf( stdout, "Content-Type: image/x-rgb\r\n" );
-                break;
-            case STREAM_ZIP :
-                fprintf( stdout, "Content-Type: image/x-rgbz\r\n" );
-                break;
-            default :
-                Fatal( "Unexpected frame type %d", type );
-                break;
-        }
-
-
-	if(send_raw) {
-#if HAVE_SENDFILE  
-		fprintf( stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size );
-		if(zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size) != (int)filestat.st_size) {
-			/* sendfile() failed, use standard way instead */
-			img_buffer_size = fread( img_buffer, 1, sizeof(temp_img_buffer), fdj );
-			if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 ) {
-				Error("Unable to send raw frame %u: %s",curr_frame_id,strerror(errno));
-				return( false );
-			}
-		}
-#else
-		fprintf( stdout, "Content-Length: %d\r\n\r\n", img_buffer_size );
-		if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 ) {
-			Error("Unable to send raw frame %u: %s",curr_frame_id,strerror(errno));
-			return( false );
-		}
-#endif		
-		fclose(fdj); /* Close the file handle */
-	} else {
-		fprintf( stdout, "Content-Length: %d\r\n\r\n", img_buffer_size );	  
-		if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 )
-		{
-			Error( "Unable to send stream frame: %s", strerror(errno) );
-			return( false );
-		}
-	}
-	
-        fprintf( stdout, "\r\n\r\n" );
-        fflush( stdout );
+        case STREAM_RAW :
+          img_buffer = (uint8_t*)(send_image->Buffer());
+          img_buffer_size = send_image->Size();
+          break;
+        default:
+          Fatal( "Unexpected frame type %d", type );
+          break;
+      }
     }
-    last_frame_sent = TV_2_FLOAT( now );
-    return( true );
+
+    switch( type )
+    {
+      case STREAM_JPEG :
+        fprintf( stdout, "Content-Type: image/jpeg\r\n" );
+        break;
+      case STREAM_RAW :
+        fprintf( stdout, "Content-Type: image/x-rgb\r\n" );
+        break;
+      case STREAM_ZIP :
+        fprintf( stdout, "Content-Type: image/x-rgbz\r\n" );
+        break;
+      default :
+        Fatal( "Unexpected frame type %d", type );
+        break;
+    }
+
+
+  if(send_raw) {
+#if HAVE_SENDFILE  
+    fprintf( stdout, "Content-Length: %d\r\n\r\n", (int)filestat.st_size );
+    if(zm_sendfile(fileno(stdout), fileno(fdj), 0, (int)filestat.st_size) != (int)filestat.st_size) {
+      /* sendfile() failed, use standard way instead */
+      img_buffer_size = fread( img_buffer, 1, sizeof(temp_img_buffer), fdj );
+      if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 ) {
+        Error("Unable to send raw frame %u: %s",curr_frame_id,strerror(errno));
+        return( false );
+      }
+    }
+#else
+    fprintf( stdout, "Content-Length: %d\r\n\r\n", img_buffer_size );
+    if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 ) {
+      Error("Unable to send raw frame %u: %s",curr_frame_id,strerror(errno));
+      return( false );
+    }
+#endif
+    fclose(fdj); /* Close the file handle */
+  } else {
+    fprintf( stdout, "Content-Length: %d\r\n\r\n", img_buffer_size );
+    if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 )
+    {
+      Error( "Unable to send stream frame: %s", strerror(errno) );
+      return( false );
+    }
+  }
+  
+    fprintf( stdout, "\r\n\r\n" );
+    fflush( stdout );
+  }
+  last_frame_sent = TV_2_FLOAT( now );
+  return( true );
 }
 
 void EventStream::runStream()
 {
-    Event::Initialise();
+  Event::Initialise();
 
-    openComms();
+  openComms();
 
-    checkInitialised();
+  checkInitialised();
 
-    updateFrameRate( (double)event_data->frame_count/event_data->duration );
+  updateFrameRate( (double)event_data->frame_count/event_data->duration );
 
-    if ( type == STREAM_JPEG )
-        fprintf( stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n" );
+  if ( type == STREAM_JPEG )
+    fprintf( stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n" );
 
-    if ( !event_data )
+  if ( !event_data )
+  {
+    sendTextFrame( "No event data found" );
+    exit( 0 );
+  }
+
+  unsigned int delta_us = 0;
+  while( !zm_terminate )
+  {
+    gettimeofday( &now, NULL );
+
+    while(checkCommandQueue());
+
+    if ( step != 0 )
+      curr_frame_id += step;
+
+    checkEventLoaded();
+
+    // Get current frame data
+    FrameData *frame_data = &event_data->frames[curr_frame_id-1];
+
+    //Info( "cst:%.2f", curr_stream_time );
+    //Info( "cfid:%d", curr_frame_id );
+    //Info( "fdt:%d", frame_data->timestamp );
+    if ( !paused )
     {
-        sendTextFrame( "No event data found" );
-        exit( 0 );
+      bool in_event = true;
+      double time_to_event = 0;
+      if ( replay_rate > 0 )
+      {
+        time_to_event = event_data->frames[0].timestamp - curr_stream_time;
+        if ( time_to_event > 0 )
+          in_event = false;
+      }
+      else if ( replay_rate < 0 )
+      {
+        time_to_event = curr_stream_time - event_data->frames[event_data->frame_count-1].timestamp;
+        if ( time_to_event > 0 )
+          in_event = false;
+      }
+      if ( !in_event )
+      {
+        double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
+        if ( actual_delta_time > 1 )
+        {
+          static char frame_text[64];
+          snprintf( frame_text, sizeof(frame_text), "Time to next event = %d seconds", (int)time_to_event );
+          if ( !sendTextFrame( frame_text ) )
+            zm_terminate = true;
+        }
+        //else
+        //{
+          usleep( STREAM_PAUSE_WAIT );
+          //curr_stream_time += (replay_rate>0?1:-1) * ((1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000));
+          curr_stream_time += (1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
+        //}
+        continue;
+      }
     }
 
-    unsigned int delta_us = 0;
-    while( !zm_terminate )
+    // Figure out if we should send this frame
+    bool send_frame = false;
+    if ( !paused )
     {
-        gettimeofday( &now, NULL );
-
-        while(checkCommandQueue());
-
-        if ( step != 0 )
-            curr_frame_id += step;
-
-        checkEventLoaded();
-
-        // Get current frame data
-        FrameData *frame_data = &event_data->frames[curr_frame_id-1];
-
-        //Info( "cst:%.2f", curr_stream_time );
-        //Info( "cfid:%d", curr_frame_id );
-        //Info( "fdt:%d", frame_data->timestamp );
-        if ( !paused )
-        {
-            bool in_event = true;
-            double time_to_event = 0;
-            if ( replay_rate > 0 )
-            {
-                time_to_event = event_data->frames[0].timestamp - curr_stream_time;
-                if ( time_to_event > 0 )
-                    in_event = false;
-            }
-            else if ( replay_rate < 0 )
-            {
-                time_to_event = curr_stream_time - event_data->frames[event_data->frame_count-1].timestamp;
-                if ( time_to_event > 0 )
-                    in_event = false;
-            }
-            if ( !in_event )
-            {
-                double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
-                if ( actual_delta_time > 1 )
-                {
-                    static char frame_text[64];
-                    snprintf( frame_text, sizeof(frame_text), "Time to next event = %d seconds", (int)time_to_event );
-                    if ( !sendTextFrame( frame_text ) )
-                        zm_terminate = true;
-                }
-                //else
-                //{
-                    usleep( STREAM_PAUSE_WAIT );
-                    //curr_stream_time += (replay_rate>0?1:-1) * ((1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000));
-                    curr_stream_time += (1.0L * replay_rate * STREAM_PAUSE_WAIT)/(ZM_RATE_BASE * 1000000);
-                //}
-                continue;
-            }
-        }
-
-        // Figure out if we should send this frame
-        bool send_frame = false;
-        if ( !paused )
-        {
-            // If we are streaming and this frame is due to be sent
-            if ( ((curr_frame_id-1)%frame_mod) == 0 )
-            {
-                delta_us = (unsigned int)(frame_data->delta * 1000000);
-                // if effective > base we should speed up frame delivery
-                delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
-                // but must not exceed maxfps
-                delta_us = max(delta_us, 1000000 / maxfps); 
-                send_frame = true;
-            }
-        }
-        else if ( step != 0 )
-        {
-            // We are paused and are just stepping forward or backward one frame
-            step = 0;
-            send_frame = true;
-        }
-        else
-        {
-            // We are paused, and doing nothing
-            double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
-            if ( actual_delta_time > MAX_STREAM_DELAY )
-            {
-                // Send keepalive
-                Debug( 2, "Sending keepalive frame" );
-                send_frame = true;
-            }
-        }
-
-        if ( send_frame )
-            if ( !sendFrame( delta_us ) )
-                zm_terminate = true;
-
-        curr_stream_time = frame_data->timestamp;
-
-        if ( !paused )
-        {
-            curr_frame_id += replay_rate>0?1:-1;
-            if ( send_frame && type != STREAM_MPEG )
-            {
-                Debug( 3, "dUs: %d", delta_us );
-                usleep( delta_us );
-            }
-        }
-        else
-        {
-            usleep( (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))) );
-        }
+      // If we are streaming and this frame is due to be sent
+      if ( ((curr_frame_id-1)%frame_mod) == 0 )
+      {
+        delta_us = (unsigned int)(frame_data->delta * 1000000);
+        // if effective > base we should speed up frame delivery
+        delta_us = (unsigned int)((delta_us * base_fps)/effective_fps);
+        // but must not exceed maxfps
+        delta_us = max(delta_us, 1000000 / maxfps); 
+        send_frame = true;
+      }
     }
+    else if ( step != 0 )
+    {
+      // We are paused and are just stepping forward or backward one frame
+      step = 0;
+      send_frame = true;
+    }
+    else
+    {
+      // We are paused, and doing nothing
+      double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
+      if ( actual_delta_time > MAX_STREAM_DELAY )
+      {
+        // Send keepalive
+        Debug( 2, "Sending keepalive frame" );
+        send_frame = true;
+      }
+    }
+
+    if ( send_frame )
+      if ( !sendFrame( delta_us ) )
+        zm_terminate = true;
+
+    curr_stream_time = frame_data->timestamp;
+
+    if ( !paused )
+    {
+      curr_frame_id += replay_rate>0?1:-1;
+      if ( send_frame && type != STREAM_MPEG )
+      {
+        Debug( 3, "dUs: %d", delta_us );
+        usleep( delta_us );
+      }
+    }
+    else
+    {
+      usleep( (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))) );
+    }
+  }
 #if HAVE_LIBAVCODEC
-    if ( type == STREAM_MPEG )
-        delete vid_stream;
+  if ( type == STREAM_MPEG )
+    delete vid_stream;
 #endif // HAVE_LIBAVCODEC
 
-    closeComms();
+  closeComms();
 }
diff --git a/src/zm_event.h b/src/zm_event.h
old mode 100755
new mode 100644
index 7b1bca24c..d83a67f91
--- a/src/zm_event.h
+++ b/src/zm_event.h
@@ -42,7 +42,7 @@
 class Zone;
 class Monitor;
 
-#define MAX_PRE_ALARM_FRAMES	16 // Maximum number of prealarm frames that can be stored
+#define MAX_PRE_ALARM_FRAMES  16 // Maximum number of prealarm frames that can be stored
 
 //
 // Class describing events, i.e. captured periods of activity.
@@ -52,233 +52,234 @@ class Event
 friend class EventStream;
 
 protected:
-	static bool		initialised;
-	static char		capture_file_format[PATH_MAX];
-	static char		analyse_file_format[PATH_MAX];
-	static char		general_file_format[PATH_MAX];
-	static char		video_file_format[PATH_MAX];
+  static bool    initialised;
+  static char    capture_file_format[PATH_MAX];
+  static char    analyse_file_format[PATH_MAX];
+  static char    general_file_format[PATH_MAX];
+  static char   video_file_format[PATH_MAX];
 
 protected:
-	static int		sd;
+  static int    sd;
 
 public:
-    typedef std::set<std::string> StringSet;
-    typedef std::map<std::string,StringSet> StringSetMap;
+  typedef std::set<std::string> StringSet;
+  typedef std::map<std::string,StringSet> StringSetMap;
 
 protected:
-    typedef enum { NORMAL, BULK, ALARM } FrameType;
+  typedef enum { NORMAL, BULK, ALARM } FrameType;
 
-	struct PreAlarmData
-	{
-		Image *image;
-		struct timeval timestamp;
-		unsigned int score;
-		Image *alarm_frame;
-	};
+  struct PreAlarmData
+  {
+    Image *image;
+    struct timeval timestamp;
+    unsigned int score;
+    Image *alarm_frame;
+  };
 
-	static int pre_alarm_count;
-	static PreAlarmData pre_alarm_data[MAX_PRE_ALARM_FRAMES];
+  static int pre_alarm_count;
+  static PreAlarmData pre_alarm_data[MAX_PRE_ALARM_FRAMES];
 
 protected:
-	unsigned int	id;
-	Monitor			*monitor;
-	struct timeval	start_time;
-	struct timeval	end_time;
-	std::string     cause;
-    StringSetMap    noteSetMap;
-    bool            videoEvent;
-	int				frames;
-	int				alarm_frames;
-	unsigned int	tot_score;
-	unsigned int	max_score;
-	char			path[PATH_MAX];
-	VideoWriter* videowriter;
-	FILE* timecodes_fd;
-	char video_name[PATH_MAX];
-	char video_file[PATH_MAX];
-	char timecodes_name[PATH_MAX];
-	char timecodes_file[PATH_MAX];
+  unsigned int  id;
+  Monitor      *monitor;
+  struct timeval  start_time;
+  struct timeval  end_time;
+  std::string   cause;
+  StringSetMap  noteSetMap;
+  bool        videoEvent;
+  int        frames;
+  int        alarm_frames;
+  unsigned int  tot_score;
+  unsigned int  max_score;
+  char      path[PATH_MAX];
+  VideoWriter* videowriter;
+  FILE* timecodes_fd;
+  char video_name[PATH_MAX];
+  char video_file[PATH_MAX];
+  char timecodes_name[PATH_MAX];
+  char timecodes_file[PATH_MAX];
 
 protected:
-	int				last_db_frame;
+  int        last_db_frame;
 
 protected:
-	static void Initialise()
-	{
-        if ( initialised )
-            return;
+  static void Initialise()
+  {
+    if ( initialised )
+      return;
 
-		snprintf( capture_file_format, sizeof(capture_file_format), "%%s/%%0%dd-capture.jpg", config.event_image_digits );
-		snprintf( analyse_file_format, sizeof(analyse_file_format), "%%s/%%0%dd-analyse.jpg", config.event_image_digits );
-		snprintf( general_file_format, sizeof(general_file_format), "%%s/%%0%dd-%%s", config.event_image_digits );
-		snprintf( video_file_format, sizeof(video_file_format), "%%s/%%s");
+    snprintf( capture_file_format, sizeof(capture_file_format), "%%s/%%0%dd-capture.jpg", config.event_image_digits );
+    snprintf( analyse_file_format, sizeof(analyse_file_format), "%%s/%%0%dd-analyse.jpg", config.event_image_digits );
+    snprintf( general_file_format, sizeof(general_file_format), "%%s/%%0%dd-%%s", config.event_image_digits );
+    snprintf( video_file_format, sizeof(video_file_format), "%%s/%%s");
 
-		initialised = true;
-	}
+    initialised = true;
+  }
 
-    void createNotes( std::string &notes );
+  void createNotes( std::string &notes );
 
 public:
-	static bool OpenFrameSocket( int );
-	static bool ValidateFrameSocket( int );
+  static bool OpenFrameSocket( int );
+  static bool ValidateFrameSocket( int );
 
 public:
-	Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent=false );
-	~Event();
+  Event( Monitor *p_monitor, struct timeval p_start_time, const std::string &p_cause, const StringSetMap &p_noteSetMap, bool p_videoEvent=false );
+  ~Event();
 
-	int Id() const { return( id ); }
-	const std::string &Cause() { return( cause ); }
-	int Frames() const { return( frames ); }
-	int AlarmFrames() const { return( alarm_frames ); }
+  int Id() const { return( id ); }
+  const std::string &Cause() { return( cause ); }
+  int Frames() const { return( frames ); }
+  int AlarmFrames() const { return( alarm_frames ); }
 
-	const struct timeval &StartTime() const { return( start_time ); }
-	const struct timeval &EndTime() const { return( end_time ); }
-	struct timeval &EndTime() { return( end_time ); }
+  const struct timeval &StartTime() const { return( start_time ); }
+  const struct timeval &EndTime() const { return( end_time ); }
+  struct timeval &EndTime() { return( end_time ); }
 
-	bool SendFrameImage( const Image *image, bool alarm_frame=false );
-	bool WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame=false );
-	bool WriteFrameVideo( const Image *image, const struct timeval timestamp, VideoWriter* videow );
+  bool SendFrameImage( const Image *image, bool alarm_frame=false );
+  bool WriteFrameImage( Image *image, struct timeval timestamp, const char *event_file, bool alarm_frame=false );
+  bool WriteFrameVideo( const Image *image, const struct timeval timestamp, VideoWriter* videow );
 
-    void updateNotes( const StringSetMap &stringSetMap );
+  void updateNotes( const StringSetMap &stringSetMap );
 
-	void AddFrames( int n_frames, Image **images, struct timeval **timestamps );
-	void AddFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=NULL );
+  void AddFrames( int n_frames, Image **images, struct timeval **timestamps );
+  void AddFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=NULL );
 
 private:
-	void AddFramesInternal( int n_frames, int start_frame, Image **images, struct timeval **timestamps );
+  void AddFramesInternal( int n_frames, int start_frame, Image **images, struct timeval **timestamps );
 
 public:
-    static const char *getSubPath( struct tm *time )
-    {
-        static char subpath[PATH_MAX] = "";
-        snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
-        return( subpath );
-    }
-    static const char *getSubPath( time_t *time )
-    {
-        return( Event::getSubPath( localtime( time ) ) );
-    }
+  static const char *getSubPath( struct tm *time )
+  {
+    static char subpath[PATH_MAX] = "";
+    snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
+    return( subpath );
+  }
+  static const char *getSubPath( time_t *time )
+  {
+    return( Event::getSubPath( localtime( time ) ) );
+  }
 
-    char* getEventFile(void){
- 	return video_file;
-    }
+  char* getEventFile(void)
+  {
+    return video_file;
+  }
 
 public:
-	static int PreAlarmCount()
-	{
-		return( pre_alarm_count );
-	}
-	static void EmptyPreAlarmFrames()
-	{
-		if ( pre_alarm_count > 0 )
-		{
-			for ( int i = 0; i < MAX_PRE_ALARM_FRAMES; i++ )
-			{
-				delete pre_alarm_data[i].image;
-				delete pre_alarm_data[i].alarm_frame;
-			}
-			memset( pre_alarm_data, 0, sizeof(pre_alarm_data) );
-		}
-		pre_alarm_count = 0;
-	}
-	static void AddPreAlarmFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=NULL )
-	{
-		pre_alarm_data[pre_alarm_count].image = new Image( *image );
-		pre_alarm_data[pre_alarm_count].timestamp = timestamp;
-		pre_alarm_data[pre_alarm_count].score = score;
-		if ( alarm_frame )
-		{
-			pre_alarm_data[pre_alarm_count].alarm_frame = new Image( *alarm_frame );
-		}
-		pre_alarm_count++;
-	}
-	void SavePreAlarmFrames()
-	{
-		for ( int i = 0; i < pre_alarm_count; i++ )
-		{
-			AddFrame( pre_alarm_data[i].image, pre_alarm_data[i].timestamp, pre_alarm_data[i].score, pre_alarm_data[i].alarm_frame );
-		}
-		EmptyPreAlarmFrames();
-	}
+  static int PreAlarmCount()
+  {
+    return( pre_alarm_count );
+  }
+  static void EmptyPreAlarmFrames()
+  {
+    if ( pre_alarm_count > 0 )
+    {
+      for ( int i = 0; i < MAX_PRE_ALARM_FRAMES; i++ )
+      {
+        delete pre_alarm_data[i].image;
+        delete pre_alarm_data[i].alarm_frame;
+      }
+      memset( pre_alarm_data, 0, sizeof(pre_alarm_data) );
+    }
+    pre_alarm_count = 0;
+  }
+  static void AddPreAlarmFrame( Image *image, struct timeval timestamp, int score=0, Image *alarm_frame=NULL )
+  {
+    pre_alarm_data[pre_alarm_count].image = new Image( *image );
+    pre_alarm_data[pre_alarm_count].timestamp = timestamp;
+    pre_alarm_data[pre_alarm_count].score = score;
+    if ( alarm_frame )
+    {
+      pre_alarm_data[pre_alarm_count].alarm_frame = new Image( *alarm_frame );
+    }
+    pre_alarm_count++;
+  }
+  void SavePreAlarmFrames()
+  {
+    for ( int i = 0; i < pre_alarm_count; i++ )
+    {
+      AddFrame( pre_alarm_data[i].image, pre_alarm_data[i].timestamp, pre_alarm_data[i].score, pre_alarm_data[i].alarm_frame );
+    }
+    EmptyPreAlarmFrames();
+  }
 };
 
 class EventStream : public StreamBase
 {
 public:
-    typedef enum { MODE_SINGLE, MODE_ALL, MODE_ALL_GAPLESS } StreamMode;
+  typedef enum { MODE_SINGLE, MODE_ALL, MODE_ALL_GAPLESS } StreamMode;
 
 protected:
-    struct FrameData {
-        //unsigned long   id;
-        time_t          timestamp;
-        time_t          offset;
-        double          delta;
-        bool            in_db;
-    };
+  struct FrameData {
+    //unsigned long   id;
+    time_t      timestamp;
+    time_t      offset;
+    double      delta;
+    bool      in_db;
+  };
 
-    struct EventData
-    {
-        unsigned long   event_id;
-        unsigned long   monitor_id;
-        unsigned long   frame_count;
-        time_t          start_time;
-        double          duration;
-        char            path[PATH_MAX];
-        int             n_frames;
-        FrameData       *frames;
-    };
+  struct EventData
+  {
+    unsigned long   event_id;
+    unsigned long   monitor_id;
+    unsigned long   frame_count;
+    time_t      start_time;
+    double      duration;
+    char      path[PATH_MAX];
+    int       n_frames;
+    FrameData     *frames;
+  };
 
 protected:
-    static const int STREAM_PAUSE_WAIT = 250000; // Microseconds
+  static const int STREAM_PAUSE_WAIT = 250000; // Microseconds
 
-    static const StreamMode DEFAULT_MODE = MODE_SINGLE;
+  static const StreamMode DEFAULT_MODE = MODE_SINGLE;
 
 protected:
-    StreamMode mode;
-    bool forceEventChange;
+  StreamMode mode;
+  bool forceEventChange;
 
 protected:
-    int curr_frame_id;
-    double curr_stream_time;
+  int curr_frame_id;
+  double curr_stream_time;
 
-    EventData *event_data;
+  EventData *event_data;
 
 protected:
-    bool loadEventData( int event_id );
-    bool loadInitialEventData( int init_event_id, int init_frame_id );
-    bool loadInitialEventData( int monitor_id, time_t event_time );
+  bool loadEventData( int event_id );
+  bool loadInitialEventData( int init_event_id, unsigned int init_frame_id );
+  bool loadInitialEventData( int monitor_id, time_t event_time );
 
-    void checkEventLoaded();
-    void processCommand( const CmdMsg *msg );
-    bool sendFrame( int delta_us );
+  void checkEventLoaded();
+  void processCommand( const CmdMsg *msg );
+  bool sendFrame( int delta_us );
 
 public:
-    EventStream()
-    {
-        mode = DEFAULT_MODE;
+  EventStream()
+  {
+    mode = DEFAULT_MODE;
 
-        forceEventChange = false;
+    forceEventChange = false;
 
-        curr_frame_id = 0;
-        curr_stream_time = 0.0;
+    curr_frame_id = 0;
+    curr_stream_time = 0.0;
 
-        event_data = 0;
-    }
-	void setStreamStart( int init_event_id, int init_frame_id=0 )
-    {
-        loadInitialEventData( init_event_id, init_frame_id );
-        loadMonitor( event_data->monitor_id );
-    }
-	void setStreamStart( int monitor_id, time_t event_time )
-    {
-        loadInitialEventData( monitor_id, event_time );
-        loadMonitor( monitor_id );
-    }
-    void setStreamMode( StreamMode p_mode )
-    {
-        mode = p_mode;
-    }
-    void runStream();
+    event_data = 0;
+  }
+  void setStreamStart( int init_event_id, unsigned int init_frame_id=0 )
+  {
+    loadInitialEventData( init_event_id, init_frame_id );
+    loadMonitor( event_data->monitor_id );
+  }
+  void setStreamStart( int monitor_id, time_t event_time )
+  {
+    loadInitialEventData( monitor_id, event_time );
+    loadMonitor( monitor_id );
+  }
+  void setStreamMode( StreamMode p_mode )
+  {
+    mode = p_mode;
+  }
+  void runStream();
 };
 
 #endif // ZM_EVENT_H
diff --git a/src/zm_exception.h b/src/zm_exception.h
index 4af60bfa6..a503be7c9 100644
--- a/src/zm_exception.h
+++ b/src/zm_exception.h
@@ -27,42 +27,42 @@
 class Exception
 {
 protected:
-    typedef enum { INFO, WARNING, ERROR, FATAL } Severity;
+  typedef enum { INFO, WARNING, ERROR, FATAL } Severity;
 
 protected:
-    std::string mMessage;
-    Severity mSeverity;
+  std::string mMessage;
+  Severity mSeverity;
 
 public:
-    Exception( const std::string &message, Severity severity=ERROR ) : mMessage( message ), mSeverity( severity )
-    {
-    }
+  Exception( const std::string &message, Severity severity=ERROR ) : mMessage( message ), mSeverity( severity )
+  {
+  }
 
 public:
-    const std::string &getMessage() const
-    {
-        return( mMessage );
-    }
-    Severity getSeverity() const
-    {
-        return( mSeverity );
-    }
-    bool isInfo() const
-    {
-        return( mSeverity == INFO );
-    }
-    bool isWarning() const
-    {
-        return( mSeverity == WARNING );
-    }
-    bool isError() const
-    {
-        return( mSeverity == ERROR );
-    }
-    bool isFatal() const
-    {
-        return( mSeverity == FATAL );
-    }
+  const std::string &getMessage() const
+  {
+    return( mMessage );
+  }
+  Severity getSeverity() const
+  {
+    return( mSeverity );
+  }
+  bool isInfo() const
+  {
+    return( mSeverity == INFO );
+  }
+  bool isWarning() const
+  {
+    return( mSeverity == WARNING );
+  }
+  bool isError() const
+  {
+    return( mSeverity == ERROR );
+  }
+  bool isFatal() const
+  {
+    return( mSeverity == FATAL );
+  }
 };
 
 #endif // ZM_EXCEPTION_H
diff --git a/src/zm_ffmpeg.cpp b/src/zm_ffmpeg.cpp
index 5b2fef2ae..8b2727c83 100644
--- a/src/zm_ffmpeg.cpp
+++ b/src/zm_ffmpeg.cpp
@@ -24,218 +24,221 @@
 #if HAVE_LIBAVCODEC || HAVE_LIBAVUTIL || HAVE_LIBSWSCALE
 
 void FFMPEGInit() {
-	static bool bInit = false;
+  static bool bInit = false;
 
-	if(!bInit) {
-		av_register_all();
-		av_log_set_level(AV_LOG_DEBUG);
-		bInit = true;
-	}
+  if(!bInit) {
+    av_register_all();
+    av_log_set_level(AV_LOG_DEBUG);
+    bInit = true;
+  }
 }
 
 #if HAVE_LIBAVUTIL
 enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subpixelorder) {
-	enum _AVPIXELFORMAT pf;
+  enum _AVPIXELFORMAT pf;
 
-	Debug(8,"Colours: %d SubpixelOrder: %d",p_colours,p_subpixelorder);
+  Debug(8,"Colours: %d SubpixelOrder: %d",p_colours,p_subpixelorder);
 
-	switch(p_colours) {
-	  case ZM_COLOUR_RGB24:
-	  {
-	    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-	      /* BGR subpixel order */
-	      pf = AV_PIX_FMT_BGR24;
-	    } else {
-	      /* Assume RGB subpixel order */
-	      pf = AV_PIX_FMT_RGB24;
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
-	    if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      /* ARGB subpixel order */
-	      pf = AV_PIX_FMT_ARGB;
-	    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      /* ABGR subpixel order */
-	      pf = AV_PIX_FMT_ABGR;
-	    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      /* BGRA subpixel order */
-	      pf = AV_PIX_FMT_BGRA;
-	    } else {
-	      /* Assume RGBA subpixel order */
-	      pf = AV_PIX_FMT_RGBA;
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_GRAY8:
-	    pf = AV_PIX_FMT_GRAY8;
-	    break;
-	  default:
-	    Panic("Unexpected colours: %d",p_colours);
-	    pf = AV_PIX_FMT_GRAY8; /* Just to shush gcc variable may be unused warning */
-	    break;
-	}
+  switch(p_colours) {
+    case ZM_COLOUR_RGB24:
+    {
+    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+      /* BGR subpixel order */
+      pf = AV_PIX_FMT_BGR24;
+    } else {
+      /* Assume RGB subpixel order */
+      pf = AV_PIX_FMT_RGB24;
+    }
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
+    if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      /* ARGB subpixel order */
+      pf = AV_PIX_FMT_ARGB;
+    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      /* ABGR subpixel order */
+      pf = AV_PIX_FMT_ABGR;
+    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* BGRA subpixel order */
+      pf = AV_PIX_FMT_BGRA;
+    } else {
+      /* Assume RGBA subpixel order */
+      pf = AV_PIX_FMT_RGBA;
+    }
+    break;
+    }
+    case ZM_COLOUR_GRAY8:
+    pf = AV_PIX_FMT_GRAY8;
+    break;
+    default:
+    Panic("Unexpected colours: %d",p_colours);
+    pf = AV_PIX_FMT_GRAY8; /* Just to shush gcc variable may be unused warning */
+    break;
+  }
 
-	return pf;
+  return pf;
 }
 #endif // HAVE_LIBAVUTIL
 
 #if HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 SWScale::SWScale() : gotdefaults(false), swscale_ctx(NULL), input_avframe(NULL), output_avframe(NULL) {
-	Debug(4,"SWScale object created");
+  Debug(4,"SWScale object created");
 
-	/* Allocate AVFrame for the input */
+  /* Allocate AVFrame for the input */
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-	input_avframe = av_frame_alloc();
+  input_avframe = av_frame_alloc();
 #else
-	input_avframe = avcodec_alloc_frame();
+  input_avframe = avcodec_alloc_frame();
 #endif
-	if(input_avframe == NULL) {
-		Fatal("Failed allocating AVFrame for the input");
-	}
+  if(input_avframe == NULL) {
+    Fatal("Failed allocating AVFrame for the input");
+  }
 
-	/* Allocate AVFrame for the output */
+  /* Allocate AVFrame for the output */
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-	output_avframe = av_frame_alloc();
+  output_avframe = av_frame_alloc();
 #else
-	output_avframe = avcodec_alloc_frame();
+  output_avframe = avcodec_alloc_frame();
 #endif
-	if(output_avframe == NULL) {
-		Fatal("Failed allocating AVFrame for the output");
-	}
+  if(output_avframe == NULL) {
+    Fatal("Failed allocating AVFrame for the output");
+  }
 }
 
 SWScale::~SWScale() {
 
-	/* Free up everything */
+  /* Free up everything */
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-	av_frame_free( &input_avframe );
+  av_frame_free( &input_avframe );
 #else
-	av_freep( &input_avframe );
+  av_freep( &input_avframe );
 #endif   
-	//input_avframe = NULL;
+  //input_avframe = NULL;
 
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-	av_frame_free( &output_avframe );
+  av_frame_free( &output_avframe );
 #else
-	av_freep( &output_avframe );
+  av_freep( &output_avframe );
 #endif
-	//output_avframe = NULL;
+  //output_avframe = NULL;
 
-	if(swscale_ctx) {
-		sws_freeContext(swscale_ctx);
-		swscale_ctx = NULL;
-	}
-	
-	Debug(4,"SWScale object destroyed");
+  if(swscale_ctx) {
+    sws_freeContext(swscale_ctx);
+    swscale_ctx = NULL;
+  }
+  
+  Debug(4,"SWScale object destroyed");
 }
 
 int SWScale::SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
 
-	/* Assign the defaults */
-	default_input_pf = in_pf;
-	default_output_pf = out_pf;
-	default_width = width;
-	default_height = height;
+  /* Assign the defaults */
+  default_input_pf = in_pf;
+  default_output_pf = out_pf;
+  default_width = width;
+  default_height = height;
 
-	gotdefaults = true;
+  gotdefaults = true;
 
-	return 0;
+  return 0;
 }
 
 int SWScale::Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
-	/* Parameter checking */
-	if(in_buffer == NULL || out_buffer == NULL) {
-		Error("NULL Input or output buffer");
-		return -1;
-	}
-
-	if(!width || !height) {
-		Error("Invalid width or height");
-		return -3;
-	}
+  /* Parameter checking */
+  if(in_buffer == NULL || out_buffer == NULL) {
+    Error("NULL Input or output buffer");
+    return -1;
+  }
+  if(in_pf == 0 || out_pf == 0) {
+    Error("Invalid input or output pixel formats");
+    return -2;
+  }
+  if(!width || !height) {
+    Error("Invalid width or height");
+    return -3;
+  }
 
 #if LIBSWSCALE_VERSION_CHECK(0, 8, 0, 8, 0)
-	/* Warn if the input or output pixelformat is not supported */
-	if(!sws_isSupportedInput(in_pf)) {
-		Warning("swscale does not support the input format: %c%c%c%c",(in_pf)&0xff,((in_pf)&0xff),((in_pf>>16)&0xff),((in_pf>>24)&0xff));
-	}
-	if(!sws_isSupportedOutput(out_pf)) {
-		Warning("swscale does not support the output format: %c%c%c%c",(out_pf)&0xff,((out_pf>>8)&0xff),((out_pf>>16)&0xff),((out_pf>>24)&0xff));
-	}
+  /* Warn if the input or output pixelformat is not supported */
+  if(!sws_isSupportedInput(in_pf)) {
+    Warning("swscale does not support the input format: %c%c%c%c",(in_pf)&0xff,((in_pf)&0xff),((in_pf>>16)&0xff),((in_pf>>24)&0xff));
+  }
+  if(!sws_isSupportedOutput(out_pf)) {
+    Warning("swscale does not support the output format: %c%c%c%c",(out_pf)&0xff,((out_pf>>8)&0xff),((out_pf>>16)&0xff),((out_pf>>24)&0xff));
+  }
 #endif
 
-	/* Check the buffer sizes */
-	size_t insize = avpicture_get_size(in_pf, width, height);
-	if(insize != in_buffer_size) {
-		Error("The input buffer size does not match the expected size for the input format. Required: %d Available: %d", insize, in_buffer_size);
-		return -4;
-	}
-	size_t outsize = avpicture_get_size(out_pf, width, height);
-	if(outsize < out_buffer_size) {
-		Error("The output buffer is undersized for the output format. Required: %d Available: %d", outsize, out_buffer_size);
-		return -5;
-	}
+  /* Check the buffer sizes */
+  size_t insize = avpicture_get_size(in_pf, width, height);
+  if(insize != in_buffer_size) {
+    Error("The input buffer size does not match the expected size for the input format. Required: %d Available: %d", insize, in_buffer_size);
+    return -4;
+  }
+  size_t outsize = avpicture_get_size(out_pf, width, height);
+  if(outsize < out_buffer_size) {
+    Error("The output buffer is undersized for the output format. Required: %d Available: %d", outsize, out_buffer_size);
+    return -5;
+  }
 
-	/* Get the context */
-	swscale_ctx = sws_getCachedContext( swscale_ctx, width, height, in_pf, width, height, out_pf, SWS_FAST_BILINEAR, NULL, NULL, NULL );
-	if(swscale_ctx == NULL) {
-		Error("Failed getting swscale context");
-		return -6;
-	}
+  /* Get the context */
+  swscale_ctx = sws_getCachedContext( NULL, width, height, in_pf, width, height, out_pf, 0, NULL, NULL, NULL );
+  if(swscale_ctx == NULL) {
+    Error("Failed getting swscale context");
+    return -6;
+  }
 
-	/* Fill in the buffers */
-	if(!avpicture_fill( (AVPicture*)input_avframe, (uint8_t*)in_buffer, in_pf, width, height ) ) {
-		Error("Failed filling input frame with input buffer");
-		return -7;
-	}
-	if(!avpicture_fill( (AVPicture*)output_avframe, out_buffer, out_pf, width, height ) ) {
-		Error("Failed filling output frame with output buffer");
-		return -8;
-	}
+  /* Fill in the buffers */
+  if(!avpicture_fill( (AVPicture*)input_avframe, (uint8_t*)in_buffer, in_pf, width, height ) ) {
+    Error("Failed filling input frame with input buffer");
+    return -7;
+  }
+  if(!avpicture_fill( (AVPicture*)output_avframe, out_buffer, out_pf, width, height ) ) {
+    Error("Failed filling output frame with output buffer");
+    return -8;
+  }
 
-	/* Do the conversion */
-	if(!sws_scale(swscale_ctx, input_avframe->data, input_avframe->linesize, 0, height, output_avframe->data, output_avframe->linesize ) ) {
-		Error("swscale conversion failed");
-		return -10;
-	}
+  /* Do the conversion */
+  if(!sws_scale(swscale_ctx, input_avframe->data, input_avframe->linesize, 0, height, output_avframe->data, output_avframe->linesize ) ) {
+    Error("swscale conversion failed");
+    return -10;
+  }
 
-	return 0;
+  return 0;
 }
 
 int SWScale::Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height) {
-	if(img->Width() != width) {
-		Error("Source image width differs. Source: %d Output: %d",img->Width(), width);
-		return -12;
-	}
+  if(img->Width() != width) {
+    Error("Source image width differs. Source: %d Output: %d",img->Width(), width);
+    return -12;
+  }
 
-	if(img->Height() != height) {
-		Error("Source image height differs. Source: %d Output: %d",img->Height(), height);
-		return -13;
-	}
+  if(img->Height() != height) {
+    Error("Source image height differs. Source: %d Output: %d",img->Height(), height);
+    return -13;
+  }
 
-	return Convert(img->Buffer(),img->Size(),out_buffer,out_buffer_size,in_pf,out_pf,width,height);
+  return Convert(img->Buffer(),img->Size(),out_buffer,out_buffer_size,in_pf,out_pf,width,height);
 }
 
 int SWScale::ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size) {
 
-	if(!gotdefaults) {
-		Error("Defaults are not set");
-		return -24;
-	}
+  if(!gotdefaults) {
+    Error("Defaults are not set");
+    return -24;
+  }
 
-	return Convert(img,out_buffer,out_buffer_size,default_input_pf,default_output_pf,default_width,default_height);
+  return Convert(img,out_buffer,out_buffer_size,default_input_pf,default_output_pf,default_width,default_height);
 }
 
 int SWScale::ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size) {
 
-	if(!gotdefaults) {
-		Error("Defaults are not set");
-		return -24;
-	}
+  if(!gotdefaults) {
+    Error("Defaults are not set");
+    return -24;
+  }
 
-	return Convert(in_buffer,in_buffer_size,out_buffer,out_buffer_size,default_input_pf,default_output_pf,default_width,default_height);
+  return Convert(in_buffer,in_buffer_size,out_buffer,out_buffer_size,default_input_pf,default_output_pf,default_width,default_height);
 }
 #endif // HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 
@@ -243,78 +246,176 @@ int SWScale::ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_si
 
 #if HAVE_LIBAVUTIL
 int64_t av_rescale_delta(AVRational in_tb, int64_t in_ts,  AVRational fs_tb, int duration, int64_t *last, AVRational out_tb){
-    int64_t a, b, this_thing;
+  int64_t a, b, this_thing;
 
-    av_assert0(in_ts != AV_NOPTS_VALUE);
-    av_assert0(duration >= 0);
+  av_assert0(in_ts != AV_NOPTS_VALUE);
+  av_assert0(duration >= 0);
 
-    if (*last == AV_NOPTS_VALUE || !duration || in_tb.num*(int64_t)out_tb.den <= out_tb.num*(int64_t)in_tb.den) {
+  if (*last == AV_NOPTS_VALUE || !duration || in_tb.num*(int64_t)out_tb.den <= out_tb.num*(int64_t)in_tb.den) {
 simple_round:
-        *last = av_rescale_q(in_ts, in_tb, fs_tb) + duration;
-        return av_rescale_q(in_ts, in_tb, out_tb);
-    }
+    *last = av_rescale_q(in_ts, in_tb, fs_tb) + duration;
+    return av_rescale_q(in_ts, in_tb, out_tb);
+  }
 
-    a =  av_rescale_q_rnd(2*in_ts-1, in_tb, fs_tb, AV_ROUND_DOWN)   >>1;
-    b = (av_rescale_q_rnd(2*in_ts+1, in_tb, fs_tb, AV_ROUND_UP  )+1)>>1;
-    if (*last < 2*a - b || *last > 2*b - a)
-        goto simple_round;
+  a =  av_rescale_q_rnd(2*in_ts-1, in_tb, fs_tb, AV_ROUND_DOWN)   >>1;
+  b = (av_rescale_q_rnd(2*in_ts+1, in_tb, fs_tb, AV_ROUND_UP  )+1)>>1;
+  if (*last < 2*a - b || *last > 2*b - a)
+    goto simple_round;
 
-   this_thing = av_clip64(*last, a, b);
-    *last = this_thing + duration;
+  this_thing = av_clip64(*last, a, b);
+  *last = this_thing + duration;
 
-    return av_rescale_q(this_thing, fs_tb, out_tb);
+  return av_rescale_q(this_thing, fs_tb, out_tb);
 }
 #endif
 
 int hacked_up_context2_for_older_ffmpeg(AVFormatContext **avctx, AVOutputFormat *oformat, const char *format, const char *filename) {
-    AVFormatContext *s = avformat_alloc_context();
-    int ret = 0;
+  AVFormatContext *s = avformat_alloc_context();
+  int ret = 0;
 
-    *avctx = NULL;
-    if (!s) {
-		av_log(s, AV_LOG_ERROR, "Out of memory\n");
-		ret = AVERROR(ENOMEM);
-		return ret;
-    }
+  *avctx = NULL;
+  if (!s) {
+    av_log(s, AV_LOG_ERROR, "Out of memory\n");
+    ret = AVERROR(ENOMEM);
+    return ret;
+  }
 
-    if (!oformat) {
-        if (format) {
-            oformat = av_guess_format(format, NULL, NULL);
-            if (!oformat) {
-                av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format);
-                ret = AVERROR(EINVAL);
-            }
-        } else {
-            oformat = av_guess_format(NULL, filename, NULL);
-            if (!oformat) {
-                ret = AVERROR(EINVAL);
-                av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", filename);
-            }
-        }
-    }
-
-    if (ret) {
-		avformat_free_context(s);
-		return ret;
+  if (!oformat) {
+    if (format) {
+      oformat = av_guess_format(format, NULL, NULL);
+      if (!oformat) {
+        av_log(s, AV_LOG_ERROR, "Requested output format '%s' is not a suitable output format\n", format);
+        ret = AVERROR(EINVAL);
+      }
     } else {
-		s->oformat = oformat;
-		if (s->oformat->priv_data_size > 0) {
-			s->priv_data = av_mallocz(s->oformat->priv_data_size);
-			if (s->priv_data) {
-				if (s->oformat->priv_class) {
-					*(const AVClass**)s->priv_data= s->oformat->priv_class;
-					av_opt_set_defaults(s->priv_data);
-				}
-			} else {
-				av_log(s, AV_LOG_ERROR, "Out of memory\n");
-				ret = AVERROR(ENOMEM);
-			   return ret;
-			}
-			s->priv_data = NULL;
-		}
+      oformat = av_guess_format(NULL, filename, NULL);
+      if (!oformat) {
+        ret = AVERROR(EINVAL);
+        av_log(s, AV_LOG_ERROR, "Unable to find a suitable output format for '%s'\n", filename);
+      }
+    }
+  }
 
-		if (filename) strncpy(s->filename, filename, sizeof(s->filename));
-		*avctx = s;
-		return 0;
-	}
+  if (ret) {
+    avformat_free_context(s);
+    return ret;
+  } else {
+    s->oformat = oformat;
+    if (s->oformat->priv_data_size > 0) {
+      s->priv_data = av_mallocz(s->oformat->priv_data_size);
+      if (s->priv_data) {
+        if (s->oformat->priv_class) {
+          *(const AVClass**)s->priv_data= s->oformat->priv_class;
+          av_opt_set_defaults(s->priv_data);
+        }
+      } else {
+        av_log(s, AV_LOG_ERROR, "Out of memory\n");
+        ret = AVERROR(ENOMEM);
+        return ret;
+      }
+      s->priv_data = NULL;
+    }
+
+    if (filename) strncpy(s->filename, filename, sizeof(s->filename));
+      *avctx = s;
+      return 0;
+  }
+}
+
+static void zm_log_fps(double d, const char *postfix)
+{
+  uint64_t v = lrintf(d * 100);
+  if (!v) {
+    Debug(3, "%1.4f %s", d, postfix);
+  } else if (v % 100) {
+    Debug(3, "%3.2f %s", d, postfix);
+  } else if (v % (100 * 1000)) {
+    Debug(3, "%1.0f %s", d, postfix);
+  } else
+    Debug(3, "%1.0fk %s", d / 1000, postfix);
+}
+
+/* "user interface" functions */
+void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output) {
+  char buf[256];
+  int flags = (is_output ? ic->oformat->flags : ic->iformat->flags);
+  AVStream *st = ic->streams[i];
+  AVDictionaryEntry *lang = av_dict_get(st->metadata, "language", NULL, 0);
+  unsigned char *separator = ic->dump_separator;
+  char **codec_separator = (char **)av_opt_ptr(st->codec->av_class, st->codec, "dump_separator");
+  int use_format_separator = !*codec_separator;
+
+  if (use_format_separator)
+    *codec_separator = av_strdup((const char *)separator);
+  avcodec_string(buf, sizeof(buf), st->codec, is_output);
+  if (use_format_separator)
+    av_freep(codec_separator);
+  Debug(3, "    Stream #%d:%d", index, i);
+
+  /* the pid is an important information, so we display it */
+  /* XXX: add a generic system */
+  if (flags & AVFMT_SHOW_IDS)
+    Debug(3, "[0x%x]", st->id);
+  if (lang)
+    Debug(3, "(%s)", lang->value);
+  av_log(NULL, AV_LOG_DEBUG, ", %d, %d/%d", st->codec_info_nb_frames,
+        st->time_base.num, st->time_base.den);
+  Debug(3, ": %s", buf);
+
+  if (st->sample_aspect_ratio.num && // default
+    av_cmp_q(st->sample_aspect_ratio, st->codec->sample_aspect_ratio)) {
+    AVRational display_aspect_ratio;
+    av_reduce(&display_aspect_ratio.num, &display_aspect_ratio.den,
+              st->codec->width  * (int64_t)st->sample_aspect_ratio.num,
+              st->codec->height * (int64_t)st->sample_aspect_ratio.den,
+              1024 * 1024);
+    Debug(3, ", SAR %d:%d DAR %d:%d",
+          st->sample_aspect_ratio.num, st->sample_aspect_ratio.den,
+          display_aspect_ratio.num, display_aspect_ratio.den);
+  }
+
+  if (st->codec->codec_type == AVMEDIA_TYPE_VIDEO) {
+    int fps = st->avg_frame_rate.den && st->avg_frame_rate.num;
+    int tbr = st->r_frame_rate.den && st->r_frame_rate.num;
+    int tbn = st->time_base.den && st->time_base.num;
+    int tbc = st->codec->time_base.den && st->codec->time_base.num;
+
+    if (fps || tbr || tbn || tbc)
+      Debug(3, "%s", separator);
+
+    if (fps)
+      zm_log_fps(av_q2d(st->avg_frame_rate), tbr || tbn || tbc ? "fps, " : "fps");
+    if (tbr)
+      zm_log_fps(av_q2d(st->r_frame_rate), tbn || tbc ? "tbr, " : "tbr");
+    if (tbn)
+      zm_log_fps(1 / av_q2d(st->time_base), tbc ? "tbn, " : "tbn");
+    if (tbc)
+      zm_log_fps(1 / av_q2d(st->codec->time_base), "tbc");
+  }
+
+  if (st->disposition & AV_DISPOSITION_DEFAULT)
+    Debug(3, " (default)");
+  if (st->disposition & AV_DISPOSITION_DUB)
+    Debug(3, " (dub)");
+  if (st->disposition & AV_DISPOSITION_ORIGINAL)
+    Debug(3, " (original)");
+  if (st->disposition & AV_DISPOSITION_COMMENT)
+    Debug(3, " (comment)");
+  if (st->disposition & AV_DISPOSITION_LYRICS)
+    Debug(3, " (lyrics)");
+  if (st->disposition & AV_DISPOSITION_KARAOKE)
+    Debug(3, " (karaoke)");
+  if (st->disposition & AV_DISPOSITION_FORCED)
+    Debug(3, " (forced)");
+  if (st->disposition & AV_DISPOSITION_HEARING_IMPAIRED)
+    Debug(3, " (hearing impaired)");
+  if (st->disposition & AV_DISPOSITION_VISUAL_IMPAIRED)
+    Debug(3, " (visual impaired)");
+  if (st->disposition & AV_DISPOSITION_CLEAN_EFFECTS)
+    Debug(3, " (clean effects)");
+    Debug(3, "\n");
+
+  //dump_metadata(NULL, st->metadata, "    ");
+
+  //dump_sidedata(NULL, st, "    ");
 }
diff --git a/src/zm_ffmpeg.h b/src/zm_ffmpeg.h
index 3ef5dfe66..058de10df 100644
--- a/src/zm_ffmpeg.h
+++ b/src/zm_ffmpeg.h
@@ -40,8 +40,8 @@ extern "C" {
  * b and c the minor and micro versions of libav
  * d and e the minor and micro versions of FFmpeg */
 #define LIBAVUTIL_VERSION_CHECK(a, b, c, d, e) \
-    ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
-      (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+  ( (LIBAVUTIL_VERSION_MICRO <  100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+    (LIBAVUTIL_VERSION_MICRO >= 100 && LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
 #if LIBAVUTIL_VERSION_CHECK(50, 29, 0, 29, 0)
 #include <libavutil/opt.h>
@@ -54,55 +54,55 @@ extern "C" {
 #include <ffmpeg/mathematics.h>
 #include <ffmpeg/opt.h>
 #endif /* HAVE_LIBAVUTIL_AVUTIL_H */
-    
+  
 #if defined(HAVE_LIBAVUTIL_AVUTIL_H) 
 #if LIBAVUTIL_VERSION_CHECK(51, 42, 0, 74, 100)
-    #define _AVPIXELFORMAT AVPixelFormat
+  #define _AVPIXELFORMAT AVPixelFormat
 #else
-    #define _AVPIXELFORMAT PixelFormat
-    #define AV_PIX_FMT_NONE PIX_FMT_NONE
-    #define AV_PIX_FMT_RGB444 PIX_FMT_RGB444
-    #define AV_PIX_FMT_RGB555 PIX_FMT_RGB555
-    #define AV_PIX_FMT_RGB565 PIX_FMT_RGB565
-    #define AV_PIX_FMT_BGR24 PIX_FMT_BGR24
-    #define AV_PIX_FMT_RGB24 PIX_FMT_RGB24
-    #define AV_PIX_FMT_BGRA PIX_FMT_BGRA
-    #define AV_PIX_FMT_ARGB PIX_FMT_ARGB
-    #define AV_PIX_FMT_ABGR PIX_FMT_ABGR
-    #define AV_PIX_FMT_RGBA PIX_FMT_RGBA
-    #define AV_PIX_FMT_GRAY8 PIX_FMT_GRAY8
-    #define AV_PIX_FMT_YUYV422 PIX_FMT_YUYV422
-    #define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P
-    #define AV_PIX_FMT_YUV411P PIX_FMT_YUV411P
-    #define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P
-    #define AV_PIX_FMT_YUV410P PIX_FMT_YUV410P
-    #define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
-    #define AV_PIX_FMT_YUVJ444P PIX_FMT_YUVJ444P
-    #define AV_PIX_FMT_UYVY422 PIX_FMT_UYVY422
-    #define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P
-    #define AV_PIX_FMT_YUVJ422P PIX_FMT_YUVJ422P
-    #define AV_PIX_FMT_UYVY422 PIX_FMT_UYVY422
-    #define AV_PIX_FMT_UYYVYY411 PIX_FMT_UYYVYY411
-    #define AV_PIX_FMT_BGR565 PIX_FMT_BGR565
-    #define AV_PIX_FMT_BGR555 PIX_FMT_BGR555
-    #define AV_PIX_FMT_BGR8 PIX_FMT_BGR8
-    #define AV_PIX_FMT_BGR4 PIX_FMT_BGR4
-    #define AV_PIX_FMT_BGR4_BYTE PIX_FMT_BGR4_BYTE
-    #define AV_PIX_FMT_RGB8 PIX_FMT_RGB8
-    #define AV_PIX_FMT_RGB4 PIX_FMT_RGB4
-    #define AV_PIX_FMT_RGB4_BYTE PIX_FMT_RGB4_BYTE
-    #define AV_PIX_FMT_NV12 PIX_FMT_NV12
-    #define AV_PIX_FMT_NV21 PIX_FMT_NV21
-    #define AV_PIX_FMT_RGB32_1 PIX_FMT_RGB32_1
-    #define AV_PIX_FMT_BGR32_1 PIX_FMT_BGR32_1
-    #define AV_PIX_FMT_GRAY16BE PIX_FMT_GRAY16BE
-    #define AV_PIX_FMT_GRAY16LE PIX_FMT_GRAY16LE
-    #define AV_PIX_FMT_YUV440P PIX_FMT_YUV440P
-    #define AV_PIX_FMT_YUVJ440P PIX_FMT_YUVJ440P
-    #define AV_PIX_FMT_YUVA420P PIX_FMT_YUVA420P
-    //#define AV_PIX_FMT_VDPAU_H264 PIX_FMT_VDPAU_H264
-    //#define AV_PIX_FMT_VDPAU_MPEG1 PIX_FMT_VDPAU_MPEG1
-    //#define AV_PIX_FMT_VDPAU_MPEG2 PIX_FMT_VDPAU_MPEG2
+  #define _AVPIXELFORMAT PixelFormat
+  #define AV_PIX_FMT_NONE PIX_FMT_NONE
+  #define AV_PIX_FMT_RGB444 PIX_FMT_RGB444
+  #define AV_PIX_FMT_RGB555 PIX_FMT_RGB555
+  #define AV_PIX_FMT_RGB565 PIX_FMT_RGB565
+  #define AV_PIX_FMT_BGR24 PIX_FMT_BGR24
+  #define AV_PIX_FMT_RGB24 PIX_FMT_RGB24
+  #define AV_PIX_FMT_BGRA PIX_FMT_BGRA
+  #define AV_PIX_FMT_ARGB PIX_FMT_ARGB
+  #define AV_PIX_FMT_ABGR PIX_FMT_ABGR
+  #define AV_PIX_FMT_RGBA PIX_FMT_RGBA
+  #define AV_PIX_FMT_GRAY8 PIX_FMT_GRAY8
+  #define AV_PIX_FMT_YUYV422 PIX_FMT_YUYV422
+  #define AV_PIX_FMT_YUV422P PIX_FMT_YUV422P
+  #define AV_PIX_FMT_YUV411P PIX_FMT_YUV411P
+  #define AV_PIX_FMT_YUV444P PIX_FMT_YUV444P
+  #define AV_PIX_FMT_YUV410P PIX_FMT_YUV410P
+  #define AV_PIX_FMT_YUV420P PIX_FMT_YUV420P
+  #define AV_PIX_FMT_YUVJ444P PIX_FMT_YUVJ444P
+  #define AV_PIX_FMT_UYVY422 PIX_FMT_UYVY422
+  #define AV_PIX_FMT_YUVJ420P PIX_FMT_YUVJ420P
+  #define AV_PIX_FMT_YUVJ422P PIX_FMT_YUVJ422P
+  #define AV_PIX_FMT_UYVY422 PIX_FMT_UYVY422
+  #define AV_PIX_FMT_UYYVYY411 PIX_FMT_UYYVYY411
+  #define AV_PIX_FMT_BGR565 PIX_FMT_BGR565
+  #define AV_PIX_FMT_BGR555 PIX_FMT_BGR555
+  #define AV_PIX_FMT_BGR8 PIX_FMT_BGR8
+  #define AV_PIX_FMT_BGR4 PIX_FMT_BGR4
+  #define AV_PIX_FMT_BGR4_BYTE PIX_FMT_BGR4_BYTE
+  #define AV_PIX_FMT_RGB8 PIX_FMT_RGB8
+  #define AV_PIX_FMT_RGB4 PIX_FMT_RGB4
+  #define AV_PIX_FMT_RGB4_BYTE PIX_FMT_RGB4_BYTE
+  #define AV_PIX_FMT_NV12 PIX_FMT_NV12
+  #define AV_PIX_FMT_NV21 PIX_FMT_NV21
+  #define AV_PIX_FMT_RGB32_1 PIX_FMT_RGB32_1
+  #define AV_PIX_FMT_BGR32_1 PIX_FMT_BGR32_1
+  #define AV_PIX_FMT_GRAY16BE PIX_FMT_GRAY16BE
+  #define AV_PIX_FMT_GRAY16LE PIX_FMT_GRAY16LE
+  #define AV_PIX_FMT_YUV440P PIX_FMT_YUV440P
+  #define AV_PIX_FMT_YUVJ440P PIX_FMT_YUVJ440P
+  #define AV_PIX_FMT_YUVA420P PIX_FMT_YUVA420P
+  //#define AV_PIX_FMT_VDPAU_H264 PIX_FMT_VDPAU_H264
+  //#define AV_PIX_FMT_VDPAU_MPEG1 PIX_FMT_VDPAU_MPEG1
+  //#define AV_PIX_FMT_VDPAU_MPEG2 PIX_FMT_VDPAU_MPEG2
 #endif
 #endif /* HAVE_LIBAVUTIL_AVUTIL_H */
 
@@ -117,8 +117,8 @@ extern "C" {
  * b and c the minor and micro versions of libav
  * d and e the minor and micro versions of FFmpeg */
 #define LIBAVCODEC_VERSION_CHECK(a, b, c, d, e) \
-    ( (LIBAVCODEC_VERSION_MICRO <  100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
-      (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+  ( (LIBAVCODEC_VERSION_MICRO <  100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+    (LIBAVCODEC_VERSION_MICRO >= 100 && LIBAVCODEC_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
 #elif HAVE_FFMPEG_AVCODEC_H
 #include <ffmpeg/avcodec.h>
@@ -126,9 +126,9 @@ extern "C" {
 
 #if defined(HAVE_LIBAVCODEC_AVCODEC_H)
 #if LIBAVCODEC_VERSION_CHECK(54, 25, 0, 51, 100)
-    #define _AVCODECID AVCodecID
+  #define _AVCODECID AVCodecID
 #else
-    #define _AVCODECID CodecID
+  #define _AVCODECID CodecID
 #endif
 #endif /* HAVE_LIBAVCODEC_AVCODEC_H */
 
@@ -142,8 +142,8 @@ extern "C" {
  * b and c the minor and micro versions of libav
  * d and e the minor and micro versions of FFmpeg */
 #define LIBAVFORMAT_VERSION_CHECK(a, b, c, d, e) \
-    ( (LIBAVFORMAT_VERSION_MICRO <  100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
-      (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+  ( (LIBAVFORMAT_VERSION_MICRO <  100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+    (LIBAVFORMAT_VERSION_MICRO >= 100 && LIBAVFORMAT_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
 #elif HAVE_FFMPEG_AVFORMAT_H
 #include <ffmpeg/avformat.h>
@@ -158,8 +158,8 @@ extern "C" {
  * b and c the minor and micro versions of libav
  * d and e the minor and micro versions of FFmpeg */
 #define LIBAVDEVICE_VERSION_CHECK(a, b, c, d, e) \
-    ( (LIBAVDEVICE_VERSION_MICRO <  100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
-      (LIBAVDEVICE_VERSION_MICRO >= 100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+  ( (LIBAVDEVICE_VERSION_MICRO <  100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+    (LIBAVDEVICE_VERSION_MICRO >= 100 && LIBAVDEVICE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
 #elif HAVE_FFMPEG_AVDEVICE_H
 #include <ffmpeg/avdevice.h>
@@ -174,8 +174,8 @@ extern "C" {
  * b and c the minor and micro versions of libav
  * d and e the minor and micro versions of FFmpeg */
 #define LIBSWSCALE_VERSION_CHECK(a, b, c, d, e) \
-    ( (LIBSWSCALE_VERSION_MICRO <  100 && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
-      (LIBSWSCALE_VERSION_MICRO >= 100 && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
+  ( (LIBSWSCALE_VERSION_MICRO <  100 && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(a, b, c) ) || \
+    (LIBSWSCALE_VERSION_MICRO >= 100 && LIBSWSCALE_VERSION_INT >= AV_VERSION_INT(a, d, e) ) )
 
 #elif HAVE_FFMPEG_SWSCALE_H
 #include <ffmpeg/swscale.h>
@@ -207,23 +207,23 @@ enum _AVPIXELFORMAT GetFFMPEGPixelFormat(unsigned int p_colours, unsigned p_subp
 #if HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 class SWScale {
 public:
-	SWScale();
-	~SWScale();
-	int SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
-	int ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size);
-	int ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size);
-	int Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
-	int Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
+  SWScale();
+  ~SWScale();
+  int SetDefaults(enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
+  int ConvertDefaults(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size);
+  int ConvertDefaults(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size);
+  int Convert(const Image* img, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
+  int Convert(const uint8_t* in_buffer, const size_t in_buffer_size, uint8_t* out_buffer, const size_t out_buffer_size, enum _AVPIXELFORMAT in_pf, enum _AVPIXELFORMAT out_pf, unsigned int width, unsigned int height);
 
 protected:
-	bool gotdefaults;
-	struct SwsContext* swscale_ctx;
-	AVFrame* input_avframe;
-	AVFrame* output_avframe;
-	enum _AVPIXELFORMAT default_input_pf;
-	enum _AVPIXELFORMAT default_output_pf;
-	unsigned int default_width;
-	unsigned int default_height;
+  bool gotdefaults;
+  struct SwsContext* swscale_ctx;
+  AVFrame* input_avframe;
+  AVFrame* output_avframe;
+  enum _AVPIXELFORMAT default_input_pf;
+  enum _AVPIXELFORMAT default_output_pf;
+  unsigned int default_width;
+  unsigned int default_height;
 };
 #endif // HAVE_LIBSWSCALE && HAVE_LIBAVUTIL
 
@@ -260,21 +260,21 @@ protected:
  */
 #ifdef  __cplusplus
 
-    inline static const std::string av_make_error_string(int errnum)
-    {
-        char errbuf[AV_ERROR_MAX_STRING_SIZE];
+  inline static const std::string av_make_error_string(int errnum)
+  {
+    char errbuf[AV_ERROR_MAX_STRING_SIZE];
 #if LIBAVUTIL_VERSION_CHECK(50, 13, 0, 13, 0)
-        av_strerror(errnum, errbuf, AV_ERROR_MAX_STRING_SIZE);
+    av_strerror(errnum, errbuf, AV_ERROR_MAX_STRING_SIZE);
 #else
-		snprintf(errbuf, AV_ERROR_MAX_STRING_SIZE, "libav error %d", errnum);
+    snprintf(errbuf, AV_ERROR_MAX_STRING_SIZE, "libav error %d", errnum);
 #endif
-        return (std::string)errbuf;
-    }
+    return (std::string)errbuf;
+  }
 
-    #undef av_err2str
-    #define av_err2str(errnum) av_make_error_string(errnum).c_str()
+  #undef av_err2str
+  #define av_err2str(errnum) av_make_error_string(errnum).c_str()
 
-    #endif // __cplusplus
+  #endif // __cplusplus
 
 
 #endif // ( HAVE_LIBAVUTIL_AVUTIL_H || HAVE_LIBAVCODEC_AVCODEC_H || HAVE_LIBAVFORMAT_AVFORMAT_H || HAVE_LIBAVDEVICE_AVDEVICE_H )
@@ -309,4 +309,6 @@ static av_always_inline av_const int64_t av_clip64_c(int64_t a, int64_t amin, in
 #define av_clip64        av_clip64_c
 #endif
 
+void zm_dump_stream_format(AVFormatContext *ic, int i, int index, int is_output);
+
 #endif // ZM_FFMPEG_H
diff --git a/src/zm_ffmpeg_camera.cpp b/src/zm_ffmpeg_camera.cpp
old mode 100755
new mode 100644
index ea82ee15c..062796a19
--- a/src/zm_ffmpeg_camera.cpp
+++ b/src/zm_ffmpeg_camera.cpp
@@ -23,8 +23,7 @@
 
 #include "zm_ffmpeg_camera.h"
 
-
-extern "C" {
+extern "C"{
 #include "libavutil/time.h"
 }
 #ifndef AV_ERROR_MAX_STRING_SIZE
@@ -32,20 +31,22 @@ extern "C" {
 #endif
 
 #ifdef SOLARIS
-#include <sys/errno.h> // for ESRCH
+#include <sys/errno.h>  // for ESRCH
 #include <signal.h>
 #include <pthread.h>
 #endif
 
-FfmpegCamera::FfmpegCamera(int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture) :
-  Camera(p_id, FFMPEG_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture),
-  mPath(p_path),
-  mMethod(p_method),
-  mOptions(p_options) {
-  if (capture) {
+FfmpegCamera::FfmpegCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+  Camera( p_id, FFMPEG_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+  mPath( p_path ),
+  mMethod( p_method ),
+  mOptions( p_options )
+{
+  if ( capture )
+  {
     Initialise();
   }
-
+  
   mFormatContext = NULL;
   mVideoStreamId = -1;
   mAudioStreamId = -1;
@@ -54,101 +55,111 @@ FfmpegCamera::FfmpegCamera(int p_id, const std::string &p_path, const std::strin
   mRawFrame = NULL;
   mFrame = NULL;
   frameCount = 0;
-  startTime = 0;
+  startTime=0;
   mIsOpening = false;
   mCanCapture = false;
   mOpenStart = 0;
   mReopenThread = 0;
   wasRecording = false;
-
-#if HAVE_LIBSWSCALE    
+  videoStore = NULL;
+  
+#if HAVE_LIBSWSCALE  
   mConvertContext = NULL;
 #endif
   /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
-  if (colours == ZM_COLOUR_RGB32) {
+  if(colours == ZM_COLOUR_RGB32) {
     subpixelorder = ZM_SUBPIX_ORDER_RGBA;
     imagePixFormat = AV_PIX_FMT_RGBA;
-  } else if (colours == ZM_COLOUR_RGB24) {
+  } else if(colours == ZM_COLOUR_RGB24) {
     subpixelorder = ZM_SUBPIX_ORDER_RGB;
     imagePixFormat = AV_PIX_FMT_RGB24;
-  } else if (colours == ZM_COLOUR_GRAY8) {
+  } else if(colours == ZM_COLOUR_GRAY8) {
     subpixelorder = ZM_SUBPIX_ORDER_NONE;
     imagePixFormat = AV_PIX_FMT_GRAY8;
   } else {
-    Panic("Unexpected colours: %d", colours);
+    Panic("Unexpected colours: %d",colours);
   }
-
+  
 }
 
-FfmpegCamera::~FfmpegCamera() {
+FfmpegCamera::~FfmpegCamera()
+{
   CloseFfmpeg();
 
-  if (capture) {
+  if ( capture )
+  {
     Terminate();
   }
 }
 
-void FfmpegCamera::Initialise() {
-  if (logDebugging())
-    av_log_set_level(AV_LOG_DEBUG);
+void FfmpegCamera::Initialise()
+{
+  if ( logDebugging() )
+    av_log_set_level( AV_LOG_DEBUG ); 
   else
-    av_log_set_level(AV_LOG_QUIET);
+    av_log_set_level( AV_LOG_QUIET ); 
 
   av_register_all();
 }
 
-void FfmpegCamera::Terminate() {
+void FfmpegCamera::Terminate()
+{
 }
 
-int FfmpegCamera::PrimeCapture() {
+int FfmpegCamera::PrimeCapture()
+{
   mVideoStreamId = -1;
   mAudioStreamId = -1;
-  Info("Priming capture from %s", mPath.c_str());
+  Info( "Priming capture from %s", mPath.c_str() );
 
-  if (OpenFfmpeg() != 0) {
+  if (OpenFfmpeg() != 0){
     ReopenFfmpeg();
   }
   return 0;
 }
 
-int FfmpegCamera::PreCapture() {
+int FfmpegCamera::PreCapture()
+{
   // Nothing to do here
-  return ( 0);
+  return( 0 );
 }
 
-int FfmpegCamera::Capture(Image &image) {
-  if (!mCanCapture) {
+int FfmpegCamera::Capture( Image &image )
+{
+  if (!mCanCapture){
     return -1;
   }
-
+  
   // If the reopen thread has a value, but mCanCapture != 0, then we have just reopened the connection to the ffmpeg device, and we can clean up the thread.
   if (mReopenThread != 0) {
     void *retval = 0;
     int ret;
-
+    
     ret = pthread_join(mReopenThread, &retval);
-    if (ret != 0) {
+    if (ret != 0){
       Error("Could not join reopen thread.");
     }
-
-    Info("Successfully reopened stream.");
+    
+    Info( "Successfully reopened stream." );
     mReopenThread = 0;
   }
 
   AVPacket packet;
   uint8_t* directbuffer;
-
+   
   /* Request a writeable buffer of the target image */
   directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-  if (directbuffer == NULL) {
+  if(directbuffer == NULL) {
     Error("Failed requesting writeable buffer for the captured image.");
     return (-1);
   }
-
+  
   int frameComplete = false;
-  while (!frameComplete) {
-    int avResult = av_read_frame(mFormatContext, &packet);
-    if (avResult < 0) {
+  while ( !frameComplete )
+  {
+    int avResult = av_read_frame( mFormatContext, &packet );
+    if ( avResult < 0 )
+    {
       char errbuf[AV_ERROR_MAX_STRING_SIZE];
       av_strerror(avResult, errbuf, AV_ERROR_MAX_STRING_SIZE);
       if (
@@ -156,182 +167,212 @@ int FfmpegCamera::Capture(Image &image) {
         (avResult == AVERROR_EOF || (mFormatContext->pb && mFormatContext->pb->eof_reached)) ||
         // Check for Connection failure.
         (avResult == -110)
-        ) {
-        Info("av_read_frame returned \"%s\". Reopening stream.", errbuf);
+      )
+      {
+        Info( "av_read_frame returned \"%s\". Reopening stream.", errbuf);
         ReopenFfmpeg();
       }
 
-      Error("Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, errbuf);
-      return ( -1);
+      Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, errbuf );
+      return( -1 );
     }
-    Debug(5, "Got packet from stream %d", packet.stream_index);
-    if (packet.stream_index == mVideoStreamId) {
+    Debug( 5, "Got packet from stream %d", packet.stream_index );
+    // What about audio stream? Maybe someday we could do sound detection...
+    if ( packet.stream_index == mVideoStreamId )
+    {
 #if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-      if (avcodec_decode_video2(mCodecContext, mRawFrame, &frameComplete, &packet) < 0)
+      if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
 #else
-      if (avcodec_decode_video(mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size) < 0)
+      if ( avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size ) < 0 )
 #endif
-        Fatal("Unable to decode frame at frame %d", frameCount);
+        Fatal( "Unable to decode frame at frame %d", frameCount );
 
-      Debug(4, "Decoded video packet at frame %d", frameCount);
+      Debug( 4, "Decoded video packet at frame %d", frameCount );
 
-      if (frameComplete) {
-        Debug(3, "Got frame %d", frameCount);
-
-        avpicture_fill((AVPicture *) mFrame, directbuffer, imagePixFormat, width, height);
+      if ( frameComplete )
+      {
+        Debug( 3, "Got frame %d", frameCount );
 
+    avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);
+    
 #if HAVE_LIBSWSCALE
-        if (mConvertContext == NULL) {
-          mConvertContext = sws_getContext(mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL);
+    if(mConvertContext == NULL) {
+      mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
 
-          if (mConvertContext == NULL)
-            Fatal("Unable to create conversion context for %s", mPath.c_str());
-        }
-
-        if (sws_scale(mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize) < 0)
-          Fatal("Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount);
-#else // HAVE_LIBSWSCALE
-        Fatal("You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras");
-#endif // HAVE_LIBSWSCALE
-
-        frameCount++;
-      }
+      if(mConvertContext == NULL)
+        Fatal( "Unable to create conversion context for %s", mPath.c_str() );
     }
+  
+    if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
+      Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
+#else // HAVE_LIBSWSCALE
+    Fatal( "You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras" );
+#endif // HAVE_LIBSWSCALE
+ 
+        frameCount++;
+            } // end if frameComplete
+        } else {
+          Debug( 4, "Different stream_index %d", packet.stream_index );
+        } // end if packet.stream_index == mVideoStreamId
 #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
-    av_packet_unref(&packet);
+    av_packet_unref( &packet);
 #else
-    av_free_packet(&packet);
+    av_free_packet( &packet );
 #endif
-  }
+  } // end while ! frameComplete
   return (0);
-}
+} // FfmpegCamera::Capture
 
-int FfmpegCamera::PostCapture() {
+int FfmpegCamera::PostCapture()
+{
   // Nothing to do here
-  return ( 0);
+  return( 0 );
 }
 
 int FfmpegCamera::OpenFfmpeg() {
 
-  Debug(2, "OpenFfmpeg called.");
+  Debug ( 2, "OpenFfmpeg called." );
 
   mOpenStart = time(NULL);
   mIsOpening = true;
 
   // Open the input, not necessarily a file
 #if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
-  Debug(1, "Calling av_open_input_file");
-  if (av_open_input_file(&mFormatContext, mPath.c_str(), NULL, 0, NULL) != 0)
+  Debug ( 1, "Calling av_open_input_file" );
+  if ( av_open_input_file( &mFormatContext, mPath.c_str(), NULL, 0, NULL ) !=0 )
 #else
   // Handle options
   AVDictionary *opts = 0;
   StringVector opVect = split(Options(), ",");
-
+  
   // Set transport method as specified by method field, rtpUni is default
-  if (Method() == "rtpMulti")
+  if ( Method() == "rtpMulti" )
     opVect.push_back("rtsp_transport=udp_multicast");
-  else if (Method() == "rtpRtsp")
+  else if ( Method() == "rtpRtsp" )
     opVect.push_back("rtsp_transport=tcp");
-  else if (Method() == "rtpRtspHttp")
+  else if ( Method() == "rtpRtspHttp" )
     opVect.push_back("rtsp_transport=http");
-
-  Debug(2, "Number of Options: %d", opVect.size());
-  for (size_t i = 0; i < opVect.size(); i++) {
-    StringVector parts = split(opVect[i], "=");
+  
+    Debug(2, "Number of Options: %d",opVect.size());
+  for (size_t i=0; i<opVect.size(); i++)
+  {
+    StringVector parts = split(opVect[i],"=");
     if (parts.size() > 1) {
       parts[0] = trimSpaces(parts[0]);
       parts[1] = trimSpaces(parts[1]);
-      if (av_dict_set(&opts, parts[0].c_str(), parts[1].c_str(), 0) == 0) {
-        Debug(2, "set option %d '%s' to '%s'", i, parts[0].c_str(), parts[1].c_str());
-      } else {
-        Warning("Error trying to set option %d '%s' to '%s'", i, parts[0].c_str(), parts[1].c_str());
+      if ( av_dict_set(&opts, parts[0].c_str(), parts[1].c_str(), 0) == 0 ) {
+        Debug(2, "set option %d '%s' to '%s'", i,  parts[0].c_str(), parts[1].c_str());
       }
-
+      else
+      {
+        Warning( "Error trying to set option %d '%s' to '%s'", i, parts[0].c_str(), parts[1].c_str() );
+      }
+        
     }
+     else
+     {
+       Warning( "Unable to parse ffmpeg option %d '%s', expecting key=value", i, opVect[i].c_str() );
+     }
   }
-  Debug(1, "Calling avformat_open_input");
+  Debug ( 1, "Calling avformat_open_input" );
 
-  mFormatContext = avformat_alloc_context();
+  mFormatContext = avformat_alloc_context( );
   mFormatContext->interrupt_callback.callback = FfmpegInterruptCallback;
   mFormatContext->interrupt_callback.opaque = this;
 
-  if (avformat_open_input(&mFormatContext, mPath.c_str(), NULL, &opts) != 0)
+  if ( avformat_open_input( &mFormatContext, mPath.c_str(), NULL, &opts ) !=0 )
 #endif
   {
     mIsOpening = false;
-    Error("Unable to open input %s due to: %s", mPath.c_str(), strerror(errno));
+    Error( "Unable to open input %s due to: %s", mPath.c_str(), strerror(errno) );
     return -1;
   }
 
+  AVDictionaryEntry *e;
+  if ((e = av_dict_get(opts, "", NULL, AV_DICT_IGNORE_SUFFIX)) != NULL) {
+    Warning( "Option %s not recognized by ffmpeg", e->key);
+  }
+
   mIsOpening = false;
-  Debug(1, "Opened input");
-
-  Info("Stream open %s", mPath.c_str());
-  startTime = av_gettime(); //FIXME here or after find_Stream_info
+  Debug ( 1, "Opened input" );
 
+  Info( "Stream open %s", mPath.c_str() );
+  startTime=av_gettime();//FIXME here or after find_Stream_info
+  
   //FIXME can speed up initial analysis but need sensible parameters...
   //mFormatContext->probesize = 32;
   //mFormatContext->max_analyze_duration = 32;
   // Locate stream info from avformat_open_input
 #if !LIBAVFORMAT_VERSION_CHECK(53, 6, 0, 6, 0)
-  Debug(1, "Calling av_find_stream_info");
-  if (av_find_stream_info(mFormatContext) < 0)
+  Debug ( 1, "Calling av_find_stream_info" );
+  if ( av_find_stream_info( mFormatContext ) < 0 )
 #else
-  Debug(1, "Calling avformat_find_stream_info");
-  if (avformat_find_stream_info(mFormatContext, 0) < 0)
+  Debug ( 1, "Calling avformat_find_stream_info" );
+  if ( avformat_find_stream_info( mFormatContext, 0 ) < 0 )
 #endif
-    Fatal("Unable to find stream info from %s due to: %s", mPath.c_str(), strerror(errno));
+    Fatal( "Unable to find stream info from %s due to: %s", mPath.c_str(), strerror(errno) );
 
-  Debug(1, "Got stream info");
+  Debug ( 1, "Got stream info" );
 
   // Find first video stream present
   mVideoStreamId = -1;
-  for (unsigned int i = 0; i < mFormatContext->nb_streams; i++) {
+  mAudioStreamId = -1;
+  for (unsigned int i=0; i < mFormatContext->nb_streams; i++ )
+  {
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-    if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO)
+    if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
-    if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO)
+    if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
 #endif
     {
-      mVideoStreamId = i;
-      break;
-    }
-    if (mAudioStreamId == -1) //FIXME best way to copy all other streams?
-    {
-#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-      if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
-#else
-      if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-#endif
-      {
-        mAudioStreamId = i;
+      if ( mVideoStreamId == -1 ) {
+        mVideoStreamId = i;
+        // if we break, then we won't find the audio stream
+        continue;
+      } else {
+        Debug(2, "Have another video stream." );
       }
     }
-  }
-  if (mVideoStreamId == -1)
-    Fatal("Unable to locate video stream in %s", mPath.c_str());
+#if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
+    if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO )
+#else
+    if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO )
+#endif
+    {
+      if ( mAudioStreamId == -1 ) {
+        mAudioStreamId = i;
+      } else {
+        Debug(2, "Have another audio stream." );
+      }
 
-  Debug(1, "Found video stream");
+    }
+  }
+  if ( mVideoStreamId == -1 )
+    Fatal( "Unable to locate video stream in %s", mPath.c_str() );
+  if ( mAudioStreamId == -1 )
+    Debug( 3, "Unable to locate audio stream in %s", mPath.c_str() );
+
+  Debug ( 1, "Found video stream" );
 
   mCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
 
   // Try and get the codec from the codec context
-  if ((mCodec = avcodec_find_decoder(mCodecContext->codec_id)) == NULL)
-    Fatal("Can't find codec for video stream from %s", mPath.c_str());
+  if ( (mCodec = avcodec_find_decoder( mCodecContext->codec_id )) == NULL )
+    Fatal( "Can't find codec for video stream from %s", mPath.c_str() );
 
-  Debug(1, "Found decoder");
+  Debug ( 1, "Found decoder" );
 
   // Open the codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-  Debug(1, "Calling avcodec_open");
-  if (avcodec_open(mCodecContext, mCodec) < 0)
+  Debug ( 1, "Calling avcodec_open" );
+  if ( avcodec_open( mCodecContext, mCodec ) < 0 )
 #else
-  Debug(1, "Calling avcodec_open2");
-  if (avcodec_open2(mCodecContext, mCodec, 0) < 0)
+  Debug ( 1, "Calling avcodec_open2" );
+  if ( avcodec_open2( mCodecContext, mCodec, 0 ) < 0 )
 #endif
-    Fatal("Unable to open codec for video stream from %s", mPath.c_str());
+    Fatal( "Unable to open codec for video stream from %s", mPath.c_str() );
 
-  Debug(1, "Opened codec");
+  Debug ( 1, "Opened codec" );
 
   // Allocate space for the native video frame
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
@@ -347,30 +388,30 @@ int FfmpegCamera::OpenFfmpeg() {
   mFrame = avcodec_alloc_frame();
 #endif
 
-  if (mRawFrame == NULL || mFrame == NULL)
-    Fatal("Unable to allocate frame for %s", mPath.c_str());
+  if(mRawFrame == NULL || mFrame == NULL)
+    Fatal( "Unable to allocate frame for %s", mPath.c_str() );
 
-  Debug(1, "Allocated frames");
-
-  int pSize = avpicture_get_size(imagePixFormat, width, height);
-  if ((unsigned int) pSize != imagesize) {
-    Fatal("Image size mismatch. Required: %d Available: %d", pSize, imagesize);
+  Debug ( 1, "Allocated frames" );
+  
+  int pSize = avpicture_get_size( imagePixFormat, width, height );
+  if( (unsigned int)pSize != imagesize) {
+    Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
   }
 
-  Debug(1, "Validated imagesize");
-
+  Debug ( 1, "Validated imagesize" );
+  
 #if HAVE_LIBSWSCALE
-  Debug(1, "Calling sws_isSupportedInput");
-  if (!sws_isSupportedInput(mCodecContext->pix_fmt)) {
-    Fatal("swscale does not support the codec format: %c%c%c%c", (mCodecContext->pix_fmt)&0xff, ((mCodecContext->pix_fmt >> 8)&0xff), ((mCodecContext->pix_fmt >> 16)&0xff), ((mCodecContext->pix_fmt >> 24)&0xff));
+  Debug ( 1, "Calling sws_isSupportedInput" );
+  if(!sws_isSupportedInput(mCodecContext->pix_fmt)) {
+    Fatal("swscale does not support the codec format: %c%c%c%c",(mCodecContext->pix_fmt)&0xff,((mCodecContext->pix_fmt>>8)&0xff),((mCodecContext->pix_fmt>>16)&0xff),((mCodecContext->pix_fmt>>24)&0xff));
   }
-
-  if (!sws_isSupportedOutput(imagePixFormat)) {
-    Fatal("swscale does not support the target format: %c%c%c%c", (imagePixFormat)&0xff, ((imagePixFormat >> 8)&0xff), ((imagePixFormat >> 16)&0xff), ((imagePixFormat >> 24)&0xff));
+  
+  if(!sws_isSupportedOutput(imagePixFormat)) {
+    Fatal("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
   }
-
+  
 #else // HAVE_LIBSWSCALE
-  Fatal("You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras");
+  Fatal( "You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras" );
 #endif // HAVE_LIBSWSCALE
 
   mCanCapture = true;
@@ -383,44 +424,47 @@ int FfmpegCamera::ReopenFfmpeg() {
   Debug(2, "ReopenFfmpeg called.");
 
   mCanCapture = false;
-  if (pthread_create(&mReopenThread, NULL, ReopenFfmpegThreadCallback, (void*) this) != 0) {
+  if (pthread_create( &mReopenThread, NULL, ReopenFfmpegThreadCallback, (void*) this) != 0){
     // Log a fatal error and exit the process.
-    Fatal("ReopenFfmpeg failed to create worker thread.");
+    Fatal( "ReopenFfmpeg failed to create worker thread." );
   }
 
   return 0;
 }
 
-int FfmpegCamera::CloseFfmpeg() {
+int FfmpegCamera::CloseFfmpeg(){
 
   Debug(2, "CloseFfmpeg called.");
 
   mCanCapture = false;
 
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-  av_frame_free(&mFrame);
-  av_frame_free(&mRawFrame);
+  av_frame_free( &mFrame );
+  av_frame_free( &mRawFrame );
 #else
-  av_freep(&mFrame);
-  av_freep(&mRawFrame);
+  av_freep( &mFrame );
+  av_freep( &mRawFrame );
 #endif
-
+  
 #if HAVE_LIBSWSCALE
-  if (mConvertContext) {
-    sws_freeContext(mConvertContext);
+  if ( mConvertContext )
+  {
+    sws_freeContext( mConvertContext );
     mConvertContext = NULL;
   }
 #endif
 
-  if (mCodecContext) {
-    avcodec_close(mCodecContext);
-    mCodecContext = NULL; // Freed by av_close_input_file
+  if ( mCodecContext )
+  {
+     avcodec_close( mCodecContext );
+     mCodecContext = NULL; // Freed by av_close_input_file
   }
-  if (mFormatContext) {
+  if ( mFormatContext )
+  {
 #if !LIBAVFORMAT_VERSION_CHECK(53, 17, 0, 25, 0)
-    av_close_input_file(mFormatContext);
+    av_close_input_file( mFormatContext );
 #else
-    avformat_close_input(&mFormatContext);
+    avformat_close_input( &mFormatContext );
 #endif
     mFormatContext = NULL;
   }
@@ -428,12 +472,13 @@ int FfmpegCamera::CloseFfmpeg() {
   return 0;
 }
 
-int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
-  FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*> (ctx);
-  if (camera->mIsOpening) {
+int FfmpegCamera::FfmpegInterruptCallback(void *ctx) 
+{ 
+  FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*>(ctx);
+  if (camera->mIsOpening){
     int now = time(NULL);
     if ((now - camera->mOpenStart) > config.ffmpeg_open_timeout) {
-      Error("Open video took more than %d seconds.", config.ffmpeg_open_timeout);
+      Error ( "Open video took more than %d seconds.", config.ffmpeg_open_timeout );
       return 1;
     }
   }
@@ -441,47 +486,46 @@ int FfmpegCamera::FfmpegInterruptCallback(void *ctx) {
   return 0;
 }
 
-void *FfmpegCamera::ReopenFfmpegThreadCallback(void *ctx) {
+void *FfmpegCamera::ReopenFfmpegThreadCallback(void *ctx){
   if (ctx == NULL) return NULL;
 
-  FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*> (ctx);
+  FfmpegCamera* camera = reinterpret_cast<FfmpegCamera*>(ctx);
 
-  while (1) {
+  while (1){
     // Close current stream.
     camera->CloseFfmpeg();
 
     // Sleep if necessary to not reconnect too fast.
     int wait = config.ffmpeg_open_timeout - (time(NULL) - camera->mOpenStart);
     wait = wait < 0 ? 0 : wait;
-    if (wait > 0) {
-      Debug(1, "Sleeping %d seconds before reopening stream.", wait);
+    if (wait > 0){
+      Debug( 1, "Sleeping %d seconds before reopening stream.", wait );
       sleep(wait);
     }
 
-    if (camera->OpenFfmpeg() == 0) {
+    if (camera->OpenFfmpeg() == 0){
       return NULL;
     }
   }
 }
 
 //Function to handle capture and store
-
-int FfmpegCamera::CaptureAndRecord(Image &image, bool recording, char* event_file) {
-  if (!mCanCapture) {
+int FfmpegCamera::CaptureAndRecord( Image &image, bool recording, char* event_file ){
+  if (!mCanCapture){
     return -1;
   }
-
+  
   // If the reopen thread has a value, but mCanCapture != 0, then we have just reopened the connection to the ffmpeg device, and we can clean up the thread.
   if (mReopenThread != 0) {
     void *retval = 0;
     int ret;
-
+    
     ret = pthread_join(mReopenThread, &retval);
-    if (ret != 0) {
+    if (ret != 0){
       Error("Could not join reopen thread.");
     }
-
-    Info("Successfully reopened stream.");
+    
+    Info( "Successfully reopened stream." );
     mReopenThread = 0;
   }
 
@@ -492,45 +536,50 @@ int FfmpegCamera::CaptureAndRecord(Image &image, bool recording, char* event_fil
 
   /* Request a writeable buffer of the target image */
   directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-  if (directbuffer == NULL) {
+  if( directbuffer == NULL ) {
     Error("Failed requesting writeable buffer for the captured image.");
     return (-1);
   }
+  
+  if ( mCodecContext->codec_id != AV_CODEC_ID_H264 ) {
+    Error( "Input stream is not h264.  The stored event file may not be viewable in browser." );
+  }
 
   int frameComplete = false;
-  while (!frameComplete) {
-    int avResult = av_read_frame(mFormatContext, &packet);
-    if (avResult < 0) {
+  while ( !frameComplete ) {
+    int avResult = av_read_frame( mFormatContext, &packet );
+    if ( avResult < 0 ) {
       char errbuf[AV_ERROR_MAX_STRING_SIZE];
       av_strerror(avResult, errbuf, AV_ERROR_MAX_STRING_SIZE);
       if (
-        // Check if EOF.
-        (avResult == AVERROR_EOF || (mFormatContext->pb && mFormatContext->pb->eof_reached)) ||
-        // Check for Connection failure.
-        (avResult == -110)
-        ) {
-        Info("av_read_frame returned \"%s\". Reopening stream.", errbuf);
-        ReopenFfmpeg();
+          // Check if EOF.
+          (avResult == AVERROR_EOF || (mFormatContext->pb && mFormatContext->pb->eof_reached)) ||
+          // Check for Connection failure.
+          (avResult == -110)
+      ) {
+          Info( "av_read_frame returned \"%s\". Reopening stream.", errbuf);
+          ReopenFfmpeg();
       }
 
-      Error("Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, errbuf);
-      return ( -1);
+      Error( "Unable to read packet from stream %d: error %d \"%s\".", packet.stream_index, avResult, errbuf );
+      return( -1 );
     }
-    Debug(5, "Got packet from stream %d", packet.stream_index);
-    if (packet.stream_index == mVideoStreamId) {
+    Debug( 5, "Got packet from stream %d", packet.stream_index );
+    if ( packet.stream_index == mVideoStreamId ) {
 #if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-      if (avcodec_decode_video2(mCodecContext, mRawFrame, &frameComplete, &packet) < 0)
+      if ( avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet ) < 0 )
 #else
-      if (avcodec_decode_video(mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size) < 0)
+      if ( avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size ) < 0 )
 #endif
-        Fatal("Unable to decode frame at frame %d", frameCount);
+        Fatal( "Unable to decode frame at frame %d", frameCount );
 
-      Debug(4, "Decoded video packet at frame %d", frameCount);
+        Debug( 4, "Decoded video packet at frame %d", frameCount );
 
-      if (frameComplete) {
-        Debug(3, "Got frame %d", frameCount);
+        if ( frameComplete ) {
+          Debug( 3, "Got frame %d", frameCount );
+          
+          avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);
 
-        avpicture_fill((AVPicture *) mFrame, directbuffer, imagePixFormat, width, height);
 
         //Buffer video packets
         if (!recording) { 
@@ -569,48 +618,51 @@ int FfmpegCamera::CaptureAndRecord(Image &image, bool recording, char* event_fil
             videoStore = NULL;
           }
 
-          videoStore = new VideoStore((const char *) event_file, "mp4", mFormatContext->streams[mVideoStreamId], mAudioStreamId == -1 ? NULL : mFormatContext->streams[mAudioStreamId], startTime);
-          strcpy(oldDirectory, event_file);
-        }
-
-        if (videoStore && recording) {
-          //Write the packet to our video store
-          int ret = videoStore->writeVideoFramePacket(&packet, mFormatContext->streams[mVideoStreamId]); //, &lastKeyframePkt);
-          if (ret < 0) {//Less than zero and we skipped a frame
-            av_free_packet(&packet);
-            return 0;
+            videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
+            strcpy(oldDirectory, event_file);
           }
-        }
-
+          
+          if ( videoStore && recording ) {
+            //Write the packet to our video store
+            int ret = videoStore->writeVideoFramePacket(&packet, mFormatContext->streams[mVideoStreamId]);//, &lastKeyframePkt);
+            if(ret<0){//Less than zero and we skipped a frame
+              av_free_packet( &packet );
+              return 0;
+            }
+          }
+                
 #if HAVE_LIBSWSCALE
-        if (mConvertContext == NULL) {
-          mConvertContext = sws_getContext(mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL);
-          if (mConvertContext == NULL)
-            Fatal("Unable to create conversion context for %s", mPath.c_str());
-        }
+          if ( mConvertContext == NULL ) {
+            mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
+            if ( mConvertContext == NULL )
+              Fatal( "Unable to create conversion context for %s", mPath.c_str() );
+          }
 
-        if (sws_scale(mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize) < 0)
-          Fatal("Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount);
+          if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
+            Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
 #else // HAVE_LIBSWSCALE
-        Fatal("You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras");
+          Fatal( "You must compile ffmpeg with the --enable-swscale option to use ffmpeg cameras" );
 #endif // HAVE_LIBSWSCALE
 
-        frameCount++;
-      }
-    } else if (packet.stream_index == mAudioStreamId) {//FIXME best way to copy all other streams
-      if (videoStore && recording) {
-        //Write the packet to our video store
-        int ret = videoStore->writeAudioFramePacket(&packet, mFormatContext->streams[packet.stream_index]); //FIXME no relevance of last key frame
-        if (ret < 0) {//Less than zero and we skipped a frame
-          av_free_packet(&packet);
-          return 0;
+          frameCount++;
+        } // end if frameComplete
+      } else if ( packet.stream_index == mAudioStreamId ) { //FIXME best way to copy all other streams
+        if ( videoStore && recording ) {
+          if ( record_audio ) {
+            Debug(4, "Recording audio packet" );
+            //Write the packet to our video store
+            int ret = videoStore->writeAudioFramePacket(&packet, mFormatContext->streams[packet.stream_index]); //FIXME no relevance of last key frame
+            if ( ret < 0 ) {//Less than zero and we skipped a frame
+              av_free_packet( &packet );
+            return 0;      
+            }
+          } else {
+            Debug(4, "Not recording audio packet" );
+          }
         }
       }
-    }
-    av_free_packet(&packet);
-  }
-  return (frameCount);
+      av_free_packet( &packet );
+    } // end while ! frameComplete
+    return (frameCount);
 }
-
-
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_ffmpeg_camera.h b/src/zm_ffmpeg_camera.h
old mode 100755
new mode 100644
index 4f38b4f6b..45870c2cb
--- a/src/zm_ffmpeg_camera.h
+++ b/src/zm_ffmpeg_camera.h
@@ -35,60 +35,60 @@
 class FfmpegCamera : public Camera
 {
 protected:
-    std::string         mPath;
-    std::string			mMethod;
-    std::string			mOptions;
+  std::string     mPath;
+  std::string      mMethod;
+  std::string      mOptions;
 
-    int frameCount;    
+  int frameCount;  
 
 #if HAVE_LIBAVFORMAT
-    AVFormatContext     *mFormatContext;
-    int                 mVideoStreamId;
-    int                 mAudioStreamId;
-    AVCodecContext      *mCodecContext;
-    AVCodec             *mCodec;
-    AVFrame             *mRawFrame; 
-    AVFrame             *mFrame;
-    _AVPIXELFORMAT         imagePixFormat;
+  AVFormatContext   *mFormatContext;
+  int               mVideoStreamId;
+  int               mAudioStreamId;
+  AVCodecContext    *mCodecContext;
+  AVCodec           *mCodec;
+  AVFrame           *mRawFrame; 
+  AVFrame           *mFrame;
+  _AVPIXELFORMAT    imagePixFormat;
 
-    int OpenFfmpeg();
-    int ReopenFfmpeg();
-    int CloseFfmpeg();
-    static int FfmpegInterruptCallback(void *ctx);
-    static void* ReopenFfmpegThreadCallback(void *ctx);
-    bool mIsOpening;
-    bool mCanCapture;
-    int mOpenStart;
-    pthread_t mReopenThread;
+  int OpenFfmpeg();
+  int ReopenFfmpeg();
+  int CloseFfmpeg();
+  static int FfmpegInterruptCallback(void *ctx);
+  static void* ReopenFfmpegThreadCallback(void *ctx);
+  bool mIsOpening;
+  bool mCanCapture;
+  int mOpenStart;
+  pthread_t mReopenThread;
 #endif // HAVE_LIBAVFORMAT
-    
-    bool                wasRecording;
-    VideoStore          *videoStore;
-    char                oldDirectory[4096];
-    //AVPacket            lastKeyframePkt;
+
+  bool              wasRecording;
+  VideoStore        *videoStore;
+  char              oldDirectory[4096];
+  //AVPacket        lastKeyframePkt;
 
 #if HAVE_LIBSWSCALE
-	struct SwsContext   *mConvertContext;
+  struct SwsContext   *mConvertContext;
 #endif
 
-    int64_t             startTime;
-    
+  int64_t           startTime;
+
 public:
-	FfmpegCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	~FfmpegCamera();
+  FfmpegCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  ~FfmpegCamera();
 
-    const std::string &Path() const { return( mPath ); }
-    const std::string &Options() const { return( mOptions ); } 
-    const std::string &Method() const { return( mMethod ); }
+  const std::string &Path() const { return( mPath ); }
+  const std::string &Options() const { return( mOptions ); } 
+  const std::string &Method() const { return( mMethod ); }
 
-	void Initialise();
-	void Terminate();
+  void Initialise();
+  void Terminate();
 
-	int PrimeCapture();
-	int PreCapture();
-	int Capture( Image &image );
-        int CaptureAndRecord( Image &image, bool recording, char* event_directory );
-	int PostCapture();
+  int PrimeCapture();
+  int PreCapture();
+  int Capture( Image &image );
+  int CaptureAndRecord( Image &image, bool recording, char* event_directory );
+  int PostCapture();
 };
 
 #endif // ZM_FFMPEG_CAMERA_H
diff --git a/src/zm_file_camera.cpp b/src/zm_file_camera.cpp
index 28ce2b155..05e14d67e 100644
--- a/src/zm_file_camera.cpp
+++ b/src/zm_file_camera.cpp
@@ -34,30 +34,30 @@
 #include "zm.h"
 #include "zm_file_camera.h"
 
-FileCamera::FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) : Camera( p_id, FILE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture )
+FileCamera::FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) : Camera( p_id, FILE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio )
 {
-	strncpy( path, p_path, sizeof(path) );
-	if ( capture )
-	{
-		Initialise();
-	}
+  strncpy( path, p_path, sizeof(path) );
+  if ( capture )
+  {
+    Initialise();
+  }
 }
 
 FileCamera::~FileCamera()
 {
-	if ( capture )
-	{
-		Terminate();
-	}
+  if ( capture )
+  {
+    Terminate();
+  }
 }
 
 void FileCamera::Initialise()
 {
-	if ( !path[0] )
-	{
-		Error( "No path specified for file image" );
-		exit( -1 );
-	}
+  if ( !path[0] )
+  {
+    Error( "No path specified for file image" );
+    exit( -1 );
+  }
 }
 
 void FileCamera::Terminate()
@@ -66,26 +66,26 @@ void FileCamera::Terminate()
 
 int FileCamera::PreCapture()
 {
-	struct stat statbuf;
-	if ( stat( path, &statbuf ) < 0 )
-	{
-		Error( "Can't stat %s: %s", path, strerror(errno) );
-		return( -1 );
-	}
+  struct stat statbuf;
+  if ( stat( path, &statbuf ) < 0 )
+  {
+    Error( "Can't stat %s: %s", path, strerror(errno) );
+    return( -1 );
+  }
 
-	while ( (time( 0 ) - statbuf.st_mtime) < 1 )
-	{
-		usleep( 100000 );
-	}
-	return( 0 );
+  while ( (time( 0 ) - statbuf.st_mtime) < 1 )
+  {
+    usleep( 100000 );
+  }
+  return( 0 );
 }
 
 int FileCamera::Capture( Image &image )
 {
-	return( image.ReadJpeg( path, colours, subpixelorder )?0:-1 );
+  return( image.ReadJpeg( path, colours, subpixelorder )?0:-1 );
 }
 
 int FileCamera::PostCapture()
 {
-    return( 0 );
+  return( 0 );
 }
diff --git a/src/zm_file_camera.h b/src/zm_file_camera.h
index 98db69b22..c1fed0a0c 100644
--- a/src/zm_file_camera.h
+++ b/src/zm_file_camera.h
@@ -33,20 +33,20 @@
 class FileCamera : public Camera
 {
 protected:
-	char path[PATH_MAX];
+  char path[PATH_MAX];
 
 public:
-	FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	~FileCamera();
+  FileCamera( int p_id, const char *p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  ~FileCamera();
 
-	const char *Path() const { return( path ); }
+  const char *Path() const { return( path ); }
 
-	void Initialise();
-	void Terminate();
-	int PreCapture();
-	int Capture( Image &image );
-	int PostCapture();
-        int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
+  void Initialise();
+  void Terminate();
+  int PreCapture();
+  int Capture( Image &image );
+  int PostCapture();
+	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
 };
 
 #endif // ZM_FILE_CAMERA_H
diff --git a/src/zm_font.h b/src/zm_font.h
index 844ff4f1e..cdad72dc4 100644
--- a/src/zm_font.h
+++ b/src/zm_font.h
@@ -1,3337 +1,3337 @@
 /**********************************************/
-/*                                            */
-/*       Font file generated by rthelen       */
-/*                                            */
+/*                      */
+/*     Font file generated by rthelen     */
+/*                      */
 /**********************************************/
 
 static unsigned char fontdata[] = {
 
-	/* 0 0x00 '^A' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 1 0x01 '^B' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 2 0x02 '^C' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 3 0x03 '^D' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 4 0x04 '^E' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 5 0x05 '^F' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 6 0x06 '^G' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 7 0x07 '^H' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 8 0x08 '^I' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 9 0x09 '^J' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 10 0x0a '^K' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 11 0x0b '^L' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 12 0x0c '^M' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 13 0x0d '^N' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 14 0x0e '^O' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 15 0x0f '^P' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 16 0x10 '^Q' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 17 0x11 '^R' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x54, /* 0 0 0 00 */
-	0x38, /* 00   000 */
-	0x54, /* 0 0 0 00 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 18 0x12 '^S' */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x50, /* 0 0 0000 */
-	0x50, /* 0 0 0000 */
-	0x20, /* 00 00000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 19 0x13 '^T' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x7c, /* 0     00 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 20 0x14 '^U' */
-	0x18, /* 000  000 */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x7c, /* 0     00 */
-	0x78, /* 0    000 */
-	0x78, /* 0    000 */
-	0x7c, /* 0     00 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 21 0x15 '^V' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 22 0x16 '^W' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 23 0x17 '^X' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 24 0x18 '^Y' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 25 0x19 '^Z' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 26 0x1a '^[' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 27 0x1b '^\' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 28 0x1c '^]' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 29 0x1d '^^' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 30 0x1e '^_' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 31 0x1f '^`' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 32 0x20 ' ' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 33 0x21 '!' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 34 0x22 '"' */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 35 0x23 '#' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x7c, /* 0     00 */
-	0x28, /* 00 0 000 */
-	0x7c, /* 0     00 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 36 0x24 '$' */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x54, /* 0 0 0 00 */
-	0x50, /* 0 0 0000 */
-	0x38, /* 00   000 */
-	0x14, /* 000 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 37 0x25 '%' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x54, /* 0 0 0 00 */
-	0x58, /* 0 0  000 */
-	0x28, /* 00 0 000 */
-	0x34, /* 00  0 00 */
-	0x54, /* 0 0 0 00 */
-	0x48, /* 0 00 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 38 0x26 '&' */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x48, /* 0 00 000 */
-	0x50, /* 0 0 0000 */
-	0x20, /* 00 00000 */
-	0x54, /* 0 0 0 00 */
-	0x48, /* 0 00 000 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 39 0x27 ''' */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 40 0x28 '(' */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x04, /* 00000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 41 0x29 ')' */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 42 0x2a '*' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x54, /* 0 0 0 00 */
-	0x38, /* 00   000 */
-	0x54, /* 0 0 0 00 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 43 0x2b '+' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x7c, /* 0     00 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 44 0x2c ',' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x30, /* 00  0000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-
-	/* 45 0x2d '-' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 46 0x2e '.' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x18, /* 000  000 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 47 0x2f '/' */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x20, /* 00 00000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-
-	/* 48 0x30 '0' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x54, /* 0 0 0 00 */
-	0x64, /* 0  00 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 49 0x31 '1' */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x18, /* 000  000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x1c, /* 000   00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 50 0x32 '2' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 51 0x33 '3' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x04, /* 00000 00 */
-	0x18, /* 000  000 */
-	0x04, /* 00000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 52 0x34 '4' */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x18, /* 000  000 */
-	0x28, /* 00 0 000 */
-	0x48, /* 0 00 000 */
-	0x7c, /* 0     00 */
-	0x08, /* 0000 000 */
-	0x1c, /* 000   00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 53 0x35 '5' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 54 0x36 '6' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 55 0x37 '7' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 56 0x38 '8' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 57 0x39 '9' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x3c, /* 00    00 */
-	0x04, /* 00000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 58 0x3a ':' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x18, /* 000  000 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x18, /* 000  000 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 59 0x3b ';' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x30, /* 00  0000 */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x30, /* 00  0000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-
-	/* 60 0x3c '<' */
-	0x00, /* 00000000 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x04, /* 00000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 61 0x3d '=' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 62 0x3e '>' */
-	0x00, /* 00000000 */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 63 0x3f '?' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 64 0x40 '@' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x74, /* 0   0 00 */
-	0x54, /* 0 0 0 00 */
-	0x78, /* 0    000 */
-	0x40, /* 0 000000 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 65 0x41 'A' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 66 0x42 'B' */
-	0x00, /* 00000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 67 0x43 'C' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 68 0x44 'D' */
-	0x00, /* 00000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 69 0x45 'E' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 70 0x46 'F' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 71 0x47 'G' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x40, /* 0 000000 */
-	0x4c, /* 0 00  00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 72 0x48 'H' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 73 0x49 'I' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 74 0x4a 'J' */
-	0x00, /* 00000000 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 75 0x4b 'K' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x48, /* 0 00 000 */
-	0x50, /* 0 0 0000 */
-	0x60, /* 0  00000 */
-	0x50, /* 0 0 0000 */
-	0x48, /* 0 00 000 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 76 0x4c 'L' */
-	0x00, /* 00000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 77 0x4d 'M' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x6c, /* 0  0  00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 78 0x4e 'N' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x64, /* 0  00 00 */
-	0x54, /* 0 0 0 00 */
-	0x4c, /* 0 00  00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 79 0x4f 'O' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 80 0x50 'P' */
-	0x00, /* 00000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 81 0x51 'Q' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x54, /* 0 0 0 00 */
-	0x38, /* 00   000 */
-	0x04, /* 00000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 82 0x52 'R' */
-	0x00, /* 00000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 83 0x53 'S' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x40, /* 0 000000 */
-	0x38, /* 00   000 */
-	0x04, /* 00000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 84 0x54 'T' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 85 0x55 'U' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 86 0x56 'V' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 87 0x57 'W' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x6c, /* 0  0  00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 88 0x58 'X' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 89 0x59 'Y' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 90 0x5a 'Z' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x40, /* 0 000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 91 0x5b '[' */
-	0x0c, /* 0000  00 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x0c, /* 0000  00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 92 0x5c '\' */
-	0x20, /* 00 00000 */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x02, /* 000000 0 */
-	0x02, /* 000000 0 */
-	0x00, /* 00000000 */
-
-	/* 93 0x5d ']' */
-	0x30, /* 00  0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x30, /* 00  0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 94 0x5e '^' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 95 0x5f '_' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7e, /* 0      0 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 96 0x60 '`' */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 97 0x61 'a' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 98 0x62 'b' */
-	0x00, /* 00000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 99 0x63 'c' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x40, /* 0 000000 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 100 0x64 'd' */
-	0x00, /* 00000000 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 101 0x65 'e' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 102 0x66 'f' */
-	0x00, /* 00000000 */
-	0x0c, /* 0000  00 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 103 0x67 'g' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x3c, /* 00    00 */
-	0x04, /* 00000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-
-	/* 104 0x68 'h' */
-	0x00, /* 00000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 105 0x69 'i' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 106 0x6a 'j' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x60, /* 0  00000 */
-	0x00, /* 00000000 */
-
-	/* 107 0x6b 'k' */
-	0x00, /* 00000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x48, /* 0 00 000 */
-	0x50, /* 0 0 0000 */
-	0x70, /* 0   0000 */
-	0x48, /* 0 00 000 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 108 0x6c 'l' */
-	0x00, /* 00000000 */
-	0x30, /* 00  0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 109 0x6d 'm' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x78, /* 0    000 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 110 0x6e 'n' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x58, /* 0 0  000 */
-	0x64, /* 0  00 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 111 0x6f 'o' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 112 0x70 'p' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x78, /* 0    000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-
-	/* 113 0x71 'q' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x3c, /* 00    00 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x00, /* 00000000 */
-
-	/* 114 0x72 'r' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x58, /* 0 0  000 */
-	0x64, /* 0  00 00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 115 0x73 's' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x40, /* 0 000000 */
-	0x38, /* 00   000 */
-	0x04, /* 00000 00 */
-	0x78, /* 0    000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 116 0x74 't' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x0c, /* 0000  00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 117 0x75 'u' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 118 0x76 'v' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 119 0x77 'w' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 120 0x78 'x' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 121 0x79 'y' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x3c, /* 00    00 */
-	0x04, /* 00000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-
-	/* 122 0x7a 'z' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 123 0x7b '{' */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x04, /* 00000 00 */
-	0x00, /* 00000000 */
-
-	/* 124 0x7c '|' */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 125 0x7d '}' */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-
-	/* 126 0x7e '~' */
-	0x00, /* 00000000 */
-	0x34, /* 00  0 00 */
-	0x58, /* 0 0  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 127 0x7f '^?' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 128 0x80 '\200' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 129 0x81 '\201' */
-	0x28, /* 00 0 000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 130 0x82 '\202' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 131 0x83 '\203' */
-	0x10, /* 000 0000 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x78, /* 0    000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 132 0x84 '\204' */
-	0x58, /* 0 0  000 */
-	0x44, /* 0 000 00 */
-	0x64, /* 0  00 00 */
-	0x54, /* 0 0 0 00 */
-	0x4c, /* 0 00  00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 133 0x85 '\205' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 134 0x86 '\206' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 135 0x87 '\207' */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 136 0x88 '\210' */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 137 0x89 '\211' */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 138 0x8a '\212' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 139 0x8b '\213' */
-	0x34, /* 00  0 00 */
-	0x58, /* 0 0  000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 140 0x8c '\214' */
-	0x18, /* 000  000 */
-	0x24, /* 00 00 00 */
-	0x18, /* 000  000 */
-	0x3c, /* 00    00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 141 0x8d '\215' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x3c, /* 00    00 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-
-	/* 142 0x8e '\216' */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 143 0x8f '\217' */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 144 0x90 '\220' */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 145 0x91 '\221' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x40, /* 0 000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 146 0x92 '\222' */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 147 0x93 '\223' */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 148 0x94 '\224' */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 149 0x95 '\225' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 150 0x96 '\226' */
-	0x34, /* 00  0 00 */
-	0x58, /* 0 0  000 */
-	0x00, /* 00000000 */
-	0x58, /* 0 0  000 */
-	0x64, /* 0  00 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 151 0x97 '\227' */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 152 0x98 '\230' */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 153 0x99 '\231' */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 154 0x9a '\232' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 155 0x9b '\233' */
-	0x34, /* 00  0 00 */
-	0x58, /* 0 0  000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 156 0x9c '\234' */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 157 0x9d '\235' */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 158 0x9e '\236' */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 159 0x9f '\237' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x34, /* 00  0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 160 0xa0 '\240' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 161 0xa1 '\241' */
-	0x18, /* 000  000 */
-	0x24, /* 00 00 00 */
-	0x24, /* 00 00 00 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 162 0xa2 '\242' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x54, /* 0 0 0 00 */
-	0x50, /* 0 0 0000 */
-	0x54, /* 0 0 0 00 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 163 0xa3 '\243' */
-	0x30, /* 00  0000 */
-	0x48, /* 0 00 000 */
-	0x40, /* 0 000000 */
-	0x70, /* 0   0000 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x44, /* 0 000 00 */
-	0x78, /* 0    000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 164 0xa4 '\244' */
-	0x44, /* 0 000 00 */
-	0x24, /* 00 00 00 */
-	0x50, /* 0 0 0000 */
-	0x48, /* 0 00 000 */
-	0x24, /* 00 00 00 */
-	0x14, /* 000 0 00 */
-	0x48, /* 0 00 000 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 165 0xa5 '\245' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x7c, /* 0     00 */
-	0x7c, /* 0     00 */
-	0x7c, /* 0     00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 166 0xa6 '\246' */
-	0x3c, /* 00    00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x54, /* 0 0 0 00 */
-	0x3c, /* 00    00 */
-	0x14, /* 000 0 00 */
-	0x14, /* 000 0 00 */
-	0x14, /* 000 0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 167 0xa7 '\247' */
-	0x18, /* 000  000 */
-	0x24, /* 00 00 00 */
-	0x44, /* 0 000 00 */
-	0x48, /* 0 00 000 */
-	0x48, /* 0 00 000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x58, /* 0 0  000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 168 0xa8 '\250' */
-	0x00, /* 00000000 */
-	0x70, /* 0   0000 */
-	0x08, /* 0000 000 */
-	0x64, /* 0  00 00 */
-	0x54, /* 0 0 0 00 */
-	0x64, /* 0  00 00 */
-	0x58, /* 0 0  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 169 0xa9 '\251' */
-	0x00, /* 00000000 */
-	0x70, /* 0   0000 */
-	0x08, /* 0000 000 */
-	0x34, /* 00  0 00 */
-	0x44, /* 0 000 00 */
-	0x34, /* 00  0 00 */
-	0x08, /* 0000 000 */
-	0x70, /* 0   0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 170 0xaa '\252' */
-	0x00, /* 00000000 */
-	0x7a, /* 0    0 0 */
-	0x2e, /* 00 0   0 */
-	0x2e, /* 00 0   0 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 171 0xab '\253' */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 172 0xac '\254' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 173 0xad '\255' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x7c, /* 0     00 */
-	0x10, /* 000 0000 */
-	0x7c, /* 0     00 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 174 0xae '\256' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x50, /* 0 0 0000 */
-	0x50, /* 0 0 0000 */
-	0x78, /* 0    000 */
-	0x50, /* 0 0 0000 */
-	0x50, /* 0 0 0000 */
-	0x5c, /* 0 0   00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 175 0xaf '\257' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x4c, /* 0 00  00 */
-	0x54, /* 0 0 0 00 */
-	0x64, /* 0  00 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 176 0xb0 '\260' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x6c, /* 0  0  00 */
-	0x54, /* 0 0 0 00 */
-	0x6c, /* 0  0  00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 177 0xb1 '\261' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x7c, /* 0     00 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 178 0xb2 '\262' */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 179 0xb3 '\263' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x04, /* 00000 00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x1c, /* 000   00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 180 0xb4 '\264' */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x7c, /* 0     00 */
-	0x10, /* 000 0000 */
-	0x7c, /* 0     00 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 181 0xb5 '\265' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x48, /* 0 00 000 */
-	0x48, /* 0 00 000 */
-	0x48, /* 0 00 000 */
-	0x48, /* 0 00 000 */
-	0x74, /* 0   0 00 */
-	0x40, /* 0 000000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-
-	/* 182 0xb6 '\266' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x0c, /* 0000  00 */
-	0x14, /* 000 0 00 */
-	0x24, /* 00 00 00 */
-	0x24, /* 00 00 00 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 183 0xb7 '\267' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x24, /* 00 00 00 */
-	0x10, /* 000 0000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x24, /* 00 00 00 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 184 0xb8 '\270' */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 185 0xb9 '\271' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 186 0xba '\272' */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x60, /* 0  00000 */
-	0x00, /* 00000000 */
-
-	/* 187 0xbb '\273' */
-	0x00, /* 00000000 */
-	0x1c, /* 000   00 */
-	0x24, /* 00 00 00 */
-	0x24, /* 00 00 00 */
-	0x1c, /* 000   00 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 188 0xbc '\274' */
-	0x00, /* 00000000 */
-	0x18, /* 000  000 */
-	0x24, /* 00 00 00 */
-	0x24, /* 00 00 00 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 189 0xbd '\275' */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x6c, /* 0  0  00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 190 0xbe '\276' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x54, /* 0 0 0 00 */
-	0x5c, /* 0 0   00 */
-	0x50, /* 0 0 0000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 191 0xbf '\277' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x4c, /* 0 00  00 */
-	0x54, /* 0 0 0 00 */
-	0x64, /* 0  00 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 192 0xc0 '\300' */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x20, /* 00 00000 */
-	0x40, /* 0 000000 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 193 0xc1 '\301' */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x08, /* 0000 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 194 0xc2 '\302' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x04, /* 00000 00 */
-	0x04, /* 00000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 195 0xc3 '\303' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x0c, /* 0000  00 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x50, /* 0 0 0000 */
-	0x20, /* 00 00000 */
-	0x20, /* 00 00000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 196 0xc4 '\304' */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x60, /* 0  00000 */
-	0x00, /* 00000000 */
-
-	/* 197 0xc5 '\305' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x04, /* 00000 00 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x40, /* 0 000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 198 0xc6 '\306' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 199 0xc7 '\307' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x24, /* 00 00 00 */
-	0x48, /* 0 00 000 */
-	0x48, /* 0 00 000 */
-	0x24, /* 00 00 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 200 0xc8 '\310' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x48, /* 0 00 000 */
-	0x24, /* 00 00 00 */
-	0x24, /* 00 00 00 */
-	0x48, /* 0 00 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 201 0xc9 '\311' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x54, /* 0 0 0 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 202 0xca '\312' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 203 0xcb '\313' */
-	0x10, /* 000 0000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 204 0xcc '\314' */
-	0x58, /* 0 0  000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x7c, /* 0     00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 205 0xcd '\315' */
-	0x58, /* 0 0  000 */
-	0x38, /* 00   000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 206 0xce '\316' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x50, /* 0 0 0000 */
-	0x50, /* 0 0 0000 */
-	0x58, /* 0 0  000 */
-	0x50, /* 0 0 0000 */
-	0x50, /* 0 0 0000 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 207 0xcf '\317' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x54, /* 0 0 0 00 */
-	0x5c, /* 0 0   00 */
-	0x50, /* 0 0 0000 */
-	0x2c, /* 00 0  00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 208 0xd0 '\320' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 209 0xd1 '\321' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7e, /* 0      0 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 210 0xd2 '\322' */
-	0x00, /* 00000000 */
-	0x14, /* 000 0 00 */
-	0x28, /* 00 0 000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 211 0xd3 '\323' */
-	0x00, /* 00000000 */
-	0x14, /* 000 0 00 */
-	0x14, /* 000 0 00 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 212 0xd4 '\324' */
-	0x00, /* 00000000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x18, /* 000  000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 213 0xd5 '\325' */
-	0x00, /* 00000000 */
-	0x18, /* 000  000 */
-	0x08, /* 0000 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 214 0xd6 '\326' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x7c, /* 0     00 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 215 0xd7 '\327' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x10, /* 000 0000 */
-	0x28, /* 00 0 000 */
-	0x44, /* 0 000 00 */
-	0x28, /* 00 0 000 */
-	0x10, /* 000 0000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 216 0xd8 '\330' */
-	0x00, /* 00000000 */
-	0x28, /* 00 0 000 */
-	0x00, /* 00000000 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x44, /* 0 000 00 */
-	0x3c, /* 00    00 */
-	0x04, /* 00000 00 */
-	0x38, /* 00   000 */
-	0x00, /* 00000000 */
-
-	/* 217 0xd9 '\331' */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x7e, /* 0      0 */
-	0x00, /* 00000000 */
-	0x7e, /* 0      0 */
-	0x00, /* 00000000 */
-	0x7e, /* 0      0 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 218 0xda '\332' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 219 0xdb '\333' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 220 0xdc '\334' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 221 0xdd '\335' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 222 0xde '\336' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 223 0xdf '\337' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 224 0xe0 '\340' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 225 0xe1 '\341' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 226 0xe2 '\342' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 227 0xe3 '\343' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 228 0xe4 '\344' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 229 0xe5 '\345' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 230 0xe6 '\346' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 231 0xe7 '\347' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 232 0xe8 '\350' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 233 0xe9 '\351' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 234 0xea '\352' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 235 0xeb '\353' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 236 0xec '\354' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 237 0xed '\355' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 238 0xee '\356' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 239 0xef '\357' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 240 0xf0 '\360' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 241 0xf1 '\361' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 242 0xf2 '\362' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 243 0xf3 '\363' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 244 0xf4 '\364' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 245 0xf5 '\365' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 246 0xf6 '\366' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 247 0xf7 '\367' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 248 0xf8 '\370' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 249 0xf9 '\371' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 250 0xfa '\372' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 251 0xfb '\373' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 252 0xfc '\374' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 253 0xfd '\375' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 254 0xfe '\376' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-
-	/* 255 0xff '\377' */
-	0x00, /* 00000000 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x3c, /* 00    00 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
-	0x00, /* 00000000 */
+  /* 0 0x00 '^A' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 1 0x01 '^B' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 2 0x02 '^C' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 3 0x03 '^D' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 4 0x04 '^E' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 5 0x05 '^F' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 6 0x06 '^G' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 7 0x07 '^H' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 8 0x08 '^I' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 9 0x09 '^J' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 10 0x0a '^K' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 11 0x0b '^L' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 12 0x0c '^M' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 13 0x0d '^N' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 14 0x0e '^O' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 15 0x0f '^P' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 16 0x10 '^Q' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 17 0x11 '^R' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x54, /* 0 0 0 00 */
+  0x38, /* 00   000 */
+  0x54, /* 0 0 0 00 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 18 0x12 '^S' */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x50, /* 0 0 0000 */
+  0x50, /* 0 0 0000 */
+  0x20, /* 00 00000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 19 0x13 '^T' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x7c, /* 0   00 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 20 0x14 '^U' */
+  0x18, /* 000  000 */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x7c, /* 0   00 */
+  0x78, /* 0  000 */
+  0x78, /* 0  000 */
+  0x7c, /* 0   00 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 21 0x15 '^V' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 22 0x16 '^W' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 23 0x17 '^X' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 24 0x18 '^Y' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 25 0x19 '^Z' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 26 0x1a '^[' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 27 0x1b '^\' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 28 0x1c '^]' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 29 0x1d '^^' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 30 0x1e '^_' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 31 0x1f '^`' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 32 0x20 ' ' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 33 0x21 '!' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 34 0x22 '"' */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 35 0x23 '#' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x7c, /* 0   00 */
+  0x28, /* 00 0 000 */
+  0x7c, /* 0   00 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 36 0x24 '$' */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x54, /* 0 0 0 00 */
+  0x50, /* 0 0 0000 */
+  0x38, /* 00   000 */
+  0x14, /* 000 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 37 0x25 '%' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x54, /* 0 0 0 00 */
+  0x58, /* 0 0  000 */
+  0x28, /* 00 0 000 */
+  0x34, /* 00  0 00 */
+  0x54, /* 0 0 0 00 */
+  0x48, /* 0 00 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 38 0x26 '&' */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x48, /* 0 00 000 */
+  0x50, /* 0 0 0000 */
+  0x20, /* 00 00000 */
+  0x54, /* 0 0 0 00 */
+  0x48, /* 0 00 000 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 39 0x27 ''' */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 40 0x28 '(' */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x04, /* 00000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 41 0x29 ')' */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 42 0x2a '*' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x54, /* 0 0 0 00 */
+  0x38, /* 00   000 */
+  0x54, /* 0 0 0 00 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 43 0x2b '+' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x7c, /* 0   00 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 44 0x2c ',' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x30, /* 00  0000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+
+  /* 45 0x2d '-' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 46 0x2e '.' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x18, /* 000  000 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 47 0x2f '/' */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x20, /* 00 00000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+
+  /* 48 0x30 '0' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x54, /* 0 0 0 00 */
+  0x64, /* 0  00 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 49 0x31 '1' */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x18, /* 000  000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x1c, /* 000   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 50 0x32 '2' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 51 0x33 '3' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x04, /* 00000 00 */
+  0x18, /* 000  000 */
+  0x04, /* 00000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 52 0x34 '4' */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x18, /* 000  000 */
+  0x28, /* 00 0 000 */
+  0x48, /* 0 00 000 */
+  0x7c, /* 0   00 */
+  0x08, /* 0000 000 */
+  0x1c, /* 000   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 53 0x35 '5' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 54 0x36 '6' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 55 0x37 '7' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 56 0x38 '8' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 57 0x39 '9' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x3c, /* 00  00 */
+  0x04, /* 00000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 58 0x3a ':' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x18, /* 000  000 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x18, /* 000  000 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 59 0x3b ';' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x30, /* 00  0000 */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x30, /* 00  0000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+
+  /* 60 0x3c '<' */
+  0x00, /* 00000000 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x04, /* 00000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 61 0x3d '=' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 62 0x3e '>' */
+  0x00, /* 00000000 */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 63 0x3f '?' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 64 0x40 '@' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x74, /* 0   0 00 */
+  0x54, /* 0 0 0 00 */
+  0x78, /* 0  000 */
+  0x40, /* 0 000000 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 65 0x41 'A' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 66 0x42 'B' */
+  0x00, /* 00000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 67 0x43 'C' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 68 0x44 'D' */
+  0x00, /* 00000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 69 0x45 'E' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 70 0x46 'F' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 71 0x47 'G' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x40, /* 0 000000 */
+  0x4c, /* 0 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 72 0x48 'H' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 73 0x49 'I' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 74 0x4a 'J' */
+  0x00, /* 00000000 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 75 0x4b 'K' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x48, /* 0 00 000 */
+  0x50, /* 0 0 0000 */
+  0x60, /* 0  00000 */
+  0x50, /* 0 0 0000 */
+  0x48, /* 0 00 000 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 76 0x4c 'L' */
+  0x00, /* 00000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 77 0x4d 'M' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x6c, /* 0  0  00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 78 0x4e 'N' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x64, /* 0  00 00 */
+  0x54, /* 0 0 0 00 */
+  0x4c, /* 0 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 79 0x4f 'O' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 80 0x50 'P' */
+  0x00, /* 00000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 81 0x51 'Q' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x54, /* 0 0 0 00 */
+  0x38, /* 00   000 */
+  0x04, /* 00000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 82 0x52 'R' */
+  0x00, /* 00000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 83 0x53 'S' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x40, /* 0 000000 */
+  0x38, /* 00   000 */
+  0x04, /* 00000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 84 0x54 'T' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 85 0x55 'U' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 86 0x56 'V' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 87 0x57 'W' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x6c, /* 0  0  00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 88 0x58 'X' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 89 0x59 'Y' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 90 0x5a 'Z' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x40, /* 0 000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 91 0x5b '[' */
+  0x0c, /* 0000  00 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x0c, /* 0000  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 92 0x5c '\' */
+  0x20, /* 00 00000 */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x02, /* 000000 0 */
+  0x02, /* 000000 0 */
+  0x00, /* 00000000 */
+
+  /* 93 0x5d ']' */
+  0x30, /* 00  0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x30, /* 00  0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 94 0x5e '^' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 95 0x5f '_' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7e, /* 0    0 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 96 0x60 '`' */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 97 0x61 'a' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 98 0x62 'b' */
+  0x00, /* 00000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 99 0x63 'c' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x40, /* 0 000000 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 100 0x64 'd' */
+  0x00, /* 00000000 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 101 0x65 'e' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 102 0x66 'f' */
+  0x00, /* 00000000 */
+  0x0c, /* 0000  00 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 103 0x67 'g' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x3c, /* 00  00 */
+  0x04, /* 00000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+
+  /* 104 0x68 'h' */
+  0x00, /* 00000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 105 0x69 'i' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 106 0x6a 'j' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x60, /* 0  00000 */
+  0x00, /* 00000000 */
+
+  /* 107 0x6b 'k' */
+  0x00, /* 00000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x48, /* 0 00 000 */
+  0x50, /* 0 0 0000 */
+  0x70, /* 0   0000 */
+  0x48, /* 0 00 000 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 108 0x6c 'l' */
+  0x00, /* 00000000 */
+  0x30, /* 00  0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 109 0x6d 'm' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x78, /* 0  000 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 110 0x6e 'n' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x58, /* 0 0  000 */
+  0x64, /* 0  00 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 111 0x6f 'o' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 112 0x70 'p' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x78, /* 0  000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+
+  /* 113 0x71 'q' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x3c, /* 00  00 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x00, /* 00000000 */
+
+  /* 114 0x72 'r' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x58, /* 0 0  000 */
+  0x64, /* 0  00 00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 115 0x73 's' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x40, /* 0 000000 */
+  0x38, /* 00   000 */
+  0x04, /* 00000 00 */
+  0x78, /* 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 116 0x74 't' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x0c, /* 0000  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 117 0x75 'u' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 118 0x76 'v' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 119 0x77 'w' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 120 0x78 'x' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 121 0x79 'y' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x3c, /* 00  00 */
+  0x04, /* 00000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+
+  /* 122 0x7a 'z' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 123 0x7b '{' */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x04, /* 00000 00 */
+  0x00, /* 00000000 */
+
+  /* 124 0x7c '|' */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 125 0x7d '}' */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+
+  /* 126 0x7e '~' */
+  0x00, /* 00000000 */
+  0x34, /* 00  0 00 */
+  0x58, /* 0 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 127 0x7f '^?' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 128 0x80 '\200' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 129 0x81 '\201' */
+  0x28, /* 00 0 000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 130 0x82 '\202' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 131 0x83 '\203' */
+  0x10, /* 000 0000 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x78, /* 0  000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 132 0x84 '\204' */
+  0x58, /* 0 0  000 */
+  0x44, /* 0 000 00 */
+  0x64, /* 0  00 00 */
+  0x54, /* 0 0 0 00 */
+  0x4c, /* 0 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 133 0x85 '\205' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 134 0x86 '\206' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 135 0x87 '\207' */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 136 0x88 '\210' */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 137 0x89 '\211' */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 138 0x8a '\212' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 139 0x8b '\213' */
+  0x34, /* 00  0 00 */
+  0x58, /* 0 0  000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 140 0x8c '\214' */
+  0x18, /* 000  000 */
+  0x24, /* 00 00 00 */
+  0x18, /* 000  000 */
+  0x3c, /* 00  00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 141 0x8d '\215' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x3c, /* 00  00 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+
+  /* 142 0x8e '\216' */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 143 0x8f '\217' */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 144 0x90 '\220' */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 145 0x91 '\221' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x40, /* 0 000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 146 0x92 '\222' */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 147 0x93 '\223' */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 148 0x94 '\224' */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 149 0x95 '\225' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 150 0x96 '\226' */
+  0x34, /* 00  0 00 */
+  0x58, /* 0 0  000 */
+  0x00, /* 00000000 */
+  0x58, /* 0 0  000 */
+  0x64, /* 0  00 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 151 0x97 '\227' */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 152 0x98 '\230' */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 153 0x99 '\231' */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 154 0x9a '\232' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 155 0x9b '\233' */
+  0x34, /* 00  0 00 */
+  0x58, /* 0 0  000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 156 0x9c '\234' */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 157 0x9d '\235' */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 158 0x9e '\236' */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 159 0x9f '\237' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x34, /* 00  0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 160 0xa0 '\240' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 161 0xa1 '\241' */
+  0x18, /* 000  000 */
+  0x24, /* 00 00 00 */
+  0x24, /* 00 00 00 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 162 0xa2 '\242' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x54, /* 0 0 0 00 */
+  0x50, /* 0 0 0000 */
+  0x54, /* 0 0 0 00 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 163 0xa3 '\243' */
+  0x30, /* 00  0000 */
+  0x48, /* 0 00 000 */
+  0x40, /* 0 000000 */
+  0x70, /* 0   0000 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x44, /* 0 000 00 */
+  0x78, /* 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 164 0xa4 '\244' */
+  0x44, /* 0 000 00 */
+  0x24, /* 00 00 00 */
+  0x50, /* 0 0 0000 */
+  0x48, /* 0 00 000 */
+  0x24, /* 00 00 00 */
+  0x14, /* 000 0 00 */
+  0x48, /* 0 00 000 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 165 0xa5 '\245' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x7c, /* 0   00 */
+  0x7c, /* 0   00 */
+  0x7c, /* 0   00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 166 0xa6 '\246' */
+  0x3c, /* 00  00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x54, /* 0 0 0 00 */
+  0x3c, /* 00  00 */
+  0x14, /* 000 0 00 */
+  0x14, /* 000 0 00 */
+  0x14, /* 000 0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 167 0xa7 '\247' */
+  0x18, /* 000  000 */
+  0x24, /* 00 00 00 */
+  0x44, /* 0 000 00 */
+  0x48, /* 0 00 000 */
+  0x48, /* 0 00 000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x58, /* 0 0  000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 168 0xa8 '\250' */
+  0x00, /* 00000000 */
+  0x70, /* 0   0000 */
+  0x08, /* 0000 000 */
+  0x64, /* 0  00 00 */
+  0x54, /* 0 0 0 00 */
+  0x64, /* 0  00 00 */
+  0x58, /* 0 0  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 169 0xa9 '\251' */
+  0x00, /* 00000000 */
+  0x70, /* 0   0000 */
+  0x08, /* 0000 000 */
+  0x34, /* 00  0 00 */
+  0x44, /* 0 000 00 */
+  0x34, /* 00  0 00 */
+  0x08, /* 0000 000 */
+  0x70, /* 0   0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 170 0xaa '\252' */
+  0x00, /* 00000000 */
+  0x7a, /* 0  0 0 */
+  0x2e, /* 00 0   0 */
+  0x2e, /* 00 0   0 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 171 0xab '\253' */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 172 0xac '\254' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 173 0xad '\255' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x7c, /* 0   00 */
+  0x10, /* 000 0000 */
+  0x7c, /* 0   00 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 174 0xae '\256' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x50, /* 0 0 0000 */
+  0x50, /* 0 0 0000 */
+  0x78, /* 0  000 */
+  0x50, /* 0 0 0000 */
+  0x50, /* 0 0 0000 */
+  0x5c, /* 0 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 175 0xaf '\257' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x4c, /* 0 00  00 */
+  0x54, /* 0 0 0 00 */
+  0x64, /* 0  00 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 176 0xb0 '\260' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x6c, /* 0  0  00 */
+  0x54, /* 0 0 0 00 */
+  0x6c, /* 0  0  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 177 0xb1 '\261' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x7c, /* 0   00 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 178 0xb2 '\262' */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 179 0xb3 '\263' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x04, /* 00000 00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x1c, /* 000   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 180 0xb4 '\264' */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x7c, /* 0   00 */
+  0x10, /* 000 0000 */
+  0x7c, /* 0   00 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 181 0xb5 '\265' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x48, /* 0 00 000 */
+  0x48, /* 0 00 000 */
+  0x48, /* 0 00 000 */
+  0x48, /* 0 00 000 */
+  0x74, /* 0   0 00 */
+  0x40, /* 0 000000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+
+  /* 182 0xb6 '\266' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x0c, /* 0000  00 */
+  0x14, /* 000 0 00 */
+  0x24, /* 00 00 00 */
+  0x24, /* 00 00 00 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 183 0xb7 '\267' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x24, /* 00 00 00 */
+  0x10, /* 000 0000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x24, /* 00 00 00 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 184 0xb8 '\270' */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 185 0xb9 '\271' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 186 0xba '\272' */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x60, /* 0  00000 */
+  0x00, /* 00000000 */
+
+  /* 187 0xbb '\273' */
+  0x00, /* 00000000 */
+  0x1c, /* 000   00 */
+  0x24, /* 00 00 00 */
+  0x24, /* 00 00 00 */
+  0x1c, /* 000   00 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 188 0xbc '\274' */
+  0x00, /* 00000000 */
+  0x18, /* 000  000 */
+  0x24, /* 00 00 00 */
+  0x24, /* 00 00 00 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 189 0xbd '\275' */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x6c, /* 0  0  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 190 0xbe '\276' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x54, /* 0 0 0 00 */
+  0x5c, /* 0 0   00 */
+  0x50, /* 0 0 0000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 191 0xbf '\277' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x4c, /* 0 00  00 */
+  0x54, /* 0 0 0 00 */
+  0x64, /* 0  00 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 192 0xc0 '\300' */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x20, /* 00 00000 */
+  0x40, /* 0 000000 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 193 0xc1 '\301' */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x08, /* 0000 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 194 0xc2 '\302' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x04, /* 00000 00 */
+  0x04, /* 00000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 195 0xc3 '\303' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x0c, /* 0000  00 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x50, /* 0 0 0000 */
+  0x20, /* 00 00000 */
+  0x20, /* 00 00000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 196 0xc4 '\304' */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x60, /* 0  00000 */
+  0x00, /* 00000000 */
+
+  /* 197 0xc5 '\305' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x04, /* 00000 00 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x40, /* 0 000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 198 0xc6 '\306' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 199 0xc7 '\307' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x24, /* 00 00 00 */
+  0x48, /* 0 00 000 */
+  0x48, /* 0 00 000 */
+  0x24, /* 00 00 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 200 0xc8 '\310' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x48, /* 0 00 000 */
+  0x24, /* 00 00 00 */
+  0x24, /* 00 00 00 */
+  0x48, /* 0 00 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 201 0xc9 '\311' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x54, /* 0 0 0 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 202 0xca '\312' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 203 0xcb '\313' */
+  0x10, /* 000 0000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 204 0xcc '\314' */
+  0x58, /* 0 0  000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x7c, /* 0   00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 205 0xcd '\315' */
+  0x58, /* 0 0  000 */
+  0x38, /* 00   000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 206 0xce '\316' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x50, /* 0 0 0000 */
+  0x50, /* 0 0 0000 */
+  0x58, /* 0 0  000 */
+  0x50, /* 0 0 0000 */
+  0x50, /* 0 0 0000 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 207 0xcf '\317' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x54, /* 0 0 0 00 */
+  0x5c, /* 0 0   00 */
+  0x50, /* 0 0 0000 */
+  0x2c, /* 00 0  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 208 0xd0 '\320' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 209 0xd1 '\321' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7e, /* 0    0 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 210 0xd2 '\322' */
+  0x00, /* 00000000 */
+  0x14, /* 000 0 00 */
+  0x28, /* 00 0 000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 211 0xd3 '\323' */
+  0x00, /* 00000000 */
+  0x14, /* 000 0 00 */
+  0x14, /* 000 0 00 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 212 0xd4 '\324' */
+  0x00, /* 00000000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x18, /* 000  000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 213 0xd5 '\325' */
+  0x00, /* 00000000 */
+  0x18, /* 000  000 */
+  0x08, /* 0000 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 214 0xd6 '\326' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x7c, /* 0   00 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 215 0xd7 '\327' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x10, /* 000 0000 */
+  0x28, /* 00 0 000 */
+  0x44, /* 0 000 00 */
+  0x28, /* 00 0 000 */
+  0x10, /* 000 0000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 216 0xd8 '\330' */
+  0x00, /* 00000000 */
+  0x28, /* 00 0 000 */
+  0x00, /* 00000000 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x44, /* 0 000 00 */
+  0x3c, /* 00  00 */
+  0x04, /* 00000 00 */
+  0x38, /* 00   000 */
+  0x00, /* 00000000 */
+
+  /* 217 0xd9 '\331' */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x7e, /* 0    0 */
+  0x00, /* 00000000 */
+  0x7e, /* 0    0 */
+  0x00, /* 00000000 */
+  0x7e, /* 0    0 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 218 0xda '\332' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 219 0xdb '\333' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 220 0xdc '\334' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 221 0xdd '\335' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 222 0xde '\336' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 223 0xdf '\337' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 224 0xe0 '\340' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 225 0xe1 '\341' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 226 0xe2 '\342' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 227 0xe3 '\343' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 228 0xe4 '\344' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 229 0xe5 '\345' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 230 0xe6 '\346' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 231 0xe7 '\347' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 232 0xe8 '\350' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 233 0xe9 '\351' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 234 0xea '\352' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 235 0xeb '\353' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 236 0xec '\354' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 237 0xed '\355' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 238 0xee '\356' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 239 0xef '\357' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 240 0xf0 '\360' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 241 0xf1 '\361' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 242 0xf2 '\362' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 243 0xf3 '\363' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 244 0xf4 '\364' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 245 0xf5 '\365' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 246 0xf6 '\366' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 247 0xf7 '\367' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 248 0xf8 '\370' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 249 0xf9 '\371' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 250 0xfa '\372' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 251 0xfb '\373' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 252 0xfc '\374' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 253 0xfd '\375' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 254 0xfe '\376' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+
+  /* 255 0xff '\377' */
+  0x00, /* 00000000 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x3c, /* 00  00 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
+  0x00, /* 00000000 */
 
 };
diff --git a/src/zm_image.cpp b/src/zm_image.cpp
index a302b4be5..d76384dc3 100644
--- a/src/zm_image.cpp
+++ b/src/zm_image.cpp
@@ -63,729 +63,729 @@ imgbufcpy_fptr_t fptr_imgbufcpy;
 
 Image::Image()
 {
-    if ( !initialised )
-        Initialise();
-    width = 0;
-    height = 0;
-    pixels = 0;
-    colours = 0;
-    subpixelorder = 0;
-    size = 0;
-    allocation = 0;
-    buffer = 0;
-    buffertype = 0;
-    holdbuffer = 0;
-    text[0] = '\0';
+  if ( !initialised )
+    Initialise();
+  width = 0;
+  height = 0;
+  pixels = 0;
+  colours = 0;
+  subpixelorder = 0;
+  size = 0;
+  allocation = 0;
+  buffer = 0;
+  buffertype = 0;
+  holdbuffer = 0;
+  text[0] = '\0';
 }
 
 Image::Image( const char *filename )
 {
-    if ( !initialised )
-        Initialise();
-    width = 0;
-    height = 0;
-    pixels = 0;
-    colours = 0;
-    subpixelorder = 0;    
-    size = 0;
-    allocation = 0;
-    buffer = 0;
-    buffertype = 0;
-    holdbuffer = 0;
-    ReadJpeg( filename, ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
-    text[0] = '\0';
+  if ( !initialised )
+    Initialise();
+  width = 0;
+  height = 0;
+  pixels = 0;
+  colours = 0;
+  subpixelorder = 0;  
+  size = 0;
+  allocation = 0;
+  buffer = 0;
+  buffertype = 0;
+  holdbuffer = 0;
+  ReadJpeg( filename, ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB);
+  text[0] = '\0';
 }
 
 Image::Image( int p_width, int p_height, int p_colours, int p_subpixelorder, uint8_t *p_buffer )
 {
-    if ( !initialised )
-        Initialise();
-    width = p_width;
-    height = p_height;
-    pixels = width*height;
-    colours = p_colours;
-    subpixelorder = p_subpixelorder;
-    size = pixels*colours;
-    buffer = 0;
-    holdbuffer = 0;
-    if ( p_buffer )
-    {
-		allocation = size;
-		buffertype = ZM_BUFTYPE_DONTFREE;
-        buffer = p_buffer;
-    }
-    else
-    {
-        AllocImgBuffer(size);
-    }
-    text[0] = '\0';
+  if ( !initialised )
+    Initialise();
+  width = p_width;
+  height = p_height;
+  pixels = width*height;
+  colours = p_colours;
+  subpixelorder = p_subpixelorder;
+  size = pixels*colours;
+  buffer = 0;
+  holdbuffer = 0;
+  if ( p_buffer )
+  {
+    allocation = size;
+    buffertype = ZM_BUFTYPE_DONTFREE;
+    buffer = p_buffer;
+  }
+  else
+  {
+    AllocImgBuffer(size);
+  }
+  text[0] = '\0';
 }
 
 Image::Image( const Image &p_image )
 {
-    if ( !initialised )
-        Initialise();
-    width = p_image.width;
-    height = p_image.height;
-    pixels = p_image.pixels;
-    colours = p_image.colours;
-    subpixelorder = p_image.subpixelorder;
-    size = p_image.size; // allocation is set in AllocImgBuffer
-    buffer = 0;
-    holdbuffer = 0;
-    AllocImgBuffer(size);
-    (*fptr_imgbufcpy)(buffer, p_image.buffer, size);
-    strncpy( text, p_image.text, sizeof(text) );
+  if ( !initialised )
+    Initialise();
+  width = p_image.width;
+  height = p_image.height;
+  pixels = p_image.pixels;
+  colours = p_image.colours;
+  subpixelorder = p_image.subpixelorder;
+  size = p_image.size; // allocation is set in AllocImgBuffer
+  buffer = 0;
+  holdbuffer = 0;
+  AllocImgBuffer(size);
+  (*fptr_imgbufcpy)(buffer, p_image.buffer, size);
+  strncpy( text, p_image.text, sizeof(text) );
 }
 
 Image::~Image()
 {
-	DumpImgBuffer();
-	if ( initialised )
-	{
-		delete[] y_table;
-		delete[] uv_table;
-		delete[] r_v_table;
-		delete[] g_v_table;
-		delete[] g_u_table;
-		delete[] b_u_table;
-		initialised = false;
-	}
-	if ( jpg_dcinfo )
-	{
-		jpeg_destroy_decompress( jpg_dcinfo );
-		delete jpg_dcinfo;
-		jpg_dcinfo = 0;
-	}
+  DumpImgBuffer();
+  if ( initialised )
+  {
+    delete[] y_table;
+    delete[] uv_table;
+    delete[] r_v_table;
+    delete[] g_v_table;
+    delete[] g_u_table;
+    delete[] b_u_table;
+    initialised = false;
+  }
+  if ( jpg_dcinfo )
+  {
+    jpeg_destroy_decompress( jpg_dcinfo );
+    delete jpg_dcinfo;
+    jpg_dcinfo = 0;
+  }
 }
 
 void Image::Initialise()
 {
-	/* Assign the blend pointer to function */
-	if(config.fast_image_blends) {
-		if(config.cpu_extensions && sseversion >= 20) {
-			fptr_blend = &sse2_fastblend; /* SSE2 fast blend */
-			Debug(2,"Blend: Using SSE2 fast blend function");
-		} else {
-			fptr_blend = &std_fastblend;  /* standard fast blend */
-			Debug(2,"Blend: Using fast blend function");
-		}
-	} else {
-		fptr_blend = &std_blend;
-		Debug(2,"Blend: Using standard blend function");
-	}
-	
-	__attribute__((aligned(16))) uint8_t blend1[16] = {142,255,159,91,88,227,0,52,37,80,152,97,104,252,90,82};
-	__attribute__((aligned(16))) uint8_t blend2[16] = {129,56,136,96,119,149,94,29,96,176,1,144,230,203,111,172};
-	__attribute__((aligned(16))) uint8_t blendres[16];
-	__attribute__((aligned(16))) uint8_t blendexp[16] = {141,231,157,92,91,217,11,49,45,92,133,103,119,246,92,93}; /* Expected results for 12.5% blend */
-	
-	(*fptr_blend)(blend1,blend2,blendres,16,12.5);
-	
-	/* Compare results with expected results */
-	for(int i=0;i<16;i++) {
-		if(abs(blendexp[i] - blendres[i]) > 3) {
-			Panic("Blend function failed self-test: Results differ from the expected results");
-		}
-	}
-	
-	fptr_delta8_rgb = &std_delta8_rgb;
-	fptr_delta8_bgr = &std_delta8_bgr;
-	
-	/* Assign the delta functions */
-	if(config.cpu_extensions) {
-		if(sseversion >= 35) {
-			/* SSSE3 available */
-			fptr_delta8_rgba = &ssse3_delta8_rgba;
-			fptr_delta8_bgra = &ssse3_delta8_bgra;
-			fptr_delta8_argb = &ssse3_delta8_argb;
-			fptr_delta8_abgr = &ssse3_delta8_abgr;
-			fptr_delta8_gray8 = &sse2_delta8_gray8;
-			Debug(2,"Delta: Using SSSE3 delta functions");
-		} else if(sseversion >= 20) {
-			/* SSE2 available */
-			fptr_delta8_rgba = &sse2_delta8_rgba;
-			fptr_delta8_bgra = &sse2_delta8_bgra;
-			fptr_delta8_argb = &sse2_delta8_argb;
-			fptr_delta8_abgr = &sse2_delta8_abgr;
-			/*
-			** On some systems, the 4 SSE2 algorithms above might be a little slower than
-			** the standard algorithms, especially on early Pentium 4 processors.
-			** In that case, comment out the 4 lines above and uncomment the 4 lines below
-			*/
-			// fptr_delta8_rgba = &std_delta8_rgba;
-			// fptr_delta8_bgra = &std_delta8_bgra;
-			// fptr_delta8_argb = &std_delta8_argb;
-			// fptr_delta8_abgr = &std_delta8_abgr;
-			fptr_delta8_gray8 = &sse2_delta8_gray8;
-			Debug(2,"Delta: Using SSE2 delta functions");
-		} else {
-			/* No suitable SSE version available */
-			fptr_delta8_rgba = &std_delta8_rgba;
-			fptr_delta8_bgra = &std_delta8_bgra;
-			fptr_delta8_argb = &std_delta8_argb;
-			fptr_delta8_abgr = &std_delta8_abgr;
-			fptr_delta8_gray8 = &std_delta8_gray8;
-			Debug(2,"Delta: Using standard delta functions");
-		}
-	} else {
-		/* CPU extensions disabled */
-		fptr_delta8_rgba = &std_delta8_rgba;
-		fptr_delta8_bgra = &std_delta8_bgra;
-		fptr_delta8_argb = &std_delta8_argb;
-		fptr_delta8_abgr = &std_delta8_abgr;
-		fptr_delta8_gray8 = &std_delta8_gray8;
-		Debug(2,"Delta: CPU extensions disabled, using standard delta functions");
-	}
-	
-	/* Use SSSE3 deinterlace functions? */
-	if(config.cpu_extensions && sseversion >= 35) {
-		fptr_deinterlace_4field_rgba = &ssse3_deinterlace_4field_rgba;
-		fptr_deinterlace_4field_bgra = &ssse3_deinterlace_4field_bgra;
-		fptr_deinterlace_4field_argb = &ssse3_deinterlace_4field_argb;
-		fptr_deinterlace_4field_abgr = &ssse3_deinterlace_4field_abgr;
-		fptr_deinterlace_4field_gray8 = &ssse3_deinterlace_4field_gray8;
-		Debug(2,"Deinterlace: Using SSSE3 delta functions");
-	} else {
-		fptr_deinterlace_4field_rgba = &std_deinterlace_4field_rgba;
-		fptr_deinterlace_4field_bgra = &std_deinterlace_4field_bgra;
-		fptr_deinterlace_4field_argb = &std_deinterlace_4field_argb;
-		fptr_deinterlace_4field_abgr = &std_deinterlace_4field_abgr;
-		fptr_deinterlace_4field_gray8 = &std_deinterlace_4field_gray8;
-		Debug(2,"Deinterlace: Using standard delta functions");
-	}
-	
-	/* Use SSE2 aligned memory copy? */
-	if(config.cpu_extensions && sseversion >= 20) {
-		fptr_imgbufcpy = &sse2_aligned_memcpy;
-		Debug(2,"Image buffer copy: Using SSE2 aligned memcpy");
-	} else {
-		fptr_imgbufcpy = &memcpy;
-		Debug(2,"Image buffer copy: Using standard memcpy");
-	}
-	
-	/* Code below relocated from zm_local_camera */
-	Debug( 3, "Setting up static colour tables" );
-	
-	y_table = new unsigned char[256];
-	for ( int i = 0; i <= 255; i++ )
-	{
-		unsigned char c = i;
-		if ( c <= 16 )
-			y_table[c] = 0;
-		else if ( c >= 235 )
-			y_table[c] = 255;
-		else
-			y_table[c] = (255*(c-16))/219;
-	}
+  /* Assign the blend pointer to function */
+  if(config.fast_image_blends) {
+    if(config.cpu_extensions && sseversion >= 20) {
+      fptr_blend = &sse2_fastblend; /* SSE2 fast blend */
+      Debug(2,"Blend: Using SSE2 fast blend function");
+    } else {
+      fptr_blend = &std_fastblend;  /* standard fast blend */
+      Debug(2,"Blend: Using fast blend function");
+    }
+  } else {
+    fptr_blend = &std_blend;
+    Debug(2,"Blend: Using standard blend function");
+  }
+  
+  __attribute__((aligned(16))) uint8_t blend1[16] = {142,255,159,91,88,227,0,52,37,80,152,97,104,252,90,82};
+  __attribute__((aligned(16))) uint8_t blend2[16] = {129,56,136,96,119,149,94,29,96,176,1,144,230,203,111,172};
+  __attribute__((aligned(16))) uint8_t blendres[16];
+  __attribute__((aligned(16))) uint8_t blendexp[16] = {141,231,157,92,91,217,11,49,45,92,133,103,119,246,92,93}; /* Expected results for 12.5% blend */
+  
+  (*fptr_blend)(blend1,blend2,blendres,16,12.5);
+  
+  /* Compare results with expected results */
+  for(int i=0;i<16;i++) {
+    if(abs(blendexp[i] - blendres[i]) > 3) {
+      Panic("Blend function failed self-test: Results differ from the expected results");
+    }
+  }
+  
+  fptr_delta8_rgb = &std_delta8_rgb;
+  fptr_delta8_bgr = &std_delta8_bgr;
+  
+  /* Assign the delta functions */
+  if(config.cpu_extensions) {
+    if(sseversion >= 35) {
+      /* SSSE3 available */
+      fptr_delta8_rgba = &ssse3_delta8_rgba;
+      fptr_delta8_bgra = &ssse3_delta8_bgra;
+      fptr_delta8_argb = &ssse3_delta8_argb;
+      fptr_delta8_abgr = &ssse3_delta8_abgr;
+      fptr_delta8_gray8 = &sse2_delta8_gray8;
+      Debug(2,"Delta: Using SSSE3 delta functions");
+    } else if(sseversion >= 20) {
+      /* SSE2 available */
+      fptr_delta8_rgba = &sse2_delta8_rgba;
+      fptr_delta8_bgra = &sse2_delta8_bgra;
+      fptr_delta8_argb = &sse2_delta8_argb;
+      fptr_delta8_abgr = &sse2_delta8_abgr;
+      /*
+      ** On some systems, the 4 SSE2 algorithms above might be a little slower than
+      ** the standard algorithms, especially on early Pentium 4 processors.
+      ** In that case, comment out the 4 lines above and uncomment the 4 lines below
+      */
+      // fptr_delta8_rgba = &std_delta8_rgba;
+      // fptr_delta8_bgra = &std_delta8_bgra;
+      // fptr_delta8_argb = &std_delta8_argb;
+      // fptr_delta8_abgr = &std_delta8_abgr;
+      fptr_delta8_gray8 = &sse2_delta8_gray8;
+      Debug(2,"Delta: Using SSE2 delta functions");
+    } else {
+      /* No suitable SSE version available */
+      fptr_delta8_rgba = &std_delta8_rgba;
+      fptr_delta8_bgra = &std_delta8_bgra;
+      fptr_delta8_argb = &std_delta8_argb;
+      fptr_delta8_abgr = &std_delta8_abgr;
+      fptr_delta8_gray8 = &std_delta8_gray8;
+      Debug(2,"Delta: Using standard delta functions");
+    }
+  } else {
+    /* CPU extensions disabled */
+    fptr_delta8_rgba = &std_delta8_rgba;
+    fptr_delta8_bgra = &std_delta8_bgra;
+    fptr_delta8_argb = &std_delta8_argb;
+    fptr_delta8_abgr = &std_delta8_abgr;
+    fptr_delta8_gray8 = &std_delta8_gray8;
+    Debug(2,"Delta: CPU extensions disabled, using standard delta functions");
+  }
+  
+  /* Use SSSE3 deinterlace functions? */
+  if(config.cpu_extensions && sseversion >= 35) {
+    fptr_deinterlace_4field_rgba = &ssse3_deinterlace_4field_rgba;
+    fptr_deinterlace_4field_bgra = &ssse3_deinterlace_4field_bgra;
+    fptr_deinterlace_4field_argb = &ssse3_deinterlace_4field_argb;
+    fptr_deinterlace_4field_abgr = &ssse3_deinterlace_4field_abgr;
+    fptr_deinterlace_4field_gray8 = &ssse3_deinterlace_4field_gray8;
+    Debug(2,"Deinterlace: Using SSSE3 delta functions");
+  } else {
+    fptr_deinterlace_4field_rgba = &std_deinterlace_4field_rgba;
+    fptr_deinterlace_4field_bgra = &std_deinterlace_4field_bgra;
+    fptr_deinterlace_4field_argb = &std_deinterlace_4field_argb;
+    fptr_deinterlace_4field_abgr = &std_deinterlace_4field_abgr;
+    fptr_deinterlace_4field_gray8 = &std_deinterlace_4field_gray8;
+    Debug(2,"Deinterlace: Using standard delta functions");
+  }
+  
+  /* Use SSE2 aligned memory copy? */
+  if(config.cpu_extensions && sseversion >= 20) {
+    fptr_imgbufcpy = &sse2_aligned_memcpy;
+    Debug(2,"Image buffer copy: Using SSE2 aligned memcpy");
+  } else {
+    fptr_imgbufcpy = &memcpy;
+    Debug(2,"Image buffer copy: Using standard memcpy");
+  }
+  
+  /* Code below relocated from zm_local_camera */
+  Debug( 3, "Setting up static colour tables" );
+  
+  y_table = new unsigned char[256];
+  for ( int i = 0; i <= 255; i++ )
+  {
+    unsigned char c = i;
+    if ( c <= 16 )
+      y_table[c] = 0;
+    else if ( c >= 235 )
+      y_table[c] = 255;
+    else
+      y_table[c] = (255*(c-16))/219;
+  }
 
-	uv_table = new signed char[256];
-	for ( int i = 0; i <= 255; i++ )
-	{
-		unsigned char c = i;
-		if ( c <= 16 )
-			uv_table[c] = -127;
-		else if ( c >= 240 )
-			uv_table[c] = 127;
-		else
-			uv_table[c] = (127*(c-128))/112;
-	}
+  uv_table = new signed char[256];
+  for ( int i = 0; i <= 255; i++ )
+  {
+    unsigned char c = i;
+    if ( c <= 16 )
+      uv_table[c] = -127;
+    else if ( c >= 240 )
+      uv_table[c] = 127;
+    else
+      uv_table[c] = (127*(c-128))/112;
+  }
 
-	r_v_table = new short[255];
-	g_v_table = new short[255];
-	g_u_table = new short[255];
-	b_u_table = new short[255];
-	for ( int i = 0; i < 255; i++ )
-	{
-		r_v_table[i] = (1402*(i-128))/1000;
-		g_u_table[i] = (344*(i-128))/1000;
-		g_v_table[i] = (714*(i-128))/1000;
-		b_u_table[i] = (1772*(i-128))/1000;
-	}
-	
-	initialised = true;
+  r_v_table = new short[255];
+  g_v_table = new short[255];
+  g_u_table = new short[255];
+  b_u_table = new short[255];
+  for ( int i = 0; i < 255; i++ )
+  {
+    r_v_table[i] = (1402*(i-128))/1000;
+    g_u_table[i] = (344*(i-128))/1000;
+    g_v_table[i] = (714*(i-128))/1000;
+    b_u_table[i] = (1772*(i-128))/1000;
+  }
+  
+  initialised = true;
 }
 
 /* Requests a writeable buffer to the image. This is safer than buffer() because this way we can guarantee that a buffer of required size exists */
 uint8_t* Image::WriteBuffer(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder) {
-	unsigned int newsize;
+  unsigned int newsize;
   
-	if(p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32) {
-		Error("WriteBuffer called with unexpected colours: %d",p_colours);
-		return NULL;
-	}
-	
-	if(!p_height || !p_width) {
-		Error("WriteBuffer called with invaid width or height: %d %d",p_width,p_height);
-		return NULL;
-	}
-	
-	if(p_width != width || p_height != height || p_colours != colours || p_subpixelorder != subpixelorder) {
-		newsize = (p_width * p_height) * p_colours;
-		
-		if(buffer == NULL) {
-			AllocImgBuffer(newsize);
-		} else {
-			if(allocation < newsize) {
-				if(holdbuffer) {
-					Error("Held buffer is undersized for requested buffer");
-					return NULL;
-				} else {
-					/* Replace buffer with a bigger one */
-					//DumpImgBuffer(); // Done in AllocImgBuffer too
-					AllocImgBuffer(newsize);
-				}
-			}
-		}
-		
-		width = p_width;
-		height = p_height;
-		colours = p_colours;
-		subpixelorder = p_subpixelorder;
-		pixels = height*width;
-		size = newsize; 
-	}
-	
-	return buffer; 
+  if(p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32) {
+    Error("WriteBuffer called with unexpected colours: %d",p_colours);
+    return NULL;
+  }
+  
+  if(!p_height || !p_width) {
+    Error("WriteBuffer called with invaid width or height: %d %d",p_width,p_height);
+    return NULL;
+  }
+  
+  if(p_width != width || p_height != height || p_colours != colours || p_subpixelorder != subpixelorder) {
+    newsize = (p_width * p_height) * p_colours;
+    
+    if(buffer == NULL) {
+      AllocImgBuffer(newsize);
+    } else {
+      if(allocation < newsize) {
+        if(holdbuffer) {
+          Error("Held buffer is undersized for requested buffer");
+          return NULL;
+        } else {
+          /* Replace buffer with a bigger one */
+          //DumpImgBuffer(); // Done in AllocImgBuffer too
+          AllocImgBuffer(newsize);
+        }
+      }
+    }
+    
+    width = p_width;
+    height = p_height;
+    colours = p_colours;
+    subpixelorder = p_subpixelorder;
+    pixels = height*width;
+    size = newsize; 
+  }
+  
+  return buffer; 
   
 }
 
 /* Assign an existing buffer to the image instead of copying from a source buffer. The goal is to reduce the amount of memory copying and increase efficiency and buffer reusing. */
 void Image::AssignDirect( const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, uint8_t *new_buffer, const size_t buffer_size, const int p_buffertype) {
-	if(new_buffer == NULL) {
-		Error("Attempt to directly assign buffer from a NULL pointer");
-		return;
-	}
+  if(new_buffer == NULL) {
+    Error("Attempt to directly assign buffer from a NULL pointer");
+    return;
+  }
 
-	if(!p_height || !p_width) {
-		Error("Attempt to directly assign buffer with invalid width or height: %d %d",p_width,p_height);
-		return;
-	}
+  if(!p_height || !p_width) {
+    Error("Attempt to directly assign buffer with invalid width or height: %d %d",p_width,p_height);
+    return;
+  }
 
-	if(p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32) {
-		Error("Attempt to directly assign buffer with unexpected colours per pixel: %d",p_colours);
-		return;
-	}
+  if(p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32) {
+    Error("Attempt to directly assign buffer with unexpected colours per pixel: %d",p_colours);
+    return;
+  }
 
-	unsigned int new_buffer_size = ((p_width*p_height)*p_colours);
-	
-	if(buffer_size < new_buffer_size) {
-		Error("Attempt to directly assign buffer from an undersized buffer of size: %zu, needed %dx%d*%d colours = %zu",buffer_size, p_width, p_height, p_colours, new_buffer_size );
-		return;
-	}
-	
-	if(holdbuffer && buffer) {
-		if(new_buffer_size > allocation) {
-			Error("Held buffer is undersized for assigned buffer");
-			return;
-		} else {
-			width = p_width;
-			height = p_height;
-			colours = p_colours;
-			subpixelorder = p_subpixelorder;
-			pixels = height*width;
-			size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
-			
-			/* Copy into the held buffer */
-			if(new_buffer != buffer)
-				(*fptr_imgbufcpy)(buffer, new_buffer, size);
-			
-			/* Free the new buffer */
-			DumpBuffer(new_buffer, p_buffertype);
-		}
-	} else {
-		/* Free an existing buffer if any */
-		DumpImgBuffer();
-	  
-		width = p_width;
-		height = p_height;
-		colours = p_colours;
-		subpixelorder = p_subpixelorder;
-		pixels = height*width;
-		size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
-	
-		allocation = buffer_size;
-		buffertype = p_buffertype;
-		buffer = new_buffer;
-	}
-	
+  unsigned int new_buffer_size = ((p_width*p_height)*p_colours);
+  
+  if(buffer_size < new_buffer_size) {
+    Error("Attempt to directly assign buffer from an undersized buffer of size: %zu, needed %dx%d*%d colours = %zu",buffer_size, p_width, p_height, p_colours, new_buffer_size );
+    return;
+  }
+  
+  if(holdbuffer && buffer) {
+    if(new_buffer_size > allocation) {
+      Error("Held buffer is undersized for assigned buffer");
+      return;
+    } else {
+      width = p_width;
+      height = p_height;
+      colours = p_colours;
+      subpixelorder = p_subpixelorder;
+      pixels = height*width;
+      size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
+      
+      /* Copy into the held buffer */
+      if(new_buffer != buffer)
+        (*fptr_imgbufcpy)(buffer, new_buffer, size);
+      
+      /* Free the new buffer */
+      DumpBuffer(new_buffer, p_buffertype);
+    }
+  } else {
+    /* Free an existing buffer if any */
+    DumpImgBuffer();
+    
+    width = p_width;
+    height = p_height;
+    colours = p_colours;
+    subpixelorder = p_subpixelorder;
+    pixels = height*width;
+    size = new_buffer_size; // was pixels*colours, but we already calculated it above as new_buffer_size
+  
+    allocation = buffer_size;
+    buffertype = p_buffertype;
+    buffer = new_buffer;
+  }
+  
 }
 
 void Image::Assign(const unsigned int p_width, const unsigned int p_height, const unsigned int p_colours, const unsigned int p_subpixelorder, const uint8_t* new_buffer, const size_t buffer_size) {
-	unsigned int new_size = (p_width * p_height) * p_colours;
+  unsigned int new_size = (p_width * p_height) * p_colours;
   
-	if(new_buffer == NULL) {
-		Error("Attempt to assign buffer from a NULL pointer");
-		return;
-	}
-	
-	if(buffer_size < new_size) {
-		Error("Attempt to assign buffer from an undersized buffer of size: %zu",buffer_size);
-		return;
-	}
-	
-	if(!p_height || !p_width) {
-		Error("Attempt to assign buffer with invalid width or height: %d %d",p_width,p_height);
-		return;
-	}
-	
-	if(p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32) {
-		Error("Attempt to assign buffer with unexpected colours per pixel: %d",p_colours);
-		return;
-	}
-	
-	if ( !buffer || p_width != width || p_height != height || p_colours != colours || p_subpixelorder != subpixelorder) {
+  if(new_buffer == NULL) {
+    Error("Attempt to assign buffer from a NULL pointer");
+    return;
+  }
+  
+  if(buffer_size < new_size) {
+    Error("Attempt to assign buffer from an undersized buffer of size: %zu",buffer_size);
+    return;
+  }
+  
+  if(!p_height || !p_width) {
+    Error("Attempt to assign buffer with invalid width or height: %d %d",p_width,p_height);
+    return;
+  }
+  
+  if(p_colours != ZM_COLOUR_GRAY8 && p_colours != ZM_COLOUR_RGB24 && p_colours != ZM_COLOUR_RGB32) {
+    Error("Attempt to assign buffer with unexpected colours per pixel: %d",p_colours);
+    return;
+  }
+  
+  if ( !buffer || p_width != width || p_height != height || p_colours != colours || p_subpixelorder != subpixelorder) {
 
-		if (holdbuffer && buffer) {
-			if (new_size > allocation) {
-				Error("Held buffer is undersized for assigned buffer");
-				return;
-			}
-		} else {
-			if(new_size > allocation || !buffer) { 
-				DumpImgBuffer();
-				AllocImgBuffer(new_size);
-			}
-		}
-		
-		width = p_width;
-		height = p_height;
-		pixels = width*height;
-		colours = p_colours;
-		subpixelorder = p_subpixelorder;
-		size = new_size;
-	}
-	
-	if(new_buffer != buffer)
-		(*fptr_imgbufcpy)(buffer, new_buffer, size);
-	
+    if (holdbuffer && buffer) {
+      if (new_size > allocation) {
+        Error("Held buffer is undersized for assigned buffer");
+        return;
+      }
+    } else {
+      if(new_size > allocation || !buffer) { 
+        DumpImgBuffer();
+        AllocImgBuffer(new_size);
+      }
+    }
+    
+    width = p_width;
+    height = p_height;
+    pixels = width*height;
+    colours = p_colours;
+    subpixelorder = p_subpixelorder;
+    size = new_size;
+  }
+  
+  if(new_buffer != buffer)
+    (*fptr_imgbufcpy)(buffer, new_buffer, size);
+  
 }
 
 void Image::Assign( const Image &image ) {
-	unsigned int new_size = (image.width * image.height) * image.colours;
-	
-	if(image.buffer == NULL) {
-		Error("Attempt to assign image with an empty buffer");
-		return;
-	}
+  unsigned int new_size = (image.width * image.height) * image.colours;
   
-	if(image.colours != ZM_COLOUR_GRAY8 && image.colours != ZM_COLOUR_RGB24 && image.colours != ZM_COLOUR_RGB32) {
-		Error("Attempt to assign image with unexpected colours per pixel: %d",image.colours);
-		return;
-	}
-	
-	if ( !buffer || image.width != width || image.height != height || image.colours != colours || image.subpixelorder != subpixelorder) {
+  if(image.buffer == NULL) {
+    Error("Attempt to assign image with an empty buffer");
+    return;
+  }
+  
+  if(image.colours != ZM_COLOUR_GRAY8 && image.colours != ZM_COLOUR_RGB24 && image.colours != ZM_COLOUR_RGB32) {
+    Error("Attempt to assign image with unexpected colours per pixel: %d",image.colours);
+    return;
+  }
+  
+  if ( !buffer || image.width != width || image.height != height || image.colours != colours || image.subpixelorder != subpixelorder) {
 
-		if (holdbuffer && buffer) {
-			if (new_size > allocation) {
-				Error("Held buffer is undersized for assigned buffer");
-				return;
-			}
-		} else {
-			if(new_size > allocation || !buffer) { 
-				// DumpImgBuffer(); This is also done in AllocImgBuffer
-				AllocImgBuffer(new_size);
-			}
-		}
-		
-		width = image.width;
-		height = image.height;
-		pixels = width*height;
-		colours = image.colours;
-		subpixelorder = image.subpixelorder;
-		size = new_size;
-	}
-	
-	if(image.buffer != buffer)
-		(*fptr_imgbufcpy)(buffer, image.buffer, size);
+    if (holdbuffer && buffer) {
+      if (new_size > allocation) {
+        Error("Held buffer is undersized for assigned buffer");
+        return;
+      }
+    } else {
+      if(new_size > allocation || !buffer) { 
+        // DumpImgBuffer(); This is also done in AllocImgBuffer
+        AllocImgBuffer(new_size);
+      }
+    }
+    
+    width = image.width;
+    height = image.height;
+    pixels = width*height;
+    colours = image.colours;
+    subpixelorder = image.subpixelorder;
+    size = new_size;
+  }
+  
+  if(image.buffer != buffer)
+    (*fptr_imgbufcpy)(buffer, image.buffer, size);
 }
 
 Image *Image::HighlightEdges( Rgb colour, unsigned int p_colours, unsigned int p_subpixelorder, const Box *limits )
 {
-	if ( colours != ZM_COLOUR_GRAY8 )
-	{
-		Panic( "Attempt to highlight image edges when colours = %d", colours );
-	}
-	
-	/* Convert the colour's RGBA subpixel order into the image's subpixel order */
-	colour = rgb_convert(colour,p_subpixelorder);
-	
-	/* Create a new image of the target format */
-	Image *high_image = new Image( width, height, p_colours, p_subpixelorder );
-	uint8_t* high_buff = high_image->WriteBuffer(width, height, p_colours, p_subpixelorder);
-	
-	/* Set image to all black */
-	high_image->Clear();
+  if ( colours != ZM_COLOUR_GRAY8 )
+  {
+    Panic( "Attempt to highlight image edges when colours = %d", colours );
+  }
+  
+  /* Convert the colour's RGBA subpixel order into the image's subpixel order */
+  colour = rgb_convert(colour,p_subpixelorder);
+  
+  /* Create a new image of the target format */
+  Image *high_image = new Image( width, height, p_colours, p_subpixelorder );
+  uint8_t* high_buff = high_image->WriteBuffer(width, height, p_colours, p_subpixelorder);
+  
+  /* Set image to all black */
+  high_image->Clear();
 
-	unsigned int lo_x = limits?limits->Lo().X():0;
-	unsigned int lo_y = limits?limits->Lo().Y():0;
-	unsigned int hi_x = limits?limits->Hi().X():width-1;
-	unsigned int hi_y = limits?limits->Hi().Y():height-1;
-	
-	if ( p_colours == ZM_COLOUR_GRAY8 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			const uint8_t* p = buffer + (y * width) + lo_x;
-			uint8_t* phigh = high_buff + (y * width) + lo_x;
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ )
-			{
-				bool edge = false;
-				if ( *p )
-				{
-					if ( !edge && x > 0 && !*(p-1) ) edge = true;
-					if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
-					if ( !edge && y > 0 && !*(p-width) ) edge = true;
-					if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
-				}
-				if ( edge )
-				{
-					*phigh = colour;
-				}
-			}
-		}
-	}
-	else if ( p_colours == ZM_COLOUR_RGB24 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			const uint8_t* p = buffer + (y * width) + lo_x;
-			uint8_t* phigh = high_buff + (((y * width) + lo_x) * 3);
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh += 3 )
-			{
-				bool edge = false;
-				if ( *p )
-				{
-					if ( !edge && x > 0 && !*(p-1) ) edge = true;
-					if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
-					if ( !edge && y > 0 && !*(p-width) ) edge = true;
-					if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
-				}
-				if ( edge )
-				{
-					RED_PTR_RGBA(phigh) = RED_VAL_RGBA(colour);
-					GREEN_PTR_RGBA(phigh) = GREEN_VAL_RGBA(colour);
-					BLUE_PTR_RGBA(phigh) = BLUE_VAL_RGBA(colour);
-				}
-			}
-		}
-	}
-	else if ( p_colours == ZM_COLOUR_RGB32 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			const uint8_t* p = buffer + (y * width) + lo_x;
-			Rgb* phigh = (Rgb*)(high_buff + (((y * width) + lo_x) * 4));
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ )
-			{
-				bool edge = false;
-				if ( *p )
-				{
-					if ( !edge && x > 0 && !*(p-1) ) edge = true;
-					if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
-					if ( !edge && y > 0 && !*(p-width) ) edge = true;
-					if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
-				}
-				if ( edge )
-				{
-					*phigh = colour;
-				}
-			}
-		}
-	}
-	
-	return( high_image );
+  unsigned int lo_x = limits?limits->Lo().X():0;
+  unsigned int lo_y = limits?limits->Lo().Y():0;
+  unsigned int hi_x = limits?limits->Hi().X():width-1;
+  unsigned int hi_y = limits?limits->Hi().Y():height-1;
+  
+  if ( p_colours == ZM_COLOUR_GRAY8 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      const uint8_t* p = buffer + (y * width) + lo_x;
+      uint8_t* phigh = high_buff + (y * width) + lo_x;
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ )
+      {
+        bool edge = false;
+        if ( *p )
+        {
+          if ( !edge && x > 0 && !*(p-1) ) edge = true;
+          if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
+          if ( !edge && y > 0 && !*(p-width) ) edge = true;
+          if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
+        }
+        if ( edge )
+        {
+          *phigh = colour;
+        }
+      }
+    }
+  }
+  else if ( p_colours == ZM_COLOUR_RGB24 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      const uint8_t* p = buffer + (y * width) + lo_x;
+      uint8_t* phigh = high_buff + (((y * width) + lo_x) * 3);
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh += 3 )
+      {
+        bool edge = false;
+        if ( *p )
+        {
+          if ( !edge && x > 0 && !*(p-1) ) edge = true;
+          if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
+          if ( !edge && y > 0 && !*(p-width) ) edge = true;
+          if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
+        }
+        if ( edge )
+        {
+          RED_PTR_RGBA(phigh) = RED_VAL_RGBA(colour);
+          GREEN_PTR_RGBA(phigh) = GREEN_VAL_RGBA(colour);
+          BLUE_PTR_RGBA(phigh) = BLUE_VAL_RGBA(colour);
+        }
+      }
+    }
+  }
+  else if ( p_colours == ZM_COLOUR_RGB32 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      const uint8_t* p = buffer + (y * width) + lo_x;
+      Rgb* phigh = (Rgb*)(high_buff + (((y * width) + lo_x) * 4));
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++, phigh++ )
+      {
+        bool edge = false;
+        if ( *p )
+        {
+          if ( !edge && x > 0 && !*(p-1) ) edge = true;
+          if ( !edge && x < (width-1) && !*(p+1) ) edge = true;
+          if ( !edge && y > 0 && !*(p-width) ) edge = true;
+          if ( !edge && y < (height-1) && !*(p+width) ) edge = true;
+        }
+        if ( edge )
+        {
+          *phigh = colour;
+        }
+      }
+    }
+  }
+  
+  return( high_image );
 }
 
 bool Image::ReadRaw( const char *filename )
 {
-	FILE *infile;
-	if ( (infile = fopen( filename, "rb" )) == NULL )
-	{
-		Error( "Can't open %s: %s", filename, strerror(errno) );
-		return( false );
-	}
+  FILE *infile;
+  if ( (infile = fopen( filename, "rb" )) == NULL )
+  {
+    Error( "Can't open %s: %s", filename, strerror(errno) );
+    return( false );
+  }
 
-	struct stat statbuf;
-	if ( fstat( fileno(infile), &statbuf ) < 0 )
-	{
-		Error( "Can't fstat %s: %s", filename, strerror(errno) );
-		return( false );
-	}
+  struct stat statbuf;
+  if ( fstat( fileno(infile), &statbuf ) < 0 )
+  {
+    Error( "Can't fstat %s: %s", filename, strerror(errno) );
+    return( false );
+  }
 
-	if ( statbuf.st_size != size )
-	{
-		Error( "Raw file size mismatch, expected %d bytes, found %ld", size, statbuf.st_size );
-		return( false );
-	}
+  if ( statbuf.st_size != size )
+  {
+    Error( "Raw file size mismatch, expected %d bytes, found %ld", size, statbuf.st_size );
+    return( false );
+  }
 
-	if ( fread( buffer, size, 1, infile ) < 1 )
-    {
-        Fatal( "Unable to read from '%s': %s", filename, strerror(errno) );
-        return( false );
-    }
+  if ( fread( buffer, size, 1, infile ) < 1 )
+  {
+    Fatal( "Unable to read from '%s': %s", filename, strerror(errno) );
+    return( false );
+  }
 
-	fclose( infile );
+  fclose( infile );
 
-	return( true );
+  return( true );
 }
 
 bool Image::WriteRaw( const char *filename ) const
 {
-	FILE *outfile;
-	if ( (outfile = fopen( filename, "wb" )) == NULL )
-	{
-		Error( "Can't open %s: %s", filename, strerror(errno) );
-		return( false );
-	}
+  FILE *outfile;
+  if ( (outfile = fopen( filename, "wb" )) == NULL )
+  {
+    Error( "Can't open %s: %s", filename, strerror(errno) );
+    return( false );
+  }
 
-	if ( fwrite( buffer, size, 1, outfile ) != 1 )
-    {
-        Error( "Unable to write to '%s': %s", filename, strerror(errno) );
-        return( false );
-    }
+  if ( fwrite( buffer, size, 1, outfile ) != 1 )
+  {
+    Error( "Unable to write to '%s': %s", filename, strerror(errno) );
+    return( false );
+  }
 
-	fclose( outfile );
+  fclose( outfile );
 
-	return( true );
+  return( true );
 }
 
 bool Image::ReadJpeg( const char *filename, unsigned int p_colours, unsigned int p_subpixelorder)
 {
-	unsigned int new_width, new_height, new_colours, new_subpixelorder;
-	struct jpeg_decompress_struct *cinfo = jpg_dcinfo;
+  unsigned int new_width, new_height, new_colours, new_subpixelorder;
+  struct jpeg_decompress_struct *cinfo = jpg_dcinfo;
 
-	if ( !cinfo )
-	{
-		cinfo = jpg_dcinfo = new jpeg_decompress_struct;
-		cinfo->err = jpeg_std_error( &jpg_err.pub );
-		jpg_err.pub.error_exit = zm_jpeg_error_exit;
-		jpg_err.pub.emit_message = zm_jpeg_emit_message;
-		jpeg_create_decompress( cinfo );
-	}
+  if ( !cinfo )
+  {
+    cinfo = jpg_dcinfo = new jpeg_decompress_struct;
+    cinfo->err = jpeg_std_error( &jpg_err.pub );
+    jpg_err.pub.error_exit = zm_jpeg_error_exit;
+    jpg_err.pub.emit_message = zm_jpeg_emit_message;
+    jpeg_create_decompress( cinfo );
+  }
 
-	FILE *infile;
-	if ( (infile = fopen( filename, "rb" )) == NULL )
-	{
-		Error( "Can't open %s: %s", filename, strerror(errno) );
-		return( false );
-	}
+  FILE *infile;
+  if ( (infile = fopen( filename, "rb" )) == NULL )
+  {
+    Error( "Can't open %s: %s", filename, strerror(errno) );
+    return( false );
+  }
 
-	if ( setjmp( jpg_err.setjmp_buffer ) )
-	{
-		jpeg_abort_decompress( cinfo );
-		fclose( infile );
-		return( false );
-	}
+  if ( setjmp( jpg_err.setjmp_buffer ) )
+  {
+    jpeg_abort_decompress( cinfo );
+    fclose( infile );
+    return( false );
+  }
 
-	jpeg_stdio_src( cinfo, infile );
+  jpeg_stdio_src( cinfo, infile );
 
-	jpeg_read_header( cinfo, TRUE );
+  jpeg_read_header( cinfo, TRUE );
 
-	if ( cinfo->num_components != 1 && cinfo->num_components != 3 )
-	{
-		Error( "Unexpected colours when reading jpeg image: %d", colours );
-		jpeg_abort_decompress( cinfo );
-		fclose( infile );
-		return( false );
-	}
-	
-	/* Check if the image has at least one huffman table defined. If not, use the standard ones */
-	/* This is required for the MJPEG capture palette of USB devices */
-	if(cinfo->dc_huff_tbl_ptrs[0] == NULL) {
-		zm_use_std_huff_tables(cinfo);
-	}
+  if ( cinfo->num_components != 1 && cinfo->num_components != 3 )
+  {
+    Error( "Unexpected colours when reading jpeg image: %d", colours );
+    jpeg_abort_decompress( cinfo );
+    fclose( infile );
+    return( false );
+  }
+  
+  /* Check if the image has at least one huffman table defined. If not, use the standard ones */
+  /* This is required for the MJPEG capture palette of USB devices */
+  if(cinfo->dc_huff_tbl_ptrs[0] == NULL) {
+    zm_use_std_huff_tables(cinfo);
+  }
 
-	new_width = cinfo->image_width;
-	new_height = cinfo->image_height;
+  new_width = cinfo->image_width;
+  new_height = cinfo->image_height;
 
-	if ( width != new_width || height != new_height )
-	{
-		Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
-	}
-	
-	switch(p_colours) {
-	  case ZM_COLOUR_GRAY8:
-	  {
-	    cinfo->out_color_space = JCS_GRAYSCALE;
-	    new_colours = ZM_COLOUR_GRAY8;
-	    new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
+  if ( width != new_width || height != new_height )
+  {
+    Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
+  }
+  
+  switch(p_colours) {
+    case ZM_COLOUR_GRAY8:
+    {
+    cinfo->out_color_space = JCS_GRAYSCALE;
+    new_colours = ZM_COLOUR_GRAY8;
+    new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
 #ifdef JCS_EXTENSIONS
-	    new_colours = ZM_COLOUR_RGB32;
-	    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      cinfo->out_color_space = JCS_EXT_BGRX;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-	    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      cinfo->out_color_space = JCS_EXT_XRGB;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-	    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      cinfo->out_color_space = JCS_EXT_XBGR;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
-	    } else {
-	      /* Assume RGBA */
-	      cinfo->out_color_space = JCS_EXT_RGBX;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-	    }
-	    break;      
+    new_colours = ZM_COLOUR_RGB32;
+    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      cinfo->out_color_space = JCS_EXT_BGRX;
+      new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      cinfo->out_color_space = JCS_EXT_XRGB;
+      new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
+    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      cinfo->out_color_space = JCS_EXT_XBGR;
+      new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
+    } else {
+      /* Assume RGBA */
+      cinfo->out_color_space = JCS_EXT_RGBX;
+      new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+    }
+    break;    
 #else
-	    Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
+    Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
 #endif
-	  }
-	  case ZM_COLOUR_RGB24:
-	  default:
-	  {
-	    new_colours = ZM_COLOUR_RGB24;
-	    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS      
-	      cinfo->out_color_space = JCS_EXT_BGR;    
-	      new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
+    }
+    case ZM_COLOUR_RGB24:
+    default:
+    {
+    new_colours = ZM_COLOUR_RGB24;
+    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+#ifdef JCS_EXTENSIONS    
+      cinfo->out_color_space = JCS_EXT_BGR;  
+      new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
-	      Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");      
-	      cinfo->out_color_space = JCS_RGB;    
-	      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+      Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");    
+      cinfo->out_color_space = JCS_RGB;  
+      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
 #endif
-	    } else {
-	      /* Assume RGB */
+    } else {
+      /* Assume RGB */
 /*
 #ifdef JCS_EXTENSIONS
-	      cinfo->out_color_space = JCS_EXT_RGB;
+      cinfo->out_color_space = JCS_EXT_RGB;
 #else
-	      cinfo->out_color_space = JCS_RGB;
+      cinfo->out_color_space = JCS_RGB;
 #endif
 */
-	      cinfo->out_color_space = JCS_RGB;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
-	    }
-	    break;
-	  }
-	}
-	
-	if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
-		Error("Failed requesting writeable buffer for reading JPEG image.");
-		jpeg_abort_decompress( cinfo );
-		fclose( infile );
-		return( false );
-	}
+      cinfo->out_color_space = JCS_RGB;
+      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+    }
+    break;
+    }
+  }
+  
+  if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
+    Error("Failed requesting writeable buffer for reading JPEG image.");
+    jpeg_abort_decompress( cinfo );
+    fclose( infile );
+    return( false );
+  }
 
-	jpeg_start_decompress( cinfo );
+  jpeg_start_decompress( cinfo );
 
-	JSAMPROW row_pointer;	/* pointer to a single row */
-	int row_stride = width * colours; /* physical row width in buffer */
-	while ( cinfo->output_scanline < cinfo->output_height )
-	{
-		row_pointer = &buffer[cinfo->output_scanline * row_stride];
-		jpeg_read_scanlines( cinfo, &row_pointer, 1 );
-	}
+  JSAMPROW row_pointer;  /* pointer to a single row */
+  int row_stride = width * colours; /* physical row width in buffer */
+  while ( cinfo->output_scanline < cinfo->output_height )
+  {
+    row_pointer = &buffer[cinfo->output_scanline * row_stride];
+    jpeg_read_scanlines( cinfo, &row_pointer, 1 );
+  }
 
-	jpeg_finish_decompress( cinfo );
+  jpeg_finish_decompress( cinfo );
 
-	fclose( infile );
+  fclose( infile );
 
-	return( true );
+  return( true );
 }
 
 // Multiple calling formats to permit inclusion (or not) of both quality_override and timestamp (exif), with suitable defaults.
@@ -793,2326 +793,2326 @@ bool Image::ReadJpeg( const char *filename, unsigned int p_colours, unsigned int
 
 bool Image::WriteJpeg( const char *filename, int quality_override) const
 {
-    return Image::WriteJpeg(filename, quality_override, (timeval){0,0});
+  return Image::WriteJpeg(filename, quality_override, (timeval){0,0});
 }
 bool Image::WriteJpeg( const char *filename) const
 {
-    return Image::WriteJpeg(filename, 0, (timeval){0,0});
+  return Image::WriteJpeg(filename, 0, (timeval){0,0});
 }
 bool Image::WriteJpeg( const char *filename, struct timeval timestamp ) const
 {
-    return Image::WriteJpeg(filename,0,timestamp);
+  return Image::WriteJpeg(filename,0,timestamp);
 }
 
 bool Image::WriteJpeg( const char *filename, int quality_override, struct timeval timestamp  ) const
 {
-	if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
-	{
-		Image temp_image( *this );
-		temp_image.Colourise( ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
-		return( temp_image.WriteJpeg( filename, quality_override, timestamp) );
-	}
-	int quality = quality_override?quality_override:config.jpeg_file_quality;
+  if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
+  {
+    Image temp_image( *this );
+    temp_image.Colourise( ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
+    return( temp_image.WriteJpeg( filename, quality_override, timestamp) );
+  }
+  int quality = quality_override?quality_override:config.jpeg_file_quality;
 
-	struct jpeg_compress_struct *cinfo = jpg_ccinfo[quality];
+  struct jpeg_compress_struct *cinfo = jpg_ccinfo[quality];
 
-	if ( !cinfo )
-	{
-		cinfo = jpg_ccinfo[quality] = new jpeg_compress_struct;
-		cinfo->err = jpeg_std_error( &jpg_err.pub );
-		jpg_err.pub.error_exit = zm_jpeg_error_exit;
-		jpg_err.pub.emit_message = zm_jpeg_emit_message;
-		jpeg_create_compress( cinfo );
-	}
+  if ( !cinfo )
+  {
+    cinfo = jpg_ccinfo[quality] = new jpeg_compress_struct;
+    cinfo->err = jpeg_std_error( &jpg_err.pub );
+    jpg_err.pub.error_exit = zm_jpeg_error_exit;
+    jpg_err.pub.emit_message = zm_jpeg_emit_message;
+    jpeg_create_compress( cinfo );
+  }
 
-	FILE *outfile;
-	if ( (outfile = fopen( filename, "wb" )) == NULL )
-	{
-		Error( "Can't open %s: %s", filename, strerror(errno) );
-		return( false );
-	}
-	jpeg_stdio_dest( cinfo, outfile );
+  FILE *outfile;
+  if ( (outfile = fopen( filename, "wb" )) == NULL )
+  {
+    Error( "Can't open %s: %s", filename, strerror(errno) );
+    return( false );
+  }
+  jpeg_stdio_dest( cinfo, outfile );
 
-	cinfo->image_width = width; 	/* image width and height, in pixels */
-	cinfo->image_height = height;
-	
-	switch(colours) {
-	  case ZM_COLOUR_GRAY8:
-	  {
-	    cinfo->input_components = 1;
-	    cinfo->in_color_space = JCS_GRAYSCALE;
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
+  cinfo->image_width = width;   /* image width and height, in pixels */
+  cinfo->image_height = height;
+  
+  switch(colours) {
+    case ZM_COLOUR_GRAY8:
+    {
+    cinfo->input_components = 1;
+    cinfo->in_color_space = JCS_GRAYSCALE;
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
 #ifdef JCS_EXTENSIONS
-	    cinfo->input_components = 4;
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      cinfo->in_color_space = JCS_EXT_BGRX;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      cinfo->in_color_space = JCS_EXT_XRGB;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      cinfo->in_color_space = JCS_EXT_XBGR;
-	    } else {
-	      /* Assume RGBA */
-	      cinfo->in_color_space = JCS_EXT_RGBX;
-	    }  
+    cinfo->input_components = 4;
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      cinfo->in_color_space = JCS_EXT_BGRX;
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      cinfo->in_color_space = JCS_EXT_XRGB;
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      cinfo->in_color_space = JCS_EXT_XBGR;
+    } else {
+      /* Assume RGBA */
+      cinfo->in_color_space = JCS_EXT_RGBX;
+    }  
 #else
-	    Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
-	    jpeg_abort_compress( cinfo );
-	    fclose(outfile);
-	    return(false);
+    Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
+    jpeg_abort_compress( cinfo );
+    fclose(outfile);
+    return(false);
 #endif
-	    break;
-	  }
-	  case ZM_COLOUR_RGB24:
-	  default:
-	  {
-	    cinfo->input_components = 3;
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+    break;
+    }
+    case ZM_COLOUR_RGB24:
+    default:
+    {
+    cinfo->input_components = 3;
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
 #ifdef JCS_EXTENSIONS   
-	      cinfo->in_color_space = JCS_EXT_BGR;
+      cinfo->in_color_space = JCS_EXT_BGR;
 #else
-	      Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
-	      jpeg_abort_compress( cinfo );
-	      fclose(outfile);
-	      return(false);                                                                                  
+      Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
+      jpeg_abort_compress( cinfo );
+      fclose(outfile);
+      return(false);                                          
 #endif
-	    } else {
-	      /* Assume RGB */
+    } else {
+      /* Assume RGB */
 /*
 #ifdef JCS_EXTENSIONS
-	      cinfo->out_color_space = JCS_EXT_RGB;
+      cinfo->out_color_space = JCS_EXT_RGB;
 #else
-	      cinfo->out_color_space = JCS_RGB;
+      cinfo->out_color_space = JCS_RGB;
 #endif
 */
-	      cinfo->in_color_space = JCS_RGB;
-	    }
-	    break;
-	  }
-	}
-	
-	jpeg_set_defaults( cinfo );
-	jpeg_set_quality( cinfo, quality, FALSE );
-	cinfo->dct_method = JDCT_FASTEST;
+      cinfo->in_color_space = JCS_RGB;
+    }
+    break;
+    }
+  }
+  
+  jpeg_set_defaults( cinfo );
+  jpeg_set_quality( cinfo, quality, FALSE );
+  cinfo->dct_method = JDCT_FASTEST;
 
-	jpeg_start_compress( cinfo, TRUE );
-	if ( config.add_jpeg_comments && text[0] )
-	{
-		jpeg_write_marker( cinfo, JPEG_COM, (const JOCTET *)text, strlen(text) );
-	}
-        // If we have a non-zero time (meaning a parameter was passed in), then form a simple exif segment with that time as DateTimeOriginal and SubsecTimeOriginal
-        // No timestamp just leave off the exif section.
-        if(timestamp.tv_sec)
-        {
-            #define EXIFTIMES_MS_OFFSET 0x36   // three decimal digits for milliseconds
-            #define EXIFTIMES_MS_LEN    0x03
-            #define EXIFTIMES_OFFSET    0x3E   // 19 characters format '2015:07:21 13:14:45' not including quotes
-            #define EXIFTIMES_LEN       0x13   // = 19
-            #define EXIF_CODE           0xE1
+  jpeg_start_compress( cinfo, TRUE );
+  if ( config.add_jpeg_comments && text[0] )
+  {
+    jpeg_write_marker( cinfo, JPEG_COM, (const JOCTET *)text, strlen(text) );
+  }
+    // If we have a non-zero time (meaning a parameter was passed in), then form a simple exif segment with that time as DateTimeOriginal and SubsecTimeOriginal
+    // No timestamp just leave off the exif section.
+    if(timestamp.tv_sec)
+    {
+      #define EXIFTIMES_MS_OFFSET 0x36   // three decimal digits for milliseconds
+      #define EXIFTIMES_MS_LEN  0x03
+      #define EXIFTIMES_OFFSET  0x3E   // 19 characters format '2015:07:21 13:14:45' not including quotes
+      #define EXIFTIMES_LEN     0x13   // = 19
+      #define EXIF_CODE       0xE1
 
-            char timebuf[64], msbuf[64];
-            strftime(timebuf, sizeof timebuf, "%Y:%m:%d %H:%M:%S", localtime(&(timestamp.tv_sec)));
-            snprintf(msbuf, sizeof msbuf, "%06d",(int)(timestamp.tv_usec));  // we only use milliseconds because that's all defined in exif, but this is the whole microseconds because we have it
-            unsigned char exiftimes[82] = {
-                 0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
-                 0x69, 0x87, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-                 0x02, 0x00, 0x03, 0x90, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x91, 0x92,
-                 0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
-                 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
-                 0xff, 0x00 };
-            memcpy(&exiftimes[EXIFTIMES_OFFSET],    timebuf,EXIFTIMES_LEN);
-            memcpy(&exiftimes[EXIFTIMES_MS_OFFSET], msbuf  ,EXIFTIMES_MS_LEN);
-            jpeg_write_marker (cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes) );
-        }
+      char timebuf[64], msbuf[64];
+      strftime(timebuf, sizeof timebuf, "%Y:%m:%d %H:%M:%S", localtime(&(timestamp.tv_sec)));
+      snprintf(msbuf, sizeof msbuf, "%06d",(int)(timestamp.tv_usec));  // we only use milliseconds because that's all defined in exif, but this is the whole microseconds because we have it
+      unsigned char exiftimes[82] = {
+         0x45, 0x78, 0x69, 0x66, 0x00, 0x00, 0x49, 0x49, 0x2A, 0x00, 0x08, 0x00, 0x00, 0x00, 0x01, 0x00,
+         0x69, 0x87, 0x04, 0x00, 0x01, 0x00, 0x00, 0x00, 0x1A, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
+         0x02, 0x00, 0x03, 0x90, 0x02, 0x00, 0x14, 0x00, 0x00, 0x00, 0x38, 0x00, 0x00, 0x00, 0x91, 0x92,
+         0x02, 0x00, 0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0xff, 0x00, 0x00, 0x00, 0x00, 0x00, 0xff, 0xff,
+         0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff,
+         0xff, 0x00 };
+      memcpy(&exiftimes[EXIFTIMES_OFFSET],  timebuf,EXIFTIMES_LEN);
+      memcpy(&exiftimes[EXIFTIMES_MS_OFFSET], msbuf  ,EXIFTIMES_MS_LEN);
+      jpeg_write_marker (cinfo, EXIF_CODE, (const JOCTET *)exiftimes, sizeof(exiftimes) );
+    }
 
-	JSAMPROW row_pointer;	/* pointer to a single row */
-	int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
-	while ( cinfo->next_scanline < cinfo->image_height )
-	{
-		row_pointer = &buffer[cinfo->next_scanline * row_stride];
-		jpeg_write_scanlines( cinfo, &row_pointer, 1 );
-	}
+  JSAMPROW row_pointer;  /* pointer to a single row */
+  int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
+  while ( cinfo->next_scanline < cinfo->image_height )
+  {
+    row_pointer = &buffer[cinfo->next_scanline * row_stride];
+    jpeg_write_scanlines( cinfo, &row_pointer, 1 );
+  }
 
-	jpeg_finish_compress( cinfo );
+  jpeg_finish_compress( cinfo );
 
-	fclose( outfile );
+  fclose( outfile );
 
-	return( true );
+  return( true );
 }
 
 bool Image::DecodeJpeg( const JOCTET *inbuffer, int inbuffer_size, unsigned int p_colours, unsigned int p_subpixelorder)
 {
-	unsigned int new_width, new_height, new_colours, new_subpixelorder;
-	struct jpeg_decompress_struct *cinfo = jpg_dcinfo;
+  unsigned int new_width, new_height, new_colours, new_subpixelorder;
+  struct jpeg_decompress_struct *cinfo = jpg_dcinfo;
 
-	if ( !cinfo )
-	{
-		cinfo = jpg_dcinfo = new jpeg_decompress_struct;
-		cinfo->err = jpeg_std_error( &jpg_err.pub );
-		jpg_err.pub.error_exit = zm_jpeg_error_exit;
-		jpg_err.pub.emit_message = zm_jpeg_emit_message;
-		jpeg_create_decompress( cinfo );
-	}
+  if ( !cinfo )
+  {
+    cinfo = jpg_dcinfo = new jpeg_decompress_struct;
+    cinfo->err = jpeg_std_error( &jpg_err.pub );
+    jpg_err.pub.error_exit = zm_jpeg_error_exit;
+    jpg_err.pub.emit_message = zm_jpeg_emit_message;
+    jpeg_create_decompress( cinfo );
+  }
 
-	if ( setjmp( jpg_err.setjmp_buffer ) )
-	{
-		jpeg_abort_decompress( cinfo );
-		return( false );
-	}
+  if ( setjmp( jpg_err.setjmp_buffer ) )
+  {
+    jpeg_abort_decompress( cinfo );
+    return( false );
+  }
 
-	zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
+  zm_jpeg_mem_src( cinfo, inbuffer, inbuffer_size );
 
-	jpeg_read_header( cinfo, TRUE );
+  jpeg_read_header( cinfo, TRUE );
 
-	if ( cinfo->num_components != 1 && cinfo->num_components != 3 )
-	{
-		Error( "Unexpected colours when reading jpeg image: %d", colours );
-		jpeg_abort_decompress( cinfo );
-		return( false );
-	}
-	
-	/* Check if the image has at least one huffman table defined. If not, use the standard ones */
-	/* This is required for the MJPEG capture palette of USB devices */
-	if(cinfo->dc_huff_tbl_ptrs[0] == NULL) {
-		zm_use_std_huff_tables(cinfo);
-	}
+  if ( cinfo->num_components != 1 && cinfo->num_components != 3 )
+  {
+    Error( "Unexpected colours when reading jpeg image: %d", colours );
+    jpeg_abort_decompress( cinfo );
+    return( false );
+  }
+  
+  /* Check if the image has at least one huffman table defined. If not, use the standard ones */
+  /* This is required for the MJPEG capture palette of USB devices */
+  if(cinfo->dc_huff_tbl_ptrs[0] == NULL) {
+    zm_use_std_huff_tables(cinfo);
+  }
 
-	new_width = cinfo->image_width;
-	new_height = cinfo->image_height;
+  new_width = cinfo->image_width;
+  new_height = cinfo->image_height;
 
-	if ( width != new_width || height != new_height )
-	{
-		Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
-	}
-	
-	switch(p_colours) {
-	  case ZM_COLOUR_GRAY8:
-	  {
-	    cinfo->out_color_space = JCS_GRAYSCALE;
-	    new_colours = ZM_COLOUR_GRAY8;
-	    new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
+  if ( width != new_width || height != new_height )
+  {
+    Debug(9,"Image dimensions differ. Old: %ux%u New: %ux%u",width,height,new_width,new_height);
+  }
+  
+  switch(p_colours) {
+    case ZM_COLOUR_GRAY8:
+    {
+    cinfo->out_color_space = JCS_GRAYSCALE;
+    new_colours = ZM_COLOUR_GRAY8;
+    new_subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
 #ifdef JCS_EXTENSIONS
-	    new_colours = ZM_COLOUR_RGB32;
-	    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      cinfo->out_color_space = JCS_EXT_BGRX;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-	    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      cinfo->out_color_space = JCS_EXT_XRGB;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-	    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      cinfo->out_color_space = JCS_EXT_XBGR;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
-	    } else {
-	      /* Assume RGBA */
-	      cinfo->out_color_space = JCS_EXT_RGBX;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-	    }
-	    break;      
+    new_colours = ZM_COLOUR_RGB32;
+    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      cinfo->out_color_space = JCS_EXT_BGRX;
+      new_subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      cinfo->out_color_space = JCS_EXT_XRGB;
+      new_subpixelorder = ZM_SUBPIX_ORDER_ARGB;
+    } else if(p_subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      cinfo->out_color_space = JCS_EXT_XBGR;
+      new_subpixelorder = ZM_SUBPIX_ORDER_ABGR;
+    } else {
+      /* Assume RGBA */
+      cinfo->out_color_space = JCS_EXT_RGBX;
+      new_subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+    }
+    break;    
 #else
-	    Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
+    Warning("libjpeg-turbo is required for reading a JPEG directly into a RGB32 buffer, reading into a RGB24 buffer instead.");
 #endif
-	  }
-	  case ZM_COLOUR_RGB24:
-	  default:
-	  {
-	    new_colours = ZM_COLOUR_RGB24;
-	    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-#ifdef JCS_EXTENSIONS      
-	      cinfo->out_color_space = JCS_EXT_BGR;    
-	      new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
+    }
+    case ZM_COLOUR_RGB24:
+    default:
+    {
+    new_colours = ZM_COLOUR_RGB24;
+    if(p_subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+#ifdef JCS_EXTENSIONS    
+      cinfo->out_color_space = JCS_EXT_BGR;  
+      new_subpixelorder = ZM_SUBPIX_ORDER_BGR;
 #else
-	      Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");      
-	      cinfo->out_color_space = JCS_RGB;    
-	      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+      Warning("libjpeg-turbo is required for reading a JPEG directly into a BGR24 buffer, reading into a RGB24 buffer instead.");    
+      cinfo->out_color_space = JCS_RGB;  
+      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
 #endif
-	    } else {
-	      /* Assume RGB */
+    } else {
+      /* Assume RGB */
 /*
 #ifdef JCS_EXTENSIONS
-	      cinfo->out_color_space = JCS_EXT_RGB;
+      cinfo->out_color_space = JCS_EXT_RGB;
 #else
-	      cinfo->out_color_space = JCS_RGB;
+      cinfo->out_color_space = JCS_RGB;
 #endif
 */
-	      cinfo->out_color_space = JCS_RGB;
-	      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
-	    }
-	    break;
-	  }
-	}
-	
-	if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
-		Error("Failed requesting writeable buffer for reading JPEG image.");
-		jpeg_abort_decompress( cinfo );
-		return( false );
-	}
+      cinfo->out_color_space = JCS_RGB;
+      new_subpixelorder = ZM_SUBPIX_ORDER_RGB;
+    }
+    break;
+    }
+  }
+  
+  if(WriteBuffer(new_width, new_height, new_colours, new_subpixelorder) == NULL) {
+    Error("Failed requesting writeable buffer for reading JPEG image.");
+    jpeg_abort_decompress( cinfo );
+    return( false );
+  }
 
-	jpeg_start_decompress( cinfo );
+  jpeg_start_decompress( cinfo );
 
-	JSAMPROW row_pointer;	/* pointer to a single row */
-	int row_stride = width * colours; /* physical row width in buffer */
-	while ( cinfo->output_scanline < cinfo->output_height )
-	{
-		row_pointer = &buffer[cinfo->output_scanline * row_stride];
-		jpeg_read_scanlines( cinfo, &row_pointer, 1 );
-	}
+  JSAMPROW row_pointer;  /* pointer to a single row */
+  int row_stride = width * colours; /* physical row width in buffer */
+  while ( cinfo->output_scanline < cinfo->output_height )
+  {
+    row_pointer = &buffer[cinfo->output_scanline * row_stride];
+    jpeg_read_scanlines( cinfo, &row_pointer, 1 );
+  }
 
-	jpeg_finish_decompress( cinfo );
+  jpeg_finish_decompress( cinfo );
 
-	return( true );
+  return( true );
 }
 
 bool Image::EncodeJpeg( JOCTET *outbuffer, int *outbuffer_size, int quality_override ) const
 {
-	if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
-	{
-		Image temp_image( *this );
-		temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
-		return( temp_image.EncodeJpeg( outbuffer, outbuffer_size, quality_override ) );
-	}
+  if ( config.colour_jpeg_files && colours == ZM_COLOUR_GRAY8 )
+  {
+    Image temp_image( *this );
+    temp_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
+    return( temp_image.EncodeJpeg( outbuffer, outbuffer_size, quality_override ) );
+  }
 
-	int quality = quality_override?quality_override:config.jpeg_stream_quality;
+  int quality = quality_override?quality_override:config.jpeg_stream_quality;
 
-	struct jpeg_compress_struct *cinfo = jpg_ccinfo[quality];
+  struct jpeg_compress_struct *cinfo = jpg_ccinfo[quality];
 
-	if ( !cinfo )
-	{
-		cinfo = jpg_ccinfo[quality] = new jpeg_compress_struct;
-		cinfo->err = jpeg_std_error( &jpg_err.pub );
-		jpg_err.pub.error_exit = zm_jpeg_error_exit;
-		jpg_err.pub.emit_message = zm_jpeg_emit_message;
-		jpeg_create_compress( cinfo );
-	}
+  if ( !cinfo )
+  {
+    cinfo = jpg_ccinfo[quality] = new jpeg_compress_struct;
+    cinfo->err = jpeg_std_error( &jpg_err.pub );
+    jpg_err.pub.error_exit = zm_jpeg_error_exit;
+    jpg_err.pub.emit_message = zm_jpeg_emit_message;
+    jpeg_create_compress( cinfo );
+  }
 
-	zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
+  zm_jpeg_mem_dest( cinfo, outbuffer, outbuffer_size );
 
-	cinfo->image_width = width; 	/* image width and height, in pixels */
-	cinfo->image_height = height;
+  cinfo->image_width = width;   /* image width and height, in pixels */
+  cinfo->image_height = height;
 
-	switch(colours) {
-	  case ZM_COLOUR_GRAY8:
-	  {
-	    cinfo->input_components = 1;
-	    cinfo->in_color_space = JCS_GRAYSCALE;
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
+  switch(colours) {
+    case ZM_COLOUR_GRAY8:
+    {
+    cinfo->input_components = 1;
+    cinfo->in_color_space = JCS_GRAYSCALE;
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
 #ifdef JCS_EXTENSIONS
-	    cinfo->input_components = 4;
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      cinfo->in_color_space = JCS_EXT_BGRX;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      cinfo->in_color_space = JCS_EXT_XRGB;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      cinfo->in_color_space = JCS_EXT_XBGR;
-	    } else {
-	      /* Assume RGBA */
-	      cinfo->in_color_space = JCS_EXT_RGBX;
-	    } 
+    cinfo->input_components = 4;
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      cinfo->in_color_space = JCS_EXT_BGRX;
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      cinfo->in_color_space = JCS_EXT_XRGB;
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      cinfo->in_color_space = JCS_EXT_XBGR;
+    } else {
+      /* Assume RGBA */
+      cinfo->in_color_space = JCS_EXT_RGBX;
+    } 
 #else
-	    Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
-	    jpeg_abort_compress( cinfo );
-	    return(false);
+    Error("libjpeg-turbo is required for JPEG encoding directly from RGB32 source");
+    jpeg_abort_compress( cinfo );
+    return(false);
 #endif
-	    break;
-	  }
-	  case ZM_COLOUR_RGB24:
-	  default:
-	  {
-	    cinfo->input_components = 3;
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+    break;
+    }
+    case ZM_COLOUR_RGB24:
+    default:
+    {
+    cinfo->input_components = 3;
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
 #ifdef JCS_EXTENSIONS   
-	      cinfo->in_color_space = JCS_EXT_BGR;
+      cinfo->in_color_space = JCS_EXT_BGR;
 #else
-	      Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
-	      jpeg_abort_compress( cinfo );
-	      return(false);                                                                                  
+      Error("libjpeg-turbo is required for JPEG encoding directly from BGR24 source");
+      jpeg_abort_compress( cinfo );
+      return(false);                                          
 #endif
-	    } else {
-	      /* Assume RGB */
+    } else {
+      /* Assume RGB */
 /*
 #ifdef JCS_EXTENSIONS
-	      cinfo->out_color_space = JCS_EXT_RGB;
+      cinfo->out_color_space = JCS_EXT_RGB;
 #else
-	      cinfo->out_color_space = JCS_RGB;
+      cinfo->out_color_space = JCS_RGB;
 #endif
 */
-	      cinfo->in_color_space = JCS_RGB;
-	    }
-	    break;
-	  }
-	}
-	
-	jpeg_set_defaults( cinfo );
-	jpeg_set_quality( cinfo, quality, FALSE );
-	cinfo->dct_method = JDCT_FASTEST;
+      cinfo->in_color_space = JCS_RGB;
+    }
+    break;
+    }
+  }
+  
+  jpeg_set_defaults( cinfo );
+  jpeg_set_quality( cinfo, quality, FALSE );
+  cinfo->dct_method = JDCT_FASTEST;
 
-	jpeg_start_compress( cinfo, TRUE );
+  jpeg_start_compress( cinfo, TRUE );
 
-	JSAMPROW row_pointer;	/* pointer to a single row */
-	int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
-	while ( cinfo->next_scanline < cinfo->image_height )
-	{
-		row_pointer = &buffer[cinfo->next_scanline * row_stride];
-		jpeg_write_scanlines( cinfo, &row_pointer, 1 );
-	}
+  JSAMPROW row_pointer;  /* pointer to a single row */
+  int row_stride = cinfo->image_width * colours; /* physical row width in buffer */
+  while ( cinfo->next_scanline < cinfo->image_height )
+  {
+    row_pointer = &buffer[cinfo->next_scanline * row_stride];
+    jpeg_write_scanlines( cinfo, &row_pointer, 1 );
+  }
 
-	jpeg_finish_compress( cinfo );
+  jpeg_finish_compress( cinfo );
 
-	return( true );
+  return( true );
 }
 
 #if HAVE_ZLIB_H
 bool Image::Unzip( const Bytef *inbuffer, unsigned long inbuffer_size )
 {
-	unsigned long zip_size = size;
-	int result = uncompress( buffer, &zip_size, inbuffer, inbuffer_size );
-	if ( result != Z_OK )
-	{
-		Error( "Unzip failed, result = %d", result );
-		return( false );
-	}
-	if ( zip_size != (unsigned int)size )
-	{
-		Error( "Unzip failed, size mismatch, expected %d bytes, got %ld", size, zip_size );
-		return( false );
-	}
-	return( true );
+  unsigned long zip_size = size;
+  int result = uncompress( buffer, &zip_size, inbuffer, inbuffer_size );
+  if ( result != Z_OK )
+  {
+    Error( "Unzip failed, result = %d", result );
+    return( false );
+  }
+  if ( zip_size != (unsigned int)size )
+  {
+    Error( "Unzip failed, size mismatch, expected %d bytes, got %ld", size, zip_size );
+    return( false );
+  }
+  return( true );
 }
 
 bool Image::Zip( Bytef *outbuffer, unsigned long *outbuffer_size, int compression_level ) const
 {
-	int result = compress2( outbuffer, outbuffer_size, buffer, size, compression_level );
-	if ( result != Z_OK )
-	{
-		Error( "Zip failed, result = %d", result );
-		return( false );
-	}
-	return( true );
+  int result = compress2( outbuffer, outbuffer_size, buffer, size, compression_level );
+  if ( result != Z_OK )
+  {
+    Error( "Zip failed, result = %d", result );
+    return( false );
+  }
+  return( true );
 }
 #endif // HAVE_ZLIB_H
 
 bool Image::Crop( unsigned int lo_x, unsigned int lo_y, unsigned int hi_x, unsigned int hi_y )
 {
-	unsigned int new_width = (hi_x-lo_x)+1;
-	unsigned int new_height = (hi_y-lo_y)+1;
+  unsigned int new_width = (hi_x-lo_x)+1;
+  unsigned int new_height = (hi_y-lo_y)+1;
 
-	if ( lo_x > hi_x || lo_y > hi_y )
-	{
-		Error( "Invalid or reversed crop region %d,%d -> %d,%d", lo_x, lo_y, hi_x, hi_y );
-		return( false );
-	}
-	if ( lo_x < 0 || hi_x > (width-1) || ( lo_y < 0 || hi_y > (height-1) ) )
-	{
-		Error( "Attempting to crop outside image, %d,%d -> %d,%d not in %d,%d", lo_x, lo_y, hi_x, hi_y, width-1, height-1 );
-		return( false );
-	}
+  if ( lo_x > hi_x || lo_y > hi_y )
+  {
+    Error( "Invalid or reversed crop region %d,%d -> %d,%d", lo_x, lo_y, hi_x, hi_y );
+    return( false );
+  }
+  if ( lo_x < 0 || hi_x > (width-1) || ( lo_y < 0 || hi_y > (height-1) ) )
+  {
+    Error( "Attempting to crop outside image, %d,%d -> %d,%d not in %d,%d", lo_x, lo_y, hi_x, hi_y, width-1, height-1 );
+    return( false );
+  }
 
-	if ( new_width == width && new_height == height )
-	{
-		return( true );
-	}
+  if ( new_width == width && new_height == height )
+  {
+    return( true );
+  }
 
-	unsigned int new_size = new_width*new_height*colours;
-	uint8_t *new_buffer = AllocBuffer(new_size);
-	
-	unsigned int new_stride = new_width*colours;
-	for ( unsigned int y = lo_y, ny = 0; y <= hi_y; y++, ny++ )
-	{
-		unsigned char *pbuf = &buffer[((y*width)+lo_x)*colours];
-		unsigned char *pnbuf = &new_buffer[(ny*new_width)*colours];
-		memcpy( pnbuf, pbuf, new_stride );
-	}
+  unsigned int new_size = new_width*new_height*colours;
+  uint8_t *new_buffer = AllocBuffer(new_size);
+  
+  unsigned int new_stride = new_width*colours;
+  for ( unsigned int y = lo_y, ny = 0; y <= hi_y; y++, ny++ )
+  {
+    unsigned char *pbuf = &buffer[((y*width)+lo_x)*colours];
+    unsigned char *pnbuf = &new_buffer[(ny*new_width)*colours];
+    memcpy( pnbuf, pbuf, new_stride );
+  }
 
-	AssignDirect(new_width, new_height, colours, subpixelorder, new_buffer, new_size, ZM_BUFTYPE_ZM);
+  AssignDirect(new_width, new_height, colours, subpixelorder, new_buffer, new_size, ZM_BUFTYPE_ZM);
 
-	return( true );
+  return( true );
 }
 
 bool Image::Crop( const Box &limits )
 {
-    return( Crop( limits.LoX(), limits.LoY(), limits.HiX(), limits.HiY() ) );
+  return( Crop( limits.LoX(), limits.LoY(), limits.HiX(), limits.HiY() ) );
 }
 
 /* Far from complete */
 /* Need to implement all possible of overlays possible */
 void Image::Overlay( const Image &image )
 {
-	if ( !(width == image.width && height == image.height) )
-	{
-		Panic( "Attempt to overlay different sized images, expected %dx%d, got %dx%d", width, height, image.width, image.height );
-	}
-	
-	if( colours == image.colours && subpixelorder != image.subpixelorder ) {
-		Warning("Attempt to overlay images of same format but with different subpixel order.");
-	}
-	
-	/* Grayscale ontop of grayscale - complete */
-	if ( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_GRAY8 ) {
-		const uint8_t* const max_ptr = buffer+size;
-		const uint8_t* psrc = image.buffer;
-		uint8_t* pdest = buffer;
-		
-		while( pdest < max_ptr )
-		{
-			if ( *psrc )
-			{
-				*pdest = *psrc;
-			}
-			pdest++;
-			psrc++;
-		}
-	
-	/* RGB24 ontop of grayscale - convert to same format first - complete */
-	} else if ( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_RGB24 ) {
-		Colourise(image.colours, image.subpixelorder);
-		
-		const uint8_t* const max_ptr = buffer+size;
-		const uint8_t* psrc = image.buffer;
-		uint8_t* pdest = buffer;
-		
-		while( pdest < max_ptr )
-		{
-			if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) )
-			{
-				RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
-				GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
-				BLUE_PTR_RGBA(pdest) = BLUE_PTR_RGBA(psrc);
-			}
-			pdest += 3;
-			psrc += 3;
-		}
-	
-	/* RGB32 ontop of grayscale - convert to same format first - complete */
-	} else if( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_RGB32 ) {
-		Colourise(image.colours, image.subpixelorder);
-		
-		const Rgb* const max_ptr = (Rgb*)(buffer+size);
-		const Rgb* prsrc = (Rgb*)image.buffer; 
-		Rgb* prdest = (Rgb*)buffer;
-		
-		if(subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-			/* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
-			while (prdest < max_ptr) {
-				if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) )
-				{
-					*prdest = *prsrc;
-				}
-				prdest++;
-				prsrc++;
-			}
-		} else {
-			/* ABGR\ARGB subpixel order - Alpha byte is first */
-			while (prdest < max_ptr) {
-				if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) )
-				{
-					*prdest = *prsrc;
-				}
-				prdest++;
-				prsrc++;
-			}
-		}
-	
-	/* Grayscale ontop of RGB24 - complete */
-	} else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_GRAY8 ) {
-		const uint8_t* const max_ptr = buffer+size;
-		const uint8_t* psrc = image.buffer;
-		uint8_t* pdest = buffer;
-		
-		while( pdest < max_ptr )
-		{
-			if ( *psrc )
-			{
-				RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = *psrc;
-			}
-			pdest += 3;
-			psrc++;
-		}
-	
-	/* RGB24 ontop of RGB24 - not complete. need to take care of different subpixel orders */
-	} else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_RGB24 ) {
-		const uint8_t* const max_ptr = buffer+size;
-		const uint8_t* psrc = image.buffer;
-		uint8_t* pdest = buffer;
-		
-		while( pdest < max_ptr )
-		{
-			if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) )
-			{
-				RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
-				GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
-				BLUE_PTR_RGBA(pdest) = BLUE_PTR_RGBA(psrc);
-			}
-			pdest += 3;
-			psrc += 3;
-		} 
-	
-	/* RGB32 ontop of RGB24 - TO BE DONE */
-	} else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_RGB32 ) {
-		Error("Overlay of RGB32 ontop of RGB24 is not supported.");
-	
-	/* Grayscale ontop of RGB32 - complete */
-	} else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_GRAY8 ) {
-		const Rgb* const max_ptr = (Rgb*)(buffer+size);
-		Rgb* prdest = (Rgb*)buffer;
-		const uint8_t* psrc = image.buffer;
-		
-		if(subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-			/* RGBA\BGRA subpixel order - Alpha byte is last */
-			while (prdest < max_ptr) {
-				if ( *psrc )
-				{
-					RED_PTR_RGBA(prdest) = GREEN_PTR_RGBA(prdest) = BLUE_PTR_RGBA(prdest) = *psrc;
-				}
-				prdest++;
-				psrc++;
-			}
-		} else {
-			/* ABGR\ARGB subpixel order - Alpha byte is first */
-			while (prdest < max_ptr) {
-				if ( *psrc )
-				{
-					RED_PTR_ABGR(prdest) = GREEN_PTR_ABGR(prdest) = BLUE_PTR_ABGR(prdest) = *psrc;
-				}
-				prdest++;
-				psrc++;
-			}
-		}
-	
-	/* RGB24 ontop of RGB32 - TO BE DONE */
-	} else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_RGB24 ) {
-		Error("Overlay of RGB24 ontop of RGB32 is not supported.");
-	
-	/* RGB32 ontop of RGB32 - not complete. need to take care of different subpixel orders */
-	} else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_RGB32 ) {
-		const Rgb* const max_ptr = (Rgb*)(buffer+size);
-		Rgb* prdest = (Rgb*)buffer;
-		const Rgb* prsrc = (Rgb*)image.buffer; 
-		
-		if(image.subpixelorder == ZM_SUBPIX_ORDER_RGBA || image.subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-			/* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
-			while (prdest < max_ptr) {
-				if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) )
-				{
-					*prdest = *prsrc;
-				}
-				prdest++;
-				prsrc++;
-			}
-		} else {
-			/* ABGR\ARGB subpixel order - Alpha byte is first */
-			while (prdest < max_ptr) {
-				if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) )
-				{
-					*prdest = *prsrc;
-				}
-				prdest++;
-				prsrc++;
-			}
-		}
-	}
-	
+  if ( !(width == image.width && height == image.height) )
+  {
+    Panic( "Attempt to overlay different sized images, expected %dx%d, got %dx%d", width, height, image.width, image.height );
+  }
+  
+  if( colours == image.colours && subpixelorder != image.subpixelorder ) {
+    Warning("Attempt to overlay images of same format but with different subpixel order.");
+  }
+  
+  /* Grayscale ontop of grayscale - complete */
+  if ( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_GRAY8 ) {
+    const uint8_t* const max_ptr = buffer+size;
+    const uint8_t* psrc = image.buffer;
+    uint8_t* pdest = buffer;
+    
+    while( pdest < max_ptr )
+    {
+      if ( *psrc )
+      {
+        *pdest = *psrc;
+      }
+      pdest++;
+      psrc++;
+    }
+  
+  /* RGB24 ontop of grayscale - convert to same format first - complete */
+  } else if ( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_RGB24 ) {
+    Colourise(image.colours, image.subpixelorder);
+    
+    const uint8_t* const max_ptr = buffer+size;
+    const uint8_t* psrc = image.buffer;
+    uint8_t* pdest = buffer;
+    
+    while( pdest < max_ptr )
+    {
+      if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) )
+      {
+        RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
+        GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
+        BLUE_PTR_RGBA(pdest) = BLUE_PTR_RGBA(psrc);
+      }
+      pdest += 3;
+      psrc += 3;
+    }
+  
+  /* RGB32 ontop of grayscale - convert to same format first - complete */
+  } else if( colours == ZM_COLOUR_GRAY8 && image.colours == ZM_COLOUR_RGB32 ) {
+    Colourise(image.colours, image.subpixelorder);
+    
+    const Rgb* const max_ptr = (Rgb*)(buffer+size);
+    const Rgb* prsrc = (Rgb*)image.buffer; 
+    Rgb* prdest = (Rgb*)buffer;
+    
+    if(subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
+      while (prdest < max_ptr) {
+        if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) )
+        {
+          *prdest = *prsrc;
+        }
+        prdest++;
+        prsrc++;
+      }
+    } else {
+      /* ABGR\ARGB subpixel order - Alpha byte is first */
+      while (prdest < max_ptr) {
+        if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) )
+        {
+          *prdest = *prsrc;
+        }
+        prdest++;
+        prsrc++;
+      }
+    }
+  
+  /* Grayscale ontop of RGB24 - complete */
+  } else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_GRAY8 ) {
+    const uint8_t* const max_ptr = buffer+size;
+    const uint8_t* psrc = image.buffer;
+    uint8_t* pdest = buffer;
+    
+    while( pdest < max_ptr )
+    {
+      if ( *psrc )
+      {
+        RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = *psrc;
+      }
+      pdest += 3;
+      psrc++;
+    }
+  
+  /* RGB24 ontop of RGB24 - not complete. need to take care of different subpixel orders */
+  } else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_RGB24 ) {
+    const uint8_t* const max_ptr = buffer+size;
+    const uint8_t* psrc = image.buffer;
+    uint8_t* pdest = buffer;
+    
+    while( pdest < max_ptr )
+    {
+      if ( RED_PTR_RGBA(psrc) || GREEN_PTR_RGBA(psrc) || BLUE_PTR_RGBA(psrc) )
+      {
+        RED_PTR_RGBA(pdest) = RED_PTR_RGBA(psrc);
+        GREEN_PTR_RGBA(pdest) = GREEN_PTR_RGBA(psrc);
+        BLUE_PTR_RGBA(pdest) = BLUE_PTR_RGBA(psrc);
+      }
+      pdest += 3;
+      psrc += 3;
+    } 
+  
+  /* RGB32 ontop of RGB24 - TO BE DONE */
+  } else if ( colours == ZM_COLOUR_RGB24 && image.colours == ZM_COLOUR_RGB32 ) {
+    Error("Overlay of RGB32 ontop of RGB24 is not supported.");
+  
+  /* Grayscale ontop of RGB32 - complete */
+  } else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_GRAY8 ) {
+    const Rgb* const max_ptr = (Rgb*)(buffer+size);
+    Rgb* prdest = (Rgb*)buffer;
+    const uint8_t* psrc = image.buffer;
+    
+    if(subpixelorder == ZM_SUBPIX_ORDER_RGBA || subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* RGBA\BGRA subpixel order - Alpha byte is last */
+      while (prdest < max_ptr) {
+        if ( *psrc )
+        {
+          RED_PTR_RGBA(prdest) = GREEN_PTR_RGBA(prdest) = BLUE_PTR_RGBA(prdest) = *psrc;
+        }
+        prdest++;
+        psrc++;
+      }
+    } else {
+      /* ABGR\ARGB subpixel order - Alpha byte is first */
+      while (prdest < max_ptr) {
+        if ( *psrc )
+        {
+          RED_PTR_ABGR(prdest) = GREEN_PTR_ABGR(prdest) = BLUE_PTR_ABGR(prdest) = *psrc;
+        }
+        prdest++;
+        psrc++;
+      }
+    }
+  
+  /* RGB24 ontop of RGB32 - TO BE DONE */
+  } else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_RGB24 ) {
+    Error("Overlay of RGB24 ontop of RGB32 is not supported.");
+  
+  /* RGB32 ontop of RGB32 - not complete. need to take care of different subpixel orders */
+  } else if ( colours == ZM_COLOUR_RGB32 && image.colours == ZM_COLOUR_RGB32 ) {
+    const Rgb* const max_ptr = (Rgb*)(buffer+size);
+    Rgb* prdest = (Rgb*)buffer;
+    const Rgb* prsrc = (Rgb*)image.buffer; 
+    
+    if(image.subpixelorder == ZM_SUBPIX_ORDER_RGBA || image.subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* RGB\BGR\RGBA\BGRA subpixel order - Alpha byte is last */
+      while (prdest < max_ptr) {
+        if ( RED_PTR_RGBA(prsrc) || GREEN_PTR_RGBA(prsrc) || BLUE_PTR_RGBA(prsrc) )
+        {
+          *prdest = *prsrc;
+        }
+        prdest++;
+        prsrc++;
+      }
+    } else {
+      /* ABGR\ARGB subpixel order - Alpha byte is first */
+      while (prdest < max_ptr) {
+        if ( RED_PTR_ABGR(prsrc) || GREEN_PTR_ABGR(prsrc) || BLUE_PTR_ABGR(prsrc) )
+        {
+          *prdest = *prsrc;
+        }
+        prdest++;
+        prsrc++;
+      }
+    }
+  }
+  
 }
 
 /* RGB32 compatible: complete */
 void Image::Overlay( const Image &image, unsigned int x, unsigned int y )
 {
-	if ( !(width < image.width || height < image.height) )
-    {
-        Panic( "Attempt to overlay image too big for destination, %dx%d > %dx%d", image.width, image.height, width, height );
-    }
+  if ( !(width < image.width || height < image.height) )
+  {
+    Panic( "Attempt to overlay image too big for destination, %dx%d > %dx%d", image.width, image.height, width, height );
+  }
 
-	if ( !(width < (x+image.width) || height < (y+image.height)) )
-    {
-        Panic( "Attempt to overlay image outside of destination bounds, %dx%d @ %dx%d > %dx%d", image.width, image.height, x, y, width, height );
-    }
+  if ( !(width < (x+image.width) || height < (y+image.height)) )
+  {
+    Panic( "Attempt to overlay image outside of destination bounds, %dx%d @ %dx%d > %dx%d", image.width, image.height, x, y, width, height );
+  }
 
-	if ( !(colours == image.colours) )
-    {
-        Panic( "Attempt to partial overlay differently coloured images, expected %d, got %d", colours, image.colours );
-    }
+  if ( !(colours == image.colours) )
+  {
+    Panic( "Attempt to partial overlay differently coloured images, expected %d, got %d", colours, image.colours );
+  }
 
-	unsigned int lo_x = x;
-	unsigned int lo_y = y;
-	unsigned int hi_x = (x+image.width)-1;
-	unsigned int hi_y = (y+image.height-1);
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		const uint8_t *psrc = image.buffer;
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			uint8_t *pdest = &buffer[(y*width)+lo_x];
-			for ( unsigned int x = lo_x; x <= hi_x; x++ )
-			{
-				*pdest++ = *psrc++;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		const uint8_t *psrc = image.buffer;
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			uint8_t *pdest = &buffer[colours*((y*width)+lo_x)];
-			for ( unsigned int x = lo_x; x <= hi_x; x++ )
-			{
-				*pdest++ = *psrc++;
-				*pdest++ = *psrc++;
-				*pdest++ = *psrc++;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 )
-	{
-		const Rgb *psrc = (Rgb*)(image.buffer);
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			Rgb *pdest = (Rgb*)&buffer[((y*width)+lo_x)<<2];
-			for ( unsigned int x = lo_x; x <= hi_x; x++ )
-			{
-				*pdest++ = *psrc++;
-			}
-		}
-	} else {
-		Error("Overlay called with unexpected colours: %d", colours);
-	}
-	
+  unsigned int lo_x = x;
+  unsigned int lo_y = y;
+  unsigned int hi_x = (x+image.width)-1;
+  unsigned int hi_y = (y+image.height-1);
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    const uint8_t *psrc = image.buffer;
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      uint8_t *pdest = &buffer[(y*width)+lo_x];
+      for ( unsigned int x = lo_x; x <= hi_x; x++ )
+      {
+        *pdest++ = *psrc++;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    const uint8_t *psrc = image.buffer;
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      uint8_t *pdest = &buffer[colours*((y*width)+lo_x)];
+      for ( unsigned int x = lo_x; x <= hi_x; x++ )
+      {
+        *pdest++ = *psrc++;
+        *pdest++ = *psrc++;
+        *pdest++ = *psrc++;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 )
+  {
+    const Rgb *psrc = (Rgb*)(image.buffer);
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      Rgb *pdest = (Rgb*)&buffer[((y*width)+lo_x)<<2];
+      for ( unsigned int x = lo_x; x <= hi_x; x++ )
+      {
+        *pdest++ = *psrc++;
+      }
+    }
+  } else {
+    Error("Overlay called with unexpected colours: %d", colours);
+  }
+  
 }
 
 void Image::Blend( const Image &image, int transparency )
 {
 #ifdef ZM_IMAGE_PROFILING
-	struct timespec start,end,diff;
-	unsigned long long executetime;
-	unsigned long milpixels;
+  struct timespec start,end,diff;
+  unsigned long long executetime;
+  unsigned long milpixels;
 #endif
-	uint8_t* new_buffer;
-	
-	if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) )
-	{
-		Panic( "Attempt to blend different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder );
-	}
-	
-	if(transparency <= 0)
-		return;
-	
-	new_buffer = AllocBuffer(size);
-	
+  uint8_t* new_buffer;
+  
+  if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) )
+  {
+    Panic( "Attempt to blend different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder );
+  }
+  
+  if(transparency <= 0)
+    return;
+  
+  new_buffer = AllocBuffer(size);
+  
 #ifdef ZM_IMAGE_PROFILING
-	clock_gettime(CLOCK_THREAD_CPUTIME_ID,&start);
+  clock_gettime(CLOCK_THREAD_CPUTIME_ID,&start);
 #endif
-	
-	/* Do the blending */
-	(*fptr_blend)(buffer, image.buffer, new_buffer, size, transparency);
-	
+  
+  /* Do the blending */
+  (*fptr_blend)(buffer, image.buffer, new_buffer, size, transparency);
+  
 #ifdef ZM_IMAGE_PROFILING
-	clock_gettime(CLOCK_THREAD_CPUTIME_ID,&end);
-	timespec_diff(&start,&end,&diff);
-	
-	executetime = (1000000000ull * diff.tv_sec) + diff.tv_nsec;
-	milpixels = (unsigned long)((long double)size)/((((long double)executetime)/1000));
-	Debug(5, "Blend: %u colours blended in %llu nanoseconds, %lu million colours/s\n",size,executetime,milpixels);
+  clock_gettime(CLOCK_THREAD_CPUTIME_ID,&end);
+  timespec_diff(&start,&end,&diff);
+  
+  executetime = (1000000000ull * diff.tv_sec) + diff.tv_nsec;
+  milpixels = (unsigned long)((long double)size)/((((long double)executetime)/1000));
+  Debug(5, "Blend: %u colours blended in %llu nanoseconds, %lu million colours/s\n",size,executetime,milpixels);
 #endif
-	
-	AssignDirect( width, height, colours, subpixelorder, new_buffer, size, ZM_BUFTYPE_ZM);
+  
+  AssignDirect( width, height, colours, subpixelorder, new_buffer, size, ZM_BUFTYPE_ZM);
 }
 
 Image *Image::Merge( unsigned int n_images, Image *images[] )
 {
-	if ( n_images <= 0 ) return( 0 );
-	if ( n_images == 1 ) return( new Image( *images[0] ) );
+  if ( n_images <= 0 ) return( 0 );
+  if ( n_images == 1 ) return( new Image( *images[0] ) );
 
-	unsigned int width = images[0]->width;
-	unsigned int height = images[0]->height;
-	unsigned int colours = images[0]->colours;
-	for ( unsigned int i = 1; i < n_images; i++ )
-	{
-	    if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) )
-        {
-            Panic( "Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
-        }
-	}
+  unsigned int width = images[0]->width;
+  unsigned int height = images[0]->height;
+  unsigned int colours = images[0]->colours;
+  for ( unsigned int i = 1; i < n_images; i++ )
+  {
+    if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) )
+    {
+      Panic( "Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
+    }
+  }
 
-	Image *result = new Image( width, height, images[0]->colours, images[0]->subpixelorder);
-	unsigned int size = result->size;
-	for ( unsigned int i = 0; i < size; i++ )
-	{
-		unsigned int total = 0;
-		uint8_t *pdest = result->buffer;
-		for ( unsigned int j = 0; j < n_images; j++ )
-		{
-			uint8_t *psrc = images[j]->buffer;
-			total += *psrc;
-			psrc++;
-		}
-		*pdest = total/n_images;
-		pdest++;
-	}
-	return( result );
+  Image *result = new Image( width, height, images[0]->colours, images[0]->subpixelorder);
+  unsigned int size = result->size;
+  for ( unsigned int i = 0; i < size; i++ )
+  {
+    unsigned int total = 0;
+    uint8_t *pdest = result->buffer;
+    for ( unsigned int j = 0; j < n_images; j++ )
+    {
+      uint8_t *psrc = images[j]->buffer;
+      total += *psrc;
+      psrc++;
+    }
+    *pdest = total/n_images;
+    pdest++;
+  }
+  return( result );
 }
 
 Image *Image::Merge( unsigned int n_images, Image *images[], double weight )
 {
-	if ( n_images <= 0 ) return( 0 );
-	if ( n_images == 1 ) return( new Image( *images[0] ) );
+  if ( n_images <= 0 ) return( 0 );
+  if ( n_images == 1 ) return( new Image( *images[0] ) );
 
-	unsigned int width = images[0]->width;
-	unsigned int height = images[0]->height;
-	unsigned int colours = images[0]->colours;
-	for ( unsigned int i = 1; i < n_images; i++ )
-	{
-	    if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) )
-        {
-            Panic( "Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
-        }
-	}
+  unsigned int width = images[0]->width;
+  unsigned int height = images[0]->height;
+  unsigned int colours = images[0]->colours;
+  for ( unsigned int i = 1; i < n_images; i++ )
+  {
+    if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) )
+    {
+      Panic( "Attempt to merge different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
+    }
+  }
 
-	Image *result = new Image( *images[0] );
-	unsigned int size = result->size;
-	double factor = 1.0*weight;
-	for ( unsigned int i = 1; i < n_images; i++ )
-	{
-		uint8_t *pdest = result->buffer;
-		uint8_t *psrc = images[i]->buffer;
-		for ( unsigned int j = 0; j < size; j++ )
-		{
-			*pdest = (uint8_t)(((*pdest)*(1.0-factor))+((*psrc)*factor));
-			pdest++;
-			psrc++;
-		}
-		factor *= weight;
-	}
-	return( result );
+  Image *result = new Image( *images[0] );
+  unsigned int size = result->size;
+  double factor = 1.0*weight;
+  for ( unsigned int i = 1; i < n_images; i++ )
+  {
+    uint8_t *pdest = result->buffer;
+    uint8_t *psrc = images[i]->buffer;
+    for ( unsigned int j = 0; j < size; j++ )
+    {
+      *pdest = (uint8_t)(((*pdest)*(1.0-factor))+((*psrc)*factor));
+      pdest++;
+      psrc++;
+    }
+    factor *= weight;
+  }
+  return( result );
 }
 
 Image *Image::Highlight( unsigned int n_images, Image *images[], const Rgb threshold, const Rgb ref_colour )
 {
-	if ( n_images <= 0 ) return( 0 );
-	if ( n_images == 1 ) return( new Image( *images[0] ) );
+  if ( n_images <= 0 ) return( 0 );
+  if ( n_images == 1 ) return( new Image( *images[0] ) );
 
-	unsigned int width = images[0]->width;
-	unsigned int height = images[0]->height;
-	unsigned int colours = images[0]->colours;
-	for ( unsigned int i = 1; i < n_images; i++ )
-	{
-	    if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) )
-        {
-            Panic( "Attempt to highlight different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
-        }
-	}
+  unsigned int width = images[0]->width;
+  unsigned int height = images[0]->height;
+  unsigned int colours = images[0]->colours;
+  for ( unsigned int i = 1; i < n_images; i++ )
+  {
+    if ( !(width == images[i]->width && height == images[i]->height && colours == images[i]->colours) )
+    {
+      Panic( "Attempt to highlight different sized images, expected %dx%dx%d, got %dx%dx%d, for image %d", width, height, colours, images[i]->width, images[i]->height, images[i]->colours, i );
+    }
+  }
 
-	Image *result = new Image( width, height, images[0]->colours, images[0]->subpixelorder );
-	unsigned int size = result->size;
-	for ( unsigned int c = 0; c < colours; c++ )
-	{
-		for ( unsigned int i = 0; i < size; i++ )
-		{
-			unsigned int count = 0;
-			uint8_t *pdest = result->buffer+c;
-			for ( unsigned int j = 0; j < n_images; j++ )
-			{
-				uint8_t *psrc = images[j]->buffer+c;
+  Image *result = new Image( width, height, images[0]->colours, images[0]->subpixelorder );
+  unsigned int size = result->size;
+  for ( unsigned int c = 0; c < colours; c++ )
+  {
+    for ( unsigned int i = 0; i < size; i++ )
+    {
+      unsigned int count = 0;
+      uint8_t *pdest = result->buffer+c;
+      for ( unsigned int j = 0; j < n_images; j++ )
+      {
+        uint8_t *psrc = images[j]->buffer+c;
 
 #ifndef SOLARIS
-				if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+        if ( (unsigned)abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
 #else
-				if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
+        if ( (unsigned)std::abs((*psrc)-RGB_VAL(ref_colour,c)) >= RGB_VAL(threshold,c) )
 #endif
-				{
-					count++;
-				}
-				psrc += colours;
-			}
-			*pdest = (count*255)/n_images;
-			pdest += 3;
-		}
-	}
-	return( result );
+        {
+          count++;
+        }
+        psrc += colours;
+      }
+      *pdest = (count*255)/n_images;
+      pdest += 3;
+    }
+  }
+  return( result );
 }
 
 /* New function to allow buffer re-using instead of allocationg memory for the delta image every time */
 void Image::Delta( const Image &image, Image* targetimage) const
 {
 #ifdef ZM_IMAGE_PROFILING
-	struct timespec start,end,diff;
-	unsigned long long executetime;
-	unsigned long milpixels;
+  struct timespec start,end,diff;
+  unsigned long long executetime;
+  unsigned long milpixels;
 #endif
-	
-	if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) )
-	{
-		Panic( "Attempt to get delta of different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder);
-	}
-	
-	uint8_t *pdiff = targetimage->WriteBuffer(width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE);
-	
-	if(pdiff == NULL) {
-		Panic("Failed requesting writeable buffer for storing the delta image");
-	}
-	
+  
+  if ( !(width == image.width && height == image.height && colours == image.colours && subpixelorder == image.subpixelorder) )
+  {
+    Panic( "Attempt to get delta of different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, image.width, image.height, image.colours, image.subpixelorder);
+  }
+  
+  uint8_t *pdiff = targetimage->WriteBuffer(width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE);
+  
+  if(pdiff == NULL) {
+    Panic("Failed requesting writeable buffer for storing the delta image");
+  }
+  
 #ifdef ZM_IMAGE_PROFILING
-	clock_gettime(CLOCK_THREAD_CPUTIME_ID,&start);
+  clock_gettime(CLOCK_THREAD_CPUTIME_ID,&start);
 #endif
-	
-	switch(colours) {
-	  case ZM_COLOUR_RGB24:
-	  {
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-	      /* BGR subpixel order */
-	      (*fptr_delta8_bgr)(buffer, image.buffer, pdiff, pixels);
-	    } else {
-	      /* Assume RGB subpixel order */
-	      (*fptr_delta8_rgb)(buffer, image.buffer, pdiff, pixels);
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
-	    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      /* ARGB subpixel order */
-	      (*fptr_delta8_argb)(buffer, image.buffer, pdiff, pixels);
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      /* ABGR subpixel order */
-	      (*fptr_delta8_abgr)(buffer, image.buffer, pdiff, pixels);
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      /* BGRA subpixel order */
-	      (*fptr_delta8_bgra)(buffer, image.buffer, pdiff, pixels);
-	    } else {
-	      /* Assume RGBA subpixel order */
-	      (*fptr_delta8_rgba)(buffer, image.buffer, pdiff, pixels);
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_GRAY8:
-	    (*fptr_delta8_gray8)(buffer, image.buffer, pdiff, pixels);
-	    break;
-	  default:
-	    Panic("Delta called with unexpected colours: %d",colours);
-	    break;
-	}
-	
+  
+  switch(colours) {
+    case ZM_COLOUR_RGB24:
+    {
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+      /* BGR subpixel order */
+      (*fptr_delta8_bgr)(buffer, image.buffer, pdiff, pixels);
+    } else {
+      /* Assume RGB subpixel order */
+      (*fptr_delta8_rgb)(buffer, image.buffer, pdiff, pixels);
+    }
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
+    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      /* ARGB subpixel order */
+      (*fptr_delta8_argb)(buffer, image.buffer, pdiff, pixels);
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      /* ABGR subpixel order */
+      (*fptr_delta8_abgr)(buffer, image.buffer, pdiff, pixels);
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* BGRA subpixel order */
+      (*fptr_delta8_bgra)(buffer, image.buffer, pdiff, pixels);
+    } else {
+      /* Assume RGBA subpixel order */
+      (*fptr_delta8_rgba)(buffer, image.buffer, pdiff, pixels);
+    }
+    break;
+    }
+    case ZM_COLOUR_GRAY8:
+    (*fptr_delta8_gray8)(buffer, image.buffer, pdiff, pixels);
+    break;
+    default:
+    Panic("Delta called with unexpected colours: %d",colours);
+    break;
+  }
+  
 #ifdef ZM_IMAGE_PROFILING
-	clock_gettime(CLOCK_THREAD_CPUTIME_ID,&end);
-	timespec_diff(&start,&end,&diff);
-	
-	executetime = (1000000000ull * diff.tv_sec) + diff.tv_nsec;
-	milpixels = (unsigned long)((long double)pixels)/((((long double)executetime)/1000));
-	Debug(5, "Delta: %u delta pixels generated in %llu nanoseconds, %lu million pixels/s\n",pixels,executetime,milpixels);
+  clock_gettime(CLOCK_THREAD_CPUTIME_ID,&end);
+  timespec_diff(&start,&end,&diff);
+  
+  executetime = (1000000000ull * diff.tv_sec) + diff.tv_nsec;
+  milpixels = (unsigned long)((long double)pixels)/((((long double)executetime)/1000));
+  Debug(5, "Delta: %u delta pixels generated in %llu nanoseconds, %lu million pixels/s\n",pixels,executetime,milpixels);
 #endif
 }
 
 const Coord Image::centreCoord( const char *text ) const
 {
-    int index = 0;
-    int line_no = 0;
-	int text_len = strlen( text );
-    int line_len = 0;
-    int max_line_len = 0;
-    const char *line = text;
+  int index = 0;
+  int line_no = 0;
+  int text_len = strlen( text );
+  int line_len = 0;
+  int max_line_len = 0;
+  const char *line = text;
 
-    while ( (index < text_len) && (line_len = strcspn( line, "\n" )) )
+  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) )
+  {
+    if ( line_len > max_line_len )
+      max_line_len = line_len;
+
+    index += line_len;
+    while ( text[index] == '\n' )
     {
-        if ( line_len > max_line_len )
-            max_line_len = line_len;
-
-        index += line_len;
-        while ( text[index] == '\n' )
-        {
-            index++;
-        }
-        line = text+index;
-        line_no++;
+      index++;
     }
-    int x = (width - (max_line_len * CHAR_WIDTH) ) / 2;
-    int y = (height - (line_no * LINE_HEIGHT) ) / 2;
-    return( Coord( x, y ) );
+    line = text+index;
+    line_no++;
+  }
+  int x = (width - (max_line_len * CHAR_WIDTH) ) / 2;
+  int y = (height - (line_no * LINE_HEIGHT) ) / 2;
+  return( Coord( x, y ) );
 }
 
 /* RGB32 compatible: complete */
 void Image::MaskPrivacy( const unsigned char *p_bitmask, const Rgb pixel_colour )
 {
-    const uint8_t pixel_r_col = RED_VAL_RGBA(pixel_colour);
-    const uint8_t pixel_g_col = GREEN_VAL_RGBA(pixel_colour);
-    const uint8_t pixel_b_col = BLUE_VAL_RGBA(pixel_colour);
-    const uint8_t pixel_bw_col = pixel_colour & 0xff;
-    const Rgb pixel_rgb_col = rgb_convert(pixel_colour,subpixelorder);
+  const uint8_t pixel_r_col = RED_VAL_RGBA(pixel_colour);
+  const uint8_t pixel_g_col = GREEN_VAL_RGBA(pixel_colour);
+  const uint8_t pixel_b_col = BLUE_VAL_RGBA(pixel_colour);
+  const uint8_t pixel_bw_col = pixel_colour & 0xff;
+  const Rgb pixel_rgb_col = rgb_convert(pixel_colour,subpixelorder);
 
-    unsigned char *ptr = &buffer[0];
-    unsigned int i = 0;
+  unsigned char *ptr = &buffer[0];
+  unsigned int i = 0;
 
-    for ( unsigned int y = 0; y < height; y++ )
+  for ( unsigned int y = 0; y < height; y++ )
+  {
+    if ( colours == ZM_COLOUR_GRAY8 )
     {
-        if ( colours == ZM_COLOUR_GRAY8 )
-        {
-            for ( unsigned int x = 0; x < width; x++, ptr++ )
-            {
-                if ( p_bitmask[i] )
-                    *ptr = pixel_bw_col;
-                i++;
-            }
-        }
-        else if ( colours == ZM_COLOUR_RGB24 )
-        {
-            for ( unsigned int x = 0; x < width; x++, ptr += colours )
-            {
-                if ( p_bitmask[i] )
-                {
-                    RED_PTR_RGBA(ptr) = pixel_r_col;
-                    GREEN_PTR_RGBA(ptr) = pixel_g_col;
-                    BLUE_PTR_RGBA(ptr) = pixel_b_col;
-                }
-                i++;
-            }
-        }
-        else if ( colours == ZM_COLOUR_RGB32 )
-	{
-            for ( unsigned int x = 0; x < width; x++, ptr += colours )
-            {
-                Rgb *temp_ptr = (Rgb*)ptr;
-                if ( p_bitmask[i] )
-                    *temp_ptr = pixel_rgb_col;
-                i++;
-            }
-	} else {
-		Panic("MaskPrivacy called with unexpected colours: %d", colours);
-		return;
-	}
-
+      for ( unsigned int x = 0; x < width; x++, ptr++ )
+      {
+        if ( p_bitmask[i] )
+          *ptr = pixel_bw_col;
+        i++;
+      }
     }
+    else if ( colours == ZM_COLOUR_RGB24 )
+    {
+      for ( unsigned int x = 0; x < width; x++, ptr += colours )
+      {
+        if ( p_bitmask[i] )
+        {
+          RED_PTR_RGBA(ptr) = pixel_r_col;
+          GREEN_PTR_RGBA(ptr) = pixel_g_col;
+          BLUE_PTR_RGBA(ptr) = pixel_b_col;
+        }
+        i++;
+      }
+    }
+    else if ( colours == ZM_COLOUR_RGB32 )
+  {
+      for ( unsigned int x = 0; x < width; x++, ptr += colours )
+      {
+        Rgb *temp_ptr = (Rgb*)ptr;
+        if ( p_bitmask[i] )
+          *temp_ptr = pixel_rgb_col;
+        i++;
+      }
+  } else {
+    Panic("MaskPrivacy called with unexpected colours: %d", colours);
+    return;
+  }
+
+  }
 }
 
 /* RGB32 compatible: complete */
 void Image::Annotate( const char *p_text, const Coord &coord, const unsigned int size, const Rgb fg_colour, const Rgb bg_colour )
 {
-	strncpy( text, p_text, sizeof(text) );
+  strncpy( text, p_text, sizeof(text) );
 
-    unsigned int index = 0;
-    unsigned int line_no = 0;
-    unsigned int text_len = strlen( text );
-    unsigned int line_len = 0;
-    const char *line = text;
+  unsigned int index = 0;
+  unsigned int line_no = 0;
+  unsigned int text_len = strlen( text );
+  unsigned int line_len = 0;
+  const char *line = text;
 
-    const uint8_t fg_r_col = RED_VAL_RGBA(fg_colour);
-    const uint8_t fg_g_col = GREEN_VAL_RGBA(fg_colour);
-    const uint8_t fg_b_col = BLUE_VAL_RGBA(fg_colour);
-    const uint8_t fg_bw_col = fg_colour & 0xff;
-    const Rgb fg_rgb_col = rgb_convert(fg_colour,subpixelorder);
-    const bool fg_trans = (fg_colour == RGB_TRANSPARENT);
-    
-    const uint8_t bg_r_col = RED_VAL_RGBA(bg_colour);
-    const uint8_t bg_g_col = GREEN_VAL_RGBA(bg_colour);
-    const uint8_t bg_b_col = BLUE_VAL_RGBA(bg_colour);
-    const uint8_t bg_bw_col = bg_colour & 0xff;
-    const Rgb bg_rgb_col = rgb_convert(bg_colour,subpixelorder);
-    const bool bg_trans = (bg_colour == RGB_TRANSPARENT);
+  const uint8_t fg_r_col = RED_VAL_RGBA(fg_colour);
+  const uint8_t fg_g_col = GREEN_VAL_RGBA(fg_colour);
+  const uint8_t fg_b_col = BLUE_VAL_RGBA(fg_colour);
+  const uint8_t fg_bw_col = fg_colour & 0xff;
+  const Rgb fg_rgb_col = rgb_convert(fg_colour,subpixelorder);
+  const bool fg_trans = (fg_colour == RGB_TRANSPARENT);
+  
+  const uint8_t bg_r_col = RED_VAL_RGBA(bg_colour);
+  const uint8_t bg_g_col = GREEN_VAL_RGBA(bg_colour);
+  const uint8_t bg_b_col = BLUE_VAL_RGBA(bg_colour);
+  const uint8_t bg_bw_col = bg_colour & 0xff;
+  const Rgb bg_rgb_col = rgb_convert(bg_colour,subpixelorder);
+  const bool bg_trans = (bg_colour == RGB_TRANSPARENT);
 
-    int zm_text_bitmask = 0x80;
-    if (size == 2)
-        zm_text_bitmask = 0x8000;
+  int zm_text_bitmask = 0x80;
+  if (size == 2)
+    zm_text_bitmask = 0x8000;
 
-    while ( (index < text_len) && (line_len = strcspn( line, "\n" )) )
+  while ( (index < text_len) && (line_len = strcspn( line, "\n" )) )
+  {
+
+    unsigned int line_width = line_len * CHAR_WIDTH * size;
+
+    unsigned int lo_line_x = coord.X();
+    unsigned int lo_line_y = coord.Y() + (line_no * LINE_HEIGHT * size);
+
+    unsigned int min_line_x = 0;
+    unsigned int max_line_x = width - line_width;
+    unsigned  int min_line_y = 0;
+    unsigned int max_line_y = height - (LINE_HEIGHT * size);
+
+    if ( lo_line_x > max_line_x )
+      lo_line_x = max_line_x;
+    if ( lo_line_x < min_line_x )
+      lo_line_x = min_line_x;
+    if ( lo_line_y > max_line_y )
+      lo_line_y = max_line_y;
+    if ( lo_line_y < min_line_y )
+      lo_line_y = min_line_y;
+
+    unsigned int hi_line_x = lo_line_x + line_width;
+    unsigned int hi_line_y = lo_line_y + (LINE_HEIGHT * size);
+
+    // Clip anything that runs off the right of the screen
+    if ( hi_line_x > width )
+      hi_line_x = width;
+    if ( hi_line_y > height )
+      hi_line_y = height;
+
+    if ( colours == ZM_COLOUR_GRAY8 )
     {
-
-        unsigned int line_width = line_len * CHAR_WIDTH * size;
-
-        unsigned int lo_line_x = coord.X();
-        unsigned int lo_line_y = coord.Y() + (line_no * LINE_HEIGHT * size);
-
-        unsigned int min_line_x = 0;
-        unsigned int max_line_x = width - line_width;
-        unsigned  int min_line_y = 0;
-        unsigned int max_line_y = height - (LINE_HEIGHT * size);
-
-        if ( lo_line_x > max_line_x )
-            lo_line_x = max_line_x;
-        if ( lo_line_x < min_line_x )
-            lo_line_x = min_line_x;
-        if ( lo_line_y > max_line_y )
-            lo_line_y = max_line_y;
-        if ( lo_line_y < min_line_y )
-            lo_line_y = min_line_y;
-
-        unsigned int hi_line_x = lo_line_x + line_width;
-        unsigned int hi_line_y = lo_line_y + (LINE_HEIGHT * size);
-
-        // Clip anything that runs off the right of the screen
-        if ( hi_line_x > width )
-            hi_line_x = width;
-        if ( hi_line_y > height )
-            hi_line_y = height;
-
-        if ( colours == ZM_COLOUR_GRAY8 )
+      unsigned char *ptr = &buffer[(lo_line_y*width)+lo_line_x];
+      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (CHAR_HEIGHT * size); y++, r++, ptr += width )
+      {
+        unsigned char *temp_ptr = ptr;
+        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
         {
-            unsigned char *ptr = &buffer[(lo_line_y*width)+lo_line_x];
-            for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (CHAR_HEIGHT * size); y++, r++, ptr += width )
+          int f;
+          if (size == 2)
+            f = bigfontdata[(line[c] * CHAR_HEIGHT * size) + r];
+          else
+            f = fontdata[(line[c] * CHAR_HEIGHT) + r];
+          for ( unsigned int i = 0; i < (CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ )
+          {
+            if ( f & (zm_text_bitmask >> i) )
             {
-                unsigned char *temp_ptr = ptr;
-                for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
-                {
-                    int f;
-                    if (size == 2)
-                        f = bigfontdata[(line[c] * CHAR_HEIGHT * size) + r];
-                    else
-                        f = fontdata[(line[c] * CHAR_HEIGHT) + r];
-                    for ( unsigned int i = 0; i < (CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ )
-                    {
-                        if ( f & (zm_text_bitmask >> i) )
-                        {
-                            if ( !fg_trans )
-                                *temp_ptr = fg_bw_col;
-                        }
-                        else if ( !bg_trans )
-                        {
-                            *temp_ptr = bg_bw_col;
-                        }
-                    }
-                }
+              if ( !fg_trans )
+                *temp_ptr = fg_bw_col;
             }
-        }
-        else if ( colours == ZM_COLOUR_RGB24 )
-        {
-            unsigned int wc = width * colours;
-
-            unsigned char *ptr = &buffer[((lo_line_y*width)+lo_line_x)*colours];
-            for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (CHAR_HEIGHT * size); y++, r++, ptr += wc )
+            else if ( !bg_trans )
             {
-                unsigned char *temp_ptr = ptr;
-                for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
-                {
-                    int f;
-                    if (size == 2)
-                        f = bigfontdata[(line[c] * CHAR_HEIGHT * size) + r];
-                    else
-                        f = fontdata[(line[c] * CHAR_HEIGHT) + r];
-                    for ( unsigned int i = 0; i < (CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr += colours )
-                    {
-                        if ( f & (zm_text_bitmask >> i) )
-                        {
-                            if ( !fg_trans )
-                            {
-					            RED_PTR_RGBA(temp_ptr) = fg_r_col;
-					            GREEN_PTR_RGBA(temp_ptr) = fg_g_col;
-					            BLUE_PTR_RGBA(temp_ptr) = fg_b_col;
-                            }
-                        }
-                        else if ( !bg_trans )
-                        {
-					        RED_PTR_RGBA(temp_ptr) = bg_r_col;
-					        GREEN_PTR_RGBA(temp_ptr) = bg_g_col;
-					        BLUE_PTR_RGBA(temp_ptr) = bg_b_col;
-                        }
-                    }
-                }
+              *temp_ptr = bg_bw_col;
             }
-        } 
-        else if ( colours == ZM_COLOUR_RGB32 )
-	{
-            unsigned int wc = width * colours;
-
-            uint8_t *ptr = &buffer[((lo_line_y*width)+lo_line_x)<<2];
-            for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (CHAR_HEIGHT * size); y++, r++, ptr += wc )
-            {
-                Rgb* temp_ptr = (Rgb*)ptr;
-                for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
-                {
-                    int f;
-                    if (size == 2)
-                        f = bigfontdata[(line[c] * CHAR_HEIGHT * size) + r];
-                    else
-                        f = fontdata[(line[c] * CHAR_HEIGHT) + r];
-                    for ( unsigned int i = 0; i < (CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ )
-                    {
-                        if ( f & (zm_text_bitmask >> i) )
-                        {
-                            if ( !fg_trans )
-                            {
-				*temp_ptr = fg_rgb_col;
-                            }
-                        }
-                        else if ( !bg_trans )
-                        {
-			    *temp_ptr = bg_rgb_col;
-                        }
-                    }
-                }
-            } 
-	
-	} else {
-		Panic("Annotate called with unexpected colours: %d",colours);
-		return;
-	}
-	
-        index += line_len;
-        while ( text[index] == '\n' )
-        {
-            index++;
+          }
         }
-        line = text+index;
-        line_no++;
+      }
     }
+    else if ( colours == ZM_COLOUR_RGB24 )
+    {
+      unsigned int wc = width * colours;
+
+      unsigned char *ptr = &buffer[((lo_line_y*width)+lo_line_x)*colours];
+      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (CHAR_HEIGHT * size); y++, r++, ptr += wc )
+      {
+        unsigned char *temp_ptr = ptr;
+        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
+        {
+          int f;
+          if (size == 2)
+            f = bigfontdata[(line[c] * CHAR_HEIGHT * size) + r];
+          else
+            f = fontdata[(line[c] * CHAR_HEIGHT) + r];
+          for ( unsigned int i = 0; i < (CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr += colours )
+          {
+            if ( f & (zm_text_bitmask >> i) )
+            {
+              if ( !fg_trans )
+              {
+                RED_PTR_RGBA(temp_ptr) = fg_r_col;
+                GREEN_PTR_RGBA(temp_ptr) = fg_g_col;
+                BLUE_PTR_RGBA(temp_ptr) = fg_b_col;
+              }
+            }
+            else if ( !bg_trans )
+            {
+              RED_PTR_RGBA(temp_ptr) = bg_r_col;
+              GREEN_PTR_RGBA(temp_ptr) = bg_g_col;
+              BLUE_PTR_RGBA(temp_ptr) = bg_b_col;
+            }
+          }
+        }
+      }
+    } 
+    else if ( colours == ZM_COLOUR_RGB32 )
+  {
+      unsigned int wc = width * colours;
+
+      uint8_t *ptr = &buffer[((lo_line_y*width)+lo_line_x)<<2];
+      for ( unsigned int y = lo_line_y, r = 0; y < hi_line_y && r < (CHAR_HEIGHT * size); y++, r++, ptr += wc )
+      {
+        Rgb* temp_ptr = (Rgb*)ptr;
+        for ( unsigned int x = lo_line_x, c = 0; x < hi_line_x && c < line_len; c++ )
+        {
+          int f;
+          if (size == 2)
+            f = bigfontdata[(line[c] * CHAR_HEIGHT * size) + r];
+          else
+            f = fontdata[(line[c] * CHAR_HEIGHT) + r];
+          for ( unsigned int i = 0; i < (CHAR_WIDTH * size) && x < hi_line_x; i++, x++, temp_ptr++ )
+          {
+            if ( f & (zm_text_bitmask >> i) )
+            {
+              if ( !fg_trans )
+              {
+        *temp_ptr = fg_rgb_col;
+              }
+            }
+            else if ( !bg_trans )
+            {
+        *temp_ptr = bg_rgb_col;
+            }
+          }
+        }
+      } 
+  
+  } else {
+    Panic("Annotate called with unexpected colours: %d",colours);
+    return;
+  }
+  
+    index += line_len;
+    while ( text[index] == '\n' )
+    {
+      index++;
+    }
+    line = text+index;
+    line_no++;
+  }
 }
 
 void Image::Timestamp( const char *label, const time_t when, const Coord &coord, const int size )
 {
-	char time_text[64];
-	strftime( time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime( &when ) );
-	char text[64];
-	if ( label )
-	{
-		snprintf( text, sizeof(text), "%s - %s", label, time_text );
-		Annotate( text, coord, size );
-	}
-	else
-	{
-		Annotate( time_text, coord, size );
-	}
+  char time_text[64];
+  strftime( time_text, sizeof(time_text), "%y/%m/%d %H:%M:%S", localtime( &when ) );
+  char text[64];
+  if ( label )
+  {
+    snprintf( text, sizeof(text), "%s - %s", label, time_text );
+    Annotate( text, coord, size );
+  }
+  else
+  {
+    Annotate( time_text, coord, size );
+  }
 }
 
 /* RGB32 compatible: complete */
 void Image::Colourise(const unsigned int p_reqcolours, const unsigned int p_reqsubpixelorder)
 {
-	Debug(9, "Colourise: Req colours: %u Req subpixel order: %u Current colours: %u Current subpixel order: %u",p_reqcolours,p_reqsubpixelorder,colours,subpixelorder);
-	
-	if ( colours != ZM_COLOUR_GRAY8) {
-		Warning("Target image is already colourised, colours: %u",colours);
-		return;
-	}
-	
-	if ( p_reqcolours == ZM_COLOUR_RGB32 ) {
-		/* RGB32 */
-		Rgb* new_buffer = (Rgb*)AllocBuffer(pixels*sizeof(Rgb));
-		
-		const uint8_t *psrc = buffer;
-		Rgb* pdest = new_buffer;
-		Rgb subpixel;
-		Rgb newpixel;
-		
-		if ( p_reqsubpixelorder == ZM_SUBPIX_ORDER_ABGR || p_reqsubpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-			/* ARGB\ABGR subpixel order. alpha byte is first (mem+0), so we need to shift the pixel left in the end */
-			for(unsigned int i=0;i<pixels;i++) {
-				newpixel = subpixel = psrc[i];
-				newpixel = (newpixel<<8) | subpixel;
-				newpixel = (newpixel<<8) | subpixel;
-				pdest[i] = (newpixel<<8);
-			}		
-		} else {
-			/* RGBA\BGRA subpixel order, alpha byte is last (mem+3) */
-			for(unsigned int i=0;i<pixels;i++) {
-				newpixel = subpixel = psrc[i];
-				newpixel = (newpixel<<8) | subpixel;
-				newpixel = (newpixel<<8) | subpixel;
-				pdest[i] = newpixel;
-			}
-		}
+  Debug(9, "Colourise: Req colours: %u Req subpixel order: %u Current colours: %u Current subpixel order: %u",p_reqcolours,p_reqsubpixelorder,colours,subpixelorder);
+  
+  if ( colours != ZM_COLOUR_GRAY8) {
+    Warning("Target image is already colourised, colours: %u",colours);
+    return;
+  }
+  
+  if ( p_reqcolours == ZM_COLOUR_RGB32 ) {
+    /* RGB32 */
+    Rgb* new_buffer = (Rgb*)AllocBuffer(pixels*sizeof(Rgb));
+    
+    const uint8_t *psrc = buffer;
+    Rgb* pdest = new_buffer;
+    Rgb subpixel;
+    Rgb newpixel;
+    
+    if ( p_reqsubpixelorder == ZM_SUBPIX_ORDER_ABGR || p_reqsubpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      /* ARGB\ABGR subpixel order. alpha byte is first (mem+0), so we need to shift the pixel left in the end */
+      for(unsigned int i=0;i<pixels;i++) {
+        newpixel = subpixel = psrc[i];
+        newpixel = (newpixel<<8) | subpixel;
+        newpixel = (newpixel<<8) | subpixel;
+        pdest[i] = (newpixel<<8);
+      }    
+    } else {
+      /* RGBA\BGRA subpixel order, alpha byte is last (mem+3) */
+      for(unsigned int i=0;i<pixels;i++) {
+        newpixel = subpixel = psrc[i];
+        newpixel = (newpixel<<8) | subpixel;
+        newpixel = (newpixel<<8) | subpixel;
+        pdest[i] = newpixel;
+      }
+    }
 
-		/* Directly assign the new buffer and make sure it will be freed when not needed anymore */
-		AssignDirect( width, height, p_reqcolours, p_reqsubpixelorder, (uint8_t*)new_buffer, pixels*4, ZM_BUFTYPE_ZM);
+    /* Directly assign the new buffer and make sure it will be freed when not needed anymore */
+    AssignDirect( width, height, p_reqcolours, p_reqsubpixelorder, (uint8_t*)new_buffer, pixels*4, ZM_BUFTYPE_ZM);
 
-	} else if(p_reqcolours == ZM_COLOUR_RGB24 ) {
-		/* RGB24 */
-		uint8_t *new_buffer = AllocBuffer(pixels*3);
-		
-		uint8_t *pdest = new_buffer;
-		const uint8_t *psrc = buffer;
-		
-		for(unsigned int i=0;i<(unsigned int)pixels;i++, pdest += 3)
-		{
-			RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = psrc[i];
-		}
-		
-		/* Directly assign the new buffer and make sure it will be freed when not needed anymore */
-		AssignDirect( width, height, p_reqcolours, p_reqsubpixelorder, new_buffer, pixels*3, ZM_BUFTYPE_ZM);
-	} else {
-		Error("Colourise called with unexpected colours: %d",colours);
-		return;
-	}
-	
+  } else if(p_reqcolours == ZM_COLOUR_RGB24 ) {
+    /* RGB24 */
+    uint8_t *new_buffer = AllocBuffer(pixels*3);
+    
+    uint8_t *pdest = new_buffer;
+    const uint8_t *psrc = buffer;
+    
+    for(unsigned int i=0;i<(unsigned int)pixels;i++, pdest += 3)
+    {
+      RED_PTR_RGBA(pdest) = GREEN_PTR_RGBA(pdest) = BLUE_PTR_RGBA(pdest) = psrc[i];
+    }
+    
+    /* Directly assign the new buffer and make sure it will be freed when not needed anymore */
+    AssignDirect( width, height, p_reqcolours, p_reqsubpixelorder, new_buffer, pixels*3, ZM_BUFTYPE_ZM);
+  } else {
+    Error("Colourise called with unexpected colours: %d",colours);
+    return;
+  }
+  
 }
 
 /* RGB32 compatible: complete */
 void Image::DeColourise()
 {
-	colours = ZM_COLOUR_GRAY8;
-	subpixelorder = ZM_SUBPIX_ORDER_NONE;
-	size = width * height;
-	
-	if ( colours == ZM_COLOUR_RGB32 )
-	{
-		switch(subpixelorder) {
-		  case ZM_SUBPIX_ORDER_BGRA:
-		    std_convert_bgra_gray8(buffer,buffer,pixels);
-		    break;
-		  case ZM_SUBPIX_ORDER_ARGB:
-		    std_convert_argb_gray8(buffer,buffer,pixels);
-		    break;
-		  case ZM_SUBPIX_ORDER_ABGR:
-		    std_convert_abgr_gray8(buffer,buffer,pixels);
-		    break;
-		  case ZM_SUBPIX_ORDER_RGBA:
-		  default:
-		    std_convert_rgba_gray8(buffer,buffer,pixels);
-		    break;
-		}
-	} else {
-		/* Assume RGB24 */
-		switch(subpixelorder) {
-		  case ZM_SUBPIX_ORDER_BGR:
-		    std_convert_bgr_gray8(buffer,buffer,pixels);
-		    break;
-		  case ZM_SUBPIX_ORDER_RGB:
-		  default:
-		    std_convert_rgb_gray8(buffer,buffer,pixels);
-		    break;
-		}
-		
-	}
+  colours = ZM_COLOUR_GRAY8;
+  subpixelorder = ZM_SUBPIX_ORDER_NONE;
+  size = width * height;
+  
+  if ( colours == ZM_COLOUR_RGB32 )
+  {
+    switch(subpixelorder) {
+      case ZM_SUBPIX_ORDER_BGRA:
+      std_convert_bgra_gray8(buffer,buffer,pixels);
+      break;
+      case ZM_SUBPIX_ORDER_ARGB:
+      std_convert_argb_gray8(buffer,buffer,pixels);
+      break;
+      case ZM_SUBPIX_ORDER_ABGR:
+      std_convert_abgr_gray8(buffer,buffer,pixels);
+      break;
+      case ZM_SUBPIX_ORDER_RGBA:
+      default:
+      std_convert_rgba_gray8(buffer,buffer,pixels);
+      break;
+    }
+  } else {
+    /* Assume RGB24 */
+    switch(subpixelorder) {
+      case ZM_SUBPIX_ORDER_BGR:
+      std_convert_bgr_gray8(buffer,buffer,pixels);
+      break;
+      case ZM_SUBPIX_ORDER_RGB:
+      default:
+      std_convert_rgb_gray8(buffer,buffer,pixels);
+      break;
+    }
+    
+  }
 }
 
 /* RGB32 compatible: complete */
 void Image::Fill( Rgb colour, const Box *limits )
 {
-	if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
-	{
-		Panic( "Attempt to fill image with unexpected colours %d", colours );
-	}
-	
-	/* Convert the colour's RGBA subpixel order into the image's subpixel order */
-	colour = rgb_convert(colour,subpixelorder);
-	
-	unsigned int lo_x = limits?limits->Lo().X():0;
-	unsigned int lo_y = limits?limits->Lo().Y():0;
-	unsigned int hi_x = limits?limits->Hi().X():width-1;
-	unsigned int hi_y = limits?limits->Hi().Y():height-1;
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			unsigned char *p = &buffer[(y*width)+lo_x];
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
-			{
-				*p = colour;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			unsigned char *p = &buffer[colours*((y*width)+lo_x)];
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3)
-			{
-				RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
-				GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
-				BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */
-	{
-		for ( unsigned int y = lo_y; y <= (unsigned int)hi_y; y++ )
-		{
-			Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
-			
-			for ( unsigned int x = lo_x; x <= (unsigned int)hi_x; x++, p++)
-			{
-				/* Fast, copies the entire pixel in a single pass */ 
-				*p = colour;
-			}
-		}
-	}
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
+  {
+    Panic( "Attempt to fill image with unexpected colours %d", colours );
+  }
+  
+  /* Convert the colour's RGBA subpixel order into the image's subpixel order */
+  colour = rgb_convert(colour,subpixelorder);
+  
+  unsigned int lo_x = limits?limits->Lo().X():0;
+  unsigned int lo_y = limits?limits->Lo().Y():0;
+  unsigned int hi_x = limits?limits->Hi().X():width-1;
+  unsigned int hi_y = limits?limits->Hi().Y():height-1;
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      unsigned char *p = &buffer[(y*width)+lo_x];
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
+      {
+        *p = colour;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      unsigned char *p = &buffer[colours*((y*width)+lo_x)];
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3)
+      {
+        RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
+        GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
+        BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */
+  {
+    for ( unsigned int y = lo_y; y <= (unsigned int)hi_y; y++ )
+    {
+      Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
+      
+      for ( unsigned int x = lo_x; x <= (unsigned int)hi_x; x++, p++)
+      {
+        /* Fast, copies the entire pixel in a single pass */ 
+        *p = colour;
+      }
+    }
+  }
 }
 
 /* RGB32 compatible: complete */
 void Image::Fill( Rgb colour, int density, const Box *limits )
 {
-	/* Allow the faster version to be used if density is not used (density=1) */
-	if(density <= 1)
-		return Fill(colour,limits);
-	
-	if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32  ) )
-	{
-		Panic( "Attempt to fill image with unexpected colours %d", colours );
-	}
-	
-	/* Convert the colour's RGBA subpixel order into the image's subpixel order */
-	colour = rgb_convert(colour,subpixelorder);
+  /* Allow the faster version to be used if density is not used (density=1) */
+  if(density <= 1)
+    return Fill(colour,limits);
+  
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32  ) )
+  {
+    Panic( "Attempt to fill image with unexpected colours %d", colours );
+  }
+  
+  /* Convert the colour's RGBA subpixel order into the image's subpixel order */
+  colour = rgb_convert(colour,subpixelorder);
 
-	unsigned int lo_x = limits?limits->Lo().X():0;
-	unsigned int lo_y = limits?limits->Lo().Y():0;
-	unsigned int hi_x = limits?limits->Hi().X():width-1;
-	unsigned int hi_y = limits?limits->Hi().Y():height-1;
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			unsigned char *p = &buffer[(y*width)+lo_x];
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
-			{
-				if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) )
-					*p = colour;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			unsigned char *p = &buffer[colours*((y*width)+lo_x)];
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3)
-			{
-				if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) ) {
-					RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
-					GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
-					BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
-				}
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */
-	{
-		for ( unsigned int y = lo_y; y <= hi_y; y++ )
-		{
-			Rgb* p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
+  unsigned int lo_x = limits?limits->Lo().X():0;
+  unsigned int lo_y = limits?limits->Lo().Y():0;
+  unsigned int hi_x = limits?limits->Hi().X():width-1;
+  unsigned int hi_y = limits?limits->Hi().Y():height-1;
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      unsigned char *p = &buffer[(y*width)+lo_x];
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
+      {
+        if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) )
+          *p = colour;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      unsigned char *p = &buffer[colours*((y*width)+lo_x)];
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p += 3)
+      {
+        if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) ) {
+          RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
+          GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
+          BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
+        }
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 ) /* RGB32 */
+  {
+    for ( unsigned int y = lo_y; y <= hi_y; y++ )
+    {
+      Rgb* p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
 
-			for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
-			{
-				if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) )
-					/* Fast, copies the entire pixel in a single pass */
-					*p = colour;
-			}
-		}
-	}	
-	
+      for ( unsigned int x = lo_x; x <= hi_x; x++, p++)
+      {
+        if ( ( x == lo_x || x == hi_x || y == lo_y || y == hi_y ) || (!(x%density) && !(y%density) ) )
+          /* Fast, copies the entire pixel in a single pass */
+          *p = colour;
+      }
+    }
+  }  
+  
 }
 
 /* RGB32 compatible: complete */
 void Image::Outline( Rgb colour, const Polygon &polygon )
 {
-	if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
-	{
-		Panic( "Attempt to outline image with unexpected colours %d", colours );
-	}
-    
-	/* Convert the colour's RGBA subpixel order into the image's subpixel order */
-	colour = rgb_convert(colour,subpixelorder);
-	
-	int n_coords = polygon.getNumCoords();
-	for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ )
-	{
-		const Coord &p1 = polygon.getCoord( i );
-		const Coord &p2 = polygon.getCoord( j );
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
+  {
+    Panic( "Attempt to outline image with unexpected colours %d", colours );
+  }
+  
+  /* Convert the colour's RGBA subpixel order into the image's subpixel order */
+  colour = rgb_convert(colour,subpixelorder);
+  
+  int n_coords = polygon.getNumCoords();
+  for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ )
+  {
+    const Coord &p1 = polygon.getCoord( i );
+    const Coord &p2 = polygon.getCoord( j );
 
-		int x1 = p1.X();
-		int x2 = p2.X();
-		int y1 = p1.Y();
-		int y2 = p2.Y();
+    int x1 = p1.X();
+    int x2 = p2.X();
+    int y1 = p1.Y();
+    int y2 = p2.Y();
 
-		double dx = x2 - x1;
-		double dy = y2 - y1;
+    double dx = x2 - x1;
+    double dy = y2 - y1;
 
-		double grad;
+    double grad;
 
-		//Debug( 9, "dx: %.2lf, dy: %.2lf", dx, dy );
-		if ( fabs(dx) <= fabs(dy) )
-		{
-			//Debug( 9, "dx <= dy" );
-			if ( y1 != y2 )
-				grad = dx/dy;
-			else
-				grad = width;
+    //Debug( 9, "dx: %.2lf, dy: %.2lf", dx, dy );
+    if ( fabs(dx) <= fabs(dy) )
+    {
+      //Debug( 9, "dx <= dy" );
+      if ( y1 != y2 )
+        grad = dx/dy;
+      else
+        grad = width;
 
-			double x;
-			int y, yinc = (y1<y2)?1:-1;
-			grad *= yinc;
-			if ( colours == ZM_COLOUR_GRAY8 )
-			{
-				//Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2f", x1, x2, y1, y2, grad );
-				for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
-				{
-					//Debug( 9, "x:%.2f, y:%d", x, y );
-					buffer[(y*width)+int(round(x))] = colour;
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB24 )
-			{
-				for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
-				{
-					unsigned char *p = &buffer[colours*((y*width)+int(round(x)))];
-					RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
-					GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
-					BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB32 )
-			{
-				for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
-				{
-					*(Rgb*)(buffer+(((y*width)+int(round(x)))<<2)) = colour;
-				}
-			}
-		}
-		else
-		{
-			//Debug( 9, "dx > dy" );
-			if ( x1 != x2 )
-				grad = dy/dx;
-			else
-				grad = height;
-			//Debug( 9, "grad: %.2lf", grad );
+      double x;
+      int y, yinc = (y1<y2)?1:-1;
+      grad *= yinc;
+      if ( colours == ZM_COLOUR_GRAY8 )
+      {
+        //Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2f", x1, x2, y1, y2, grad );
+        for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
+        {
+          //Debug( 9, "x:%.2f, y:%d", x, y );
+          buffer[(y*width)+int(round(x))] = colour;
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB24 )
+      {
+        for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
+        {
+          unsigned char *p = &buffer[colours*((y*width)+int(round(x)))];
+          RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
+          GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
+          BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB32 )
+      {
+        for ( x = x1, y = y1; y != y2; y += yinc, x += grad )
+        {
+          *(Rgb*)(buffer+(((y*width)+int(round(x)))<<2)) = colour;
+        }
+      }
+    }
+    else
+    {
+      //Debug( 9, "dx > dy" );
+      if ( x1 != x2 )
+        grad = dy/dx;
+      else
+        grad = height;
+      //Debug( 9, "grad: %.2lf", grad );
 
-			double y;
-			int x, xinc = (x1<x2)?1:-1;
-			grad *= xinc;
-			if ( colours == ZM_COLOUR_GRAY8 )
-			{
-				//Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2lf", x1, x2, y1, y2, grad );
-				for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
-				{
-					//Debug( 9, "x:%d, y:%.2f", x, y );
-					buffer[(int(round(y))*width)+x] = colour;
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB24 )
-			{
-				for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
-				{
-					unsigned char *p = &buffer[colours*((int(round(y))*width)+x)];
-					RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
-					GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
-					BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB32 )
-			{
-				for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
-				{
-					*(Rgb*)(buffer+(((int(round(y))*width)+x)<<2)) = colour;
-				}
-			}
-			
-		}
-	}
+      double y;
+      int x, xinc = (x1<x2)?1:-1;
+      grad *= xinc;
+      if ( colours == ZM_COLOUR_GRAY8 )
+      {
+        //Debug( 9, "x1:%d, x2:%d, y1:%d, y2:%d, gr:%.2lf", x1, x2, y1, y2, grad );
+        for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
+        {
+          //Debug( 9, "x:%d, y:%.2f", x, y );
+          buffer[(int(round(y))*width)+x] = colour;
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB24 )
+      {
+        for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
+        {
+          unsigned char *p = &buffer[colours*((int(round(y))*width)+x)];
+          RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
+          GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
+          BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB32 )
+      {
+        for ( y = y1, x = x1; x != x2; x += xinc, y += grad )
+        {
+          *(Rgb*)(buffer+(((int(round(y))*width)+x)<<2)) = colour;
+        }
+      }
+      
+    }
+  }
 }
 
 /* RGB32 compatible: complete */
 void Image::Fill( Rgb colour, int density, const Polygon &polygon )
 {
-	if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
-	{
-		Panic( "Attempt to fill image with unexpected colours %d", colours );
-	}
-	
-	/* Convert the colour's RGBA subpixel order into the image's subpixel order */
-	colour = rgb_convert(colour,subpixelorder);
+  if ( !(colours == ZM_COLOUR_GRAY8 || colours == ZM_COLOUR_RGB24 || colours == ZM_COLOUR_RGB32 ) )
+  {
+    Panic( "Attempt to fill image with unexpected colours %d", colours );
+  }
+  
+  /* Convert the colour's RGBA subpixel order into the image's subpixel order */
+  colour = rgb_convert(colour,subpixelorder);
 
-	int n_coords = polygon.getNumCoords();
-	int n_global_edges = 0;
-	Edge global_edges[n_coords];
-	for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ )
-	{
-		const Coord &p1 = polygon.getCoord( i );
-		const Coord &p2 = polygon.getCoord( j );
+  int n_coords = polygon.getNumCoords();
+  int n_global_edges = 0;
+  Edge global_edges[n_coords];
+  for ( int j = 0, i = n_coords-1; j < n_coords; i = j++ )
+  {
+    const Coord &p1 = polygon.getCoord( i );
+    const Coord &p2 = polygon.getCoord( j );
 
-		int x1 = p1.X();
-		int x2 = p2.X();
-		int y1 = p1.Y();
-		int y2 = p2.Y();
+    int x1 = p1.X();
+    int x2 = p2.X();
+    int y1 = p1.Y();
+    int y2 = p2.Y();
 
-		//Debug( 9, "x1:%d,y1:%d x2:%d,y2:%d", x1, y1, x2, y2 );
-		if ( y1 == y2 )
-			continue;
+    //Debug( 9, "x1:%d,y1:%d x2:%d,y2:%d", x1, y1, x2, y2 );
+    if ( y1 == y2 )
+      continue;
 
-		double dx = x2 - x1;
-		double dy = y2 - y1;
+    double dx = x2 - x1;
+    double dy = y2 - y1;
 
-		global_edges[n_global_edges].min_y = y1<y2?y1:y2;
-		global_edges[n_global_edges].max_y = y1<y2?y2:y1;
-		global_edges[n_global_edges].min_x = y1<y2?x1:x2;
-		global_edges[n_global_edges]._1_m = dx/dy;
-		n_global_edges++;
-	}
-	qsort( global_edges, n_global_edges, sizeof(*global_edges), Edge::CompareYX );
+    global_edges[n_global_edges].min_y = y1<y2?y1:y2;
+    global_edges[n_global_edges].max_y = y1<y2?y2:y1;
+    global_edges[n_global_edges].min_x = y1<y2?x1:x2;
+    global_edges[n_global_edges]._1_m = dx/dy;
+    n_global_edges++;
+  }
+  qsort( global_edges, n_global_edges, sizeof(*global_edges), Edge::CompareYX );
 
 #ifndef ZM_DBG_OFF
-	if ( logLevel() >= Logger::DEBUG9 )
-	{
-		for ( int i = 0; i < n_global_edges; i++ )
-		{
-			Debug( 9, "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", i, global_edges[i].min_y, global_edges[i].max_y, global_edges[i].min_x, global_edges[i]._1_m );
-		}
-	}
+  if ( logLevel() >= Logger::DEBUG9 )
+  {
+    for ( int i = 0; i < n_global_edges; i++ )
+    {
+      Debug( 9, "%d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", i, global_edges[i].min_y, global_edges[i].max_y, global_edges[i].min_x, global_edges[i]._1_m );
+    }
+  }
 #endif
 
-	int n_active_edges = 0;
-	Edge active_edges[n_global_edges];
-	int y = global_edges[0].min_y;
-	do 
-	{
-		for ( int i = 0; i < n_global_edges; i++ )
-		{
-			if ( global_edges[i].min_y == y )
-			{
-				Debug( 9, "Moving global edge" );
-				active_edges[n_active_edges++] = global_edges[i];
-				if ( i < (n_global_edges-1) )
-				{
-					//memcpy( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
-					memmove( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
-					i--;
-				}
-				n_global_edges--;
-			}
-			else
-			{
-				break;
-			}
-		}
-		qsort( active_edges, n_active_edges, sizeof(*active_edges), Edge::CompareX );
+  int n_active_edges = 0;
+  Edge active_edges[n_global_edges];
+  int y = global_edges[0].min_y;
+  do 
+  {
+    for ( int i = 0; i < n_global_edges; i++ )
+    {
+      if ( global_edges[i].min_y == y )
+      {
+        Debug( 9, "Moving global edge" );
+        active_edges[n_active_edges++] = global_edges[i];
+        if ( i < (n_global_edges-1) )
+        {
+          //memcpy( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
+          memmove( &global_edges[i], &global_edges[i+1], sizeof(*global_edges)*(n_global_edges-i) );
+          i--;
+        }
+        n_global_edges--;
+      }
+      else
+      {
+        break;
+      }
+    }
+    qsort( active_edges, n_active_edges, sizeof(*active_edges), Edge::CompareX );
 #ifndef ZM_DBG_OFF
-	    if ( logLevel() >= Logger::DEBUG9 )
-		{
-			for ( int i = 0; i < n_active_edges; i++ )
-			{
-				Debug( 9, "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", y, i, active_edges[i].min_y, active_edges[i].max_y, active_edges[i].min_x, active_edges[i]._1_m );
-			}
-		}
+    if ( logLevel() >= Logger::DEBUG9 )
+    {
+      for ( int i = 0; i < n_active_edges; i++ )
+      {
+        Debug( 9, "%d - %d: min_y: %d, max_y:%d, min_x:%.2f, 1/m:%.2f", y, i, active_edges[i].min_y, active_edges[i].max_y, active_edges[i].min_x, active_edges[i]._1_m );
+      }
+    }
 #endif
-		if ( !(y%density) )
-		{
-			//Debug( 9, "%d", y );
-			for ( int i = 0; i < n_active_edges; )
-			{
-				int lo_x = int(round(active_edges[i++].min_x));
-				int hi_x = int(round(active_edges[i++].min_x));
-				if( colours == ZM_COLOUR_GRAY8 ) {
-					unsigned char *p = &buffer[(y*width)+lo_x];
-					for ( int x = lo_x; x <= hi_x; x++, p++)
-					{
-						if ( !(x%density) )
-						{
-							//Debug( 9, " %d", x );
-							*p = colour;
-						}
-					}
-				} else if( colours == ZM_COLOUR_RGB24 ) {
-					unsigned char *p = &buffer[colours*((y*width)+lo_x)];
-					for ( int x = lo_x; x <= hi_x; x++, p += 3)
-					{
-						if ( !(x%density) )
-						{  
-							RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
-							GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
-							BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
-						}
-					}
-				} else if( colours == ZM_COLOUR_RGB32 ) {
-					Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
-					for ( int x = lo_x; x <= hi_x; x++, p++)
-					{
-						if ( !(x%density) )
-						{
-							/* Fast, copies the entire pixel in a single pass */
-							*p = colour;
-						}
-					}
-				}
-			}
-		}
-		y++;
-		for ( int i = n_active_edges-1; i >= 0; i-- )
-		{
-			if ( y >= active_edges[i].max_y ) // Or >= as per sheets
-			{
-				Debug( 9, "Deleting active_edge" );
-				if ( i < (n_active_edges-1) )
-				{
-					//memcpy( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
-					memmove( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
-				}
-				n_active_edges--;
-			}
-			else
-			{
-				active_edges[i].min_x += active_edges[i]._1_m;
-			}
-		}
-	} while ( n_global_edges || n_active_edges );
+    if ( !(y%density) )
+    {
+      //Debug( 9, "%d", y );
+      for ( int i = 0; i < n_active_edges; )
+      {
+        int lo_x = int(round(active_edges[i++].min_x));
+        int hi_x = int(round(active_edges[i++].min_x));
+        if( colours == ZM_COLOUR_GRAY8 ) {
+          unsigned char *p = &buffer[(y*width)+lo_x];
+          for ( int x = lo_x; x <= hi_x; x++, p++)
+          {
+            if ( !(x%density) )
+            {
+              //Debug( 9, " %d", x );
+              *p = colour;
+            }
+          }
+        } else if( colours == ZM_COLOUR_RGB24 ) {
+          unsigned char *p = &buffer[colours*((y*width)+lo_x)];
+          for ( int x = lo_x; x <= hi_x; x++, p += 3)
+          {
+            if ( !(x%density) )
+            {  
+              RED_PTR_RGBA(p) = RED_VAL_RGBA(colour);
+              GREEN_PTR_RGBA(p) = GREEN_VAL_RGBA(colour);
+              BLUE_PTR_RGBA(p) = BLUE_VAL_RGBA(colour);
+            }
+          }
+        } else if( colours == ZM_COLOUR_RGB32 ) {
+          Rgb *p = (Rgb*)&buffer[((y*width)+lo_x)<<2];
+          for ( int x = lo_x; x <= hi_x; x++, p++)
+          {
+            if ( !(x%density) )
+            {
+              /* Fast, copies the entire pixel in a single pass */
+              *p = colour;
+            }
+          }
+        }
+      }
+    }
+    y++;
+    for ( int i = n_active_edges-1; i >= 0; i-- )
+    {
+      if ( y >= active_edges[i].max_y ) // Or >= as per sheets
+      {
+        Debug( 9, "Deleting active_edge" );
+        if ( i < (n_active_edges-1) )
+        {
+          //memcpy( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
+          memmove( &active_edges[i], &active_edges[i+1], sizeof(*active_edges)*(n_active_edges-i) );
+        }
+        n_active_edges--;
+      }
+      else
+      {
+        active_edges[i].min_x += active_edges[i]._1_m;
+      }
+    }
+  } while ( n_global_edges || n_active_edges );
 }
 
 void Image::Fill( Rgb colour, const Polygon &polygon )
 {
-	Fill( colour, 1, polygon );
+  Fill( colour, 1, polygon );
 }
 
 /* RGB32 compatible: complete */
 void Image::Rotate( int angle )
 {
-	
-	angle %= 360;
+  
+  angle %= 360;
 
-	if ( !angle )
-	{
-		return;
-	}
-	if ( angle%90 )
-	{
-		return;
-	}
-	
-	unsigned int new_height = height;
-	unsigned int new_width = width;
-	uint8_t* rotate_buffer = AllocBuffer(size);
+  if ( !angle )
+  {
+    return;
+  }
+  if ( angle%90 )
+  {
+    return;
+  }
+  
+  unsigned int new_height = height;
+  unsigned int new_width = width;
+  uint8_t* rotate_buffer = AllocBuffer(size);
 
-	switch( angle )
-	{
-		case 90 :
-		{
-			new_height = width;
-			new_width = height;
+  switch( angle )
+  {
+    case 90 :
+    {
+      new_height = width;
+      new_width = height;
 
-			unsigned int line_bytes = new_width*colours;
-			unsigned char *s_ptr = buffer;
+      unsigned int line_bytes = new_width*colours;
+      unsigned char *s_ptr = buffer;
 
-			if ( colours == ZM_COLOUR_GRAY8 )
-			{
-				unsigned char *d_ptr;
-				for ( unsigned int i = new_width; i > 0; i-- )
-				{
-					d_ptr = rotate_buffer+(i-1);
-					for ( unsigned int j = new_height; j > 0; j-- )
-					{
-						*d_ptr = *s_ptr++;
-						d_ptr += line_bytes;
-					}
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB32 )
-			{
-				Rgb* s_rptr = (Rgb*)s_ptr;
-				Rgb* d_rptr;
-				for ( unsigned int i = new_width; i > 0; i-- )
-				{
-					d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
-					for ( unsigned int j = new_height; j > 0; j-- )
-					{
-						*d_rptr = *s_rptr++;
-						d_rptr += new_width;
-					}
-				}
-			}
-			else /* Assume RGB24 */
-			{
-				unsigned char *d_ptr;
-				for ( unsigned int i = new_width; i > 0; i-- )
-				{
-					d_ptr = rotate_buffer+((i-1)*3);
-					for ( unsigned int j = new_height; j > 0; j-- )
-					{
-						*d_ptr = *s_ptr++;
-						*(d_ptr+1) = *s_ptr++;
-						*(d_ptr+2) = *s_ptr++;
-						d_ptr += line_bytes;
-					}
-				}
-			}
-			break;
-		}
-		case 180 :
-		{
-			unsigned char *s_ptr = buffer+size;
-			unsigned char *d_ptr = rotate_buffer;
+      if ( colours == ZM_COLOUR_GRAY8 )
+      {
+        unsigned char *d_ptr;
+        for ( unsigned int i = new_width; i > 0; i-- )
+        {
+          d_ptr = rotate_buffer+(i-1);
+          for ( unsigned int j = new_height; j > 0; j-- )
+          {
+            *d_ptr = *s_ptr++;
+            d_ptr += line_bytes;
+          }
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB32 )
+      {
+        Rgb* s_rptr = (Rgb*)s_ptr;
+        Rgb* d_rptr;
+        for ( unsigned int i = new_width; i > 0; i-- )
+        {
+          d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
+          for ( unsigned int j = new_height; j > 0; j-- )
+          {
+            *d_rptr = *s_rptr++;
+            d_rptr += new_width;
+          }
+        }
+      }
+      else /* Assume RGB24 */
+      {
+        unsigned char *d_ptr;
+        for ( unsigned int i = new_width; i > 0; i-- )
+        {
+          d_ptr = rotate_buffer+((i-1)*3);
+          for ( unsigned int j = new_height; j > 0; j-- )
+          {
+            *d_ptr = *s_ptr++;
+            *(d_ptr+1) = *s_ptr++;
+            *(d_ptr+2) = *s_ptr++;
+            d_ptr += line_bytes;
+          }
+        }
+      }
+      break;
+    }
+    case 180 :
+    {
+      unsigned char *s_ptr = buffer+size;
+      unsigned char *d_ptr = rotate_buffer;
 
-			if ( colours == ZM_COLOUR_GRAY8 )
-			{
-				while( s_ptr > buffer )
-				{
-					s_ptr--;
-					*d_ptr++ = *s_ptr;
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB32 )
-			{
-				Rgb* s_rptr = (Rgb*)s_ptr;
-				Rgb* d_rptr = (Rgb*)d_ptr;
-				while( s_rptr > (Rgb*)buffer )
-				{
-					s_rptr--;
-					*d_rptr++ = *s_rptr;
-				}
-			}
-			else /* Assume RGB24 */
-			{
-				while( s_ptr > buffer )
-				{
-					s_ptr -= 3;
-					*d_ptr++ = *s_ptr;
-					*d_ptr++ = *(s_ptr+1);
-					*d_ptr++ = *(s_ptr+2);
-				}
-			}
-			break;
-		}
-		case 270 :
-		{
-			new_height = width;
-			new_width = height;
+      if ( colours == ZM_COLOUR_GRAY8 )
+      {
+        while( s_ptr > buffer )
+        {
+          s_ptr--;
+          *d_ptr++ = *s_ptr;
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB32 )
+      {
+        Rgb* s_rptr = (Rgb*)s_ptr;
+        Rgb* d_rptr = (Rgb*)d_ptr;
+        while( s_rptr > (Rgb*)buffer )
+        {
+          s_rptr--;
+          *d_rptr++ = *s_rptr;
+        }
+      }
+      else /* Assume RGB24 */
+      {
+        while( s_ptr > buffer )
+        {
+          s_ptr -= 3;
+          *d_ptr++ = *s_ptr;
+          *d_ptr++ = *(s_ptr+1);
+          *d_ptr++ = *(s_ptr+2);
+        }
+      }
+      break;
+    }
+    case 270 :
+    {
+      new_height = width;
+      new_width = height;
 
-			unsigned int line_bytes = new_width*colours;
-			unsigned char *s_ptr = buffer+size;
+      unsigned int line_bytes = new_width*colours;
+      unsigned char *s_ptr = buffer+size;
 
-			if ( colours == ZM_COLOUR_GRAY8 )
-			{
-				unsigned char *d_ptr;
-				for ( unsigned int i = new_width; i > 0; i-- )
-				{
-					d_ptr = rotate_buffer+(i-1);
-					for ( unsigned int j = new_height; j > 0; j-- )
-					{
-						s_ptr--;
-						*d_ptr = *s_ptr;
-						d_ptr += line_bytes;
-					}
-				}
-			}
-			else if ( colours == ZM_COLOUR_RGB32 )
-			{
-				Rgb* s_rptr = (Rgb*)s_ptr;
-				Rgb* d_rptr;
-				for ( unsigned int i = new_width; i > 0; i-- )
-				{
-					d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
-					for ( unsigned int j = new_height; j > 0; j-- )
-					{
-						s_rptr--;
-						*d_rptr = *s_rptr;
-						d_rptr += new_width;
-					}
-				}
-			}
-			else /* Assume RGB24 */
-			{
-				unsigned char *d_ptr;
-				for ( unsigned int i = new_width; i > 0; i-- )
-				{
-					d_ptr = rotate_buffer+((i-1)*3);
-					for ( unsigned int j = new_height; j > 0; j-- )
-					{
-						*(d_ptr+2) = *(--s_ptr);
-						*(d_ptr+1) = *(--s_ptr);
-						*d_ptr = *(--s_ptr);
-						d_ptr += line_bytes;
-					}
-				}
-			}
-			break;
-		}
-	}
+      if ( colours == ZM_COLOUR_GRAY8 )
+      {
+        unsigned char *d_ptr;
+        for ( unsigned int i = new_width; i > 0; i-- )
+        {
+          d_ptr = rotate_buffer+(i-1);
+          for ( unsigned int j = new_height; j > 0; j-- )
+          {
+            s_ptr--;
+            *d_ptr = *s_ptr;
+            d_ptr += line_bytes;
+          }
+        }
+      }
+      else if ( colours == ZM_COLOUR_RGB32 )
+      {
+        Rgb* s_rptr = (Rgb*)s_ptr;
+        Rgb* d_rptr;
+        for ( unsigned int i = new_width; i > 0; i-- )
+        {
+          d_rptr = (Rgb*)(rotate_buffer+((i-1)<<2));
+          for ( unsigned int j = new_height; j > 0; j-- )
+          {
+            s_rptr--;
+            *d_rptr = *s_rptr;
+            d_rptr += new_width;
+          }
+        }
+      }
+      else /* Assume RGB24 */
+      {
+        unsigned char *d_ptr;
+        for ( unsigned int i = new_width; i > 0; i-- )
+        {
+          d_ptr = rotate_buffer+((i-1)*3);
+          for ( unsigned int j = new_height; j > 0; j-- )
+          {
+            *(d_ptr+2) = *(--s_ptr);
+            *(d_ptr+1) = *(--s_ptr);
+            *d_ptr = *(--s_ptr);
+            d_ptr += line_bytes;
+          }
+        }
+      }
+      break;
+    }
+  }
  
-	AssignDirect( new_width, new_height, colours, subpixelorder, rotate_buffer, size, ZM_BUFTYPE_ZM);
-	
+  AssignDirect( new_width, new_height, colours, subpixelorder, rotate_buffer, size, ZM_BUFTYPE_ZM);
+  
 }
 
 /* RGB32 compatible: complete */
 void Image::Flip( bool leftright )
 {
-	uint8_t* flip_buffer = AllocBuffer(size);
-	
-	unsigned int line_bytes = width*colours;
-	unsigned int line_bytes2 = 2*line_bytes;
-	if ( leftright )
-	{
-		// Horizontal flip, left to right
-		unsigned char *s_ptr = buffer+line_bytes;
-		unsigned char *d_ptr = flip_buffer;
-		unsigned char *max_d_ptr = flip_buffer + size;
+  uint8_t* flip_buffer = AllocBuffer(size);
+  
+  unsigned int line_bytes = width*colours;
+  unsigned int line_bytes2 = 2*line_bytes;
+  if ( leftright )
+  {
+    // Horizontal flip, left to right
+    unsigned char *s_ptr = buffer+line_bytes;
+    unsigned char *d_ptr = flip_buffer;
+    unsigned char *max_d_ptr = flip_buffer + size;
 
-		if ( colours == ZM_COLOUR_GRAY8 )
-		{
-			while( d_ptr < max_d_ptr )
-			{
-				for ( unsigned int j = 0; j < width; j++ )
-				{
-					s_ptr--;
-					*d_ptr++ = *s_ptr;
-				}
-				s_ptr += line_bytes2;
-			}
-		}
-		else if ( colours == ZM_COLOUR_RGB32 )
-		{
-			Rgb* s_rptr = (Rgb*)s_ptr;
-			Rgb* d_rptr = (Rgb*)flip_buffer;
-			Rgb* max_d_rptr = (Rgb*)max_d_ptr;
-			while( d_rptr < max_d_rptr )
-			{
-				for ( unsigned int j = 0; j < width; j++ )
-				{
-					s_rptr--;
-					*d_rptr++ = *s_rptr;
-				}
-				s_rptr += width * 2;
-			}
-		}
-		else /* Assume RGB24 */
-		{
-			while( d_ptr < max_d_ptr )
-			{
-				for ( unsigned int j = 0; j < width; j++ )
-				{
-					s_ptr -= 3;
-					*d_ptr++ = *s_ptr;
-					*d_ptr++ = *(s_ptr+1);
-					*d_ptr++ = *(s_ptr+2);
-				}
-				s_ptr += line_bytes2;
-			}
-		}		
-	}
-	else
-	{
-		// Vertical flip, top to bottom
-		unsigned char *s_ptr = buffer+(height*line_bytes);
-		unsigned char *d_ptr = flip_buffer;
+    if ( colours == ZM_COLOUR_GRAY8 )
+    {
+      while( d_ptr < max_d_ptr )
+      {
+        for ( unsigned int j = 0; j < width; j++ )
+        {
+          s_ptr--;
+          *d_ptr++ = *s_ptr;
+        }
+        s_ptr += line_bytes2;
+      }
+    }
+    else if ( colours == ZM_COLOUR_RGB32 )
+    {
+      Rgb* s_rptr = (Rgb*)s_ptr;
+      Rgb* d_rptr = (Rgb*)flip_buffer;
+      Rgb* max_d_rptr = (Rgb*)max_d_ptr;
+      while( d_rptr < max_d_rptr )
+      {
+        for ( unsigned int j = 0; j < width; j++ )
+        {
+          s_rptr--;
+          *d_rptr++ = *s_rptr;
+        }
+        s_rptr += width * 2;
+      }
+    }
+    else /* Assume RGB24 */
+    {
+      while( d_ptr < max_d_ptr )
+      {
+        for ( unsigned int j = 0; j < width; j++ )
+        {
+          s_ptr -= 3;
+          *d_ptr++ = *s_ptr;
+          *d_ptr++ = *(s_ptr+1);
+          *d_ptr++ = *(s_ptr+2);
+        }
+        s_ptr += line_bytes2;
+      }
+    }    
+  }
+  else
+  {
+    // Vertical flip, top to bottom
+    unsigned char *s_ptr = buffer+(height*line_bytes);
+    unsigned char *d_ptr = flip_buffer;
 
-		while( s_ptr > buffer )
-		{
-			s_ptr -= line_bytes;
-			memcpy( d_ptr, s_ptr, line_bytes );
-			d_ptr += line_bytes;
-		}
-	}
-	
-	AssignDirect( width, height, colours, subpixelorder, flip_buffer, size, ZM_BUFTYPE_ZM);
-	
+    while( s_ptr > buffer )
+    {
+      s_ptr -= line_bytes;
+      memcpy( d_ptr, s_ptr, line_bytes );
+      d_ptr += line_bytes;
+    }
+  }
+  
+  AssignDirect( width, height, colours, subpixelorder, flip_buffer, size, ZM_BUFTYPE_ZM);
+  
 }
 
 void Image::Scale( unsigned int factor )
 {
-	if ( !factor )
-	{
-		Error( "Bogus scale factor %d found", factor );
-		return;
-	}
-	if ( factor == ZM_SCALE_BASE )
-	{
-		return;
-	}
+  if ( !factor )
+  {
+    Error( "Bogus scale factor %d found", factor );
+    return;
+  }
+  if ( factor == ZM_SCALE_BASE )
+  {
+    return;
+  }
 
-	unsigned int new_width = (width*factor)/ZM_SCALE_BASE;
-	unsigned int new_height = (height*factor)/ZM_SCALE_BASE;
-	
-	size_t scale_buffer_size = (new_width+1) * (new_height+1) * colours;
-	
-	uint8_t* scale_buffer = AllocBuffer(scale_buffer_size);
-	
-	if ( factor > ZM_SCALE_BASE )
-	{
-		unsigned char *pd = scale_buffer;
-		unsigned int wc = width*colours;
-		unsigned int nwc = new_width*colours;
-		unsigned int h_count = ZM_SCALE_BASE/2;
-		unsigned int last_h_index = 0;
-		unsigned int last_w_index = 0;
-		unsigned int h_index;
-		for ( unsigned int y = 0; y < height; y++ )
-		{
-			unsigned char *ps = &buffer[y*wc];
-			unsigned int w_count = ZM_SCALE_BASE/2;
-			unsigned int w_index;
-			last_w_index = 0;
-			for ( unsigned int x = 0; x < width; x++ )
-			{
-				w_count += factor;
-				w_index = w_count/ZM_SCALE_BASE;
-				for (unsigned int f = last_w_index; f < w_index; f++ )
-				{
-					for ( unsigned int c = 0; c < colours; c++ )
-					{
-						*pd++ = *(ps+c);
-					}
-				}
-				ps += colours;
-				last_w_index = w_index;
-			}
-			h_count += factor;
-			h_index = h_count/ZM_SCALE_BASE;
-			for ( unsigned int f = last_h_index+1; f < h_index; f++ )
-			{
-				memcpy( pd, pd-nwc, nwc );
-				pd += nwc;
-			}
-			last_h_index = h_index;
-		}
-        new_width = last_w_index;
-        new_height = last_h_index;
-	}
-	else
-	{
-		unsigned char *pd = scale_buffer;
-		unsigned int wc = width*colours;
-		unsigned int xstart = factor/2;
-		unsigned int ystart = factor/2;
-		unsigned int h_count = ystart;
-		unsigned int last_h_index = 0;
-		unsigned int last_w_index = 0;
-		unsigned int h_index;
-		for ( unsigned int y = 0; y < (unsigned int)height; y++ )
-		{
-			h_count += factor;
-			h_index = h_count/ZM_SCALE_BASE;
-			if ( h_index > last_h_index )
-			{
-				unsigned int w_count = xstart;
-				unsigned int w_index;
-				last_w_index = 0;
+  unsigned int new_width = (width*factor)/ZM_SCALE_BASE;
+  unsigned int new_height = (height*factor)/ZM_SCALE_BASE;
+  
+  size_t scale_buffer_size = (new_width+1) * (new_height+1) * colours;
+  
+  uint8_t* scale_buffer = AllocBuffer(scale_buffer_size);
+  
+  if ( factor > ZM_SCALE_BASE )
+  {
+    unsigned char *pd = scale_buffer;
+    unsigned int wc = width*colours;
+    unsigned int nwc = new_width*colours;
+    unsigned int h_count = ZM_SCALE_BASE/2;
+    unsigned int last_h_index = 0;
+    unsigned int last_w_index = 0;
+    unsigned int h_index;
+    for ( unsigned int y = 0; y < height; y++ )
+    {
+      unsigned char *ps = &buffer[y*wc];
+      unsigned int w_count = ZM_SCALE_BASE/2;
+      unsigned int w_index;
+      last_w_index = 0;
+      for ( unsigned int x = 0; x < width; x++ )
+      {
+        w_count += factor;
+        w_index = w_count/ZM_SCALE_BASE;
+        for (unsigned int f = last_w_index; f < w_index; f++ )
+        {
+          for ( unsigned int c = 0; c < colours; c++ )
+          {
+            *pd++ = *(ps+c);
+          }
+        }
+        ps += colours;
+        last_w_index = w_index;
+      }
+      h_count += factor;
+      h_index = h_count/ZM_SCALE_BASE;
+      for ( unsigned int f = last_h_index+1; f < h_index; f++ )
+      {
+        memcpy( pd, pd-nwc, nwc );
+        pd += nwc;
+      }
+      last_h_index = h_index;
+    }
+    new_width = last_w_index;
+    new_height = last_h_index;
+  }
+  else
+  {
+    unsigned char *pd = scale_buffer;
+    unsigned int wc = width*colours;
+    unsigned int xstart = factor/2;
+    unsigned int ystart = factor/2;
+    unsigned int h_count = ystart;
+    unsigned int last_h_index = 0;
+    unsigned int last_w_index = 0;
+    unsigned int h_index;
+    for ( unsigned int y = 0; y < (unsigned int)height; y++ )
+    {
+      h_count += factor;
+      h_index = h_count/ZM_SCALE_BASE;
+      if ( h_index > last_h_index )
+      {
+        unsigned int w_count = xstart;
+        unsigned int w_index;
+        last_w_index = 0;
 
-				unsigned char *ps = &buffer[y*wc];
-				for ( unsigned int x = 0; x < (unsigned int)width; x++ )
-				{
-					w_count += factor;
-					w_index = w_count/ZM_SCALE_BASE;
-					
-					if ( w_index > last_w_index )
-					{
-						for ( unsigned int c = 0; c < colours; c++ )
-						{
-							*pd++ = *ps++;
-						}
-					}
-					else
-					{
-						ps += colours;
-					}
-					last_w_index = w_index;
-				}
-			}
-			last_h_index = h_index;
-		}
-        new_width = last_w_index;
-        new_height = last_h_index;
-	}
-	
-	AssignDirect( new_width, new_height, colours, subpixelorder, scale_buffer, scale_buffer_size, ZM_BUFTYPE_ZM);
-	
+        unsigned char *ps = &buffer[y*wc];
+        for ( unsigned int x = 0; x < (unsigned int)width; x++ )
+        {
+          w_count += factor;
+          w_index = w_count/ZM_SCALE_BASE;
+          
+          if ( w_index > last_w_index )
+          {
+            for ( unsigned int c = 0; c < colours; c++ )
+            {
+              *pd++ = *ps++;
+            }
+          }
+          else
+          {
+            ps += colours;
+          }
+          last_w_index = w_index;
+        }
+      }
+      last_h_index = h_index;
+    }
+    new_width = last_w_index;
+    new_height = last_h_index;
+  }
+  
+  AssignDirect( new_width, new_height, colours, subpixelorder, scale_buffer, scale_buffer_size, ZM_BUFTYPE_ZM);
+  
 }
 
 void Image::Deinterlace_Discard()
 {
-	/* Simple deinterlacing. Copy the even lines into the odd lines */
-	
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		const uint8_t *psrc;
-		uint8_t *pdest;
-		for (unsigned int y = 0; y < (unsigned int)height; y += 2)
-		{
-			psrc = buffer + (y * width);
-			pdest = buffer + ((y+1) * width);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pdest++ = *psrc++;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		const uint8_t *psrc;
-		uint8_t *pdest;
-		for (unsigned int y = 0; y < (unsigned int)height; y += 2)
-		{
-			psrc = buffer + ((y * width) * 3);
-			pdest = buffer + (((y+1) * width) * 3);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pdest++ = *psrc++;
-				*pdest++ = *psrc++;
-				*pdest++ = *psrc++;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 )
-	{
-		const Rgb *psrc;
-		Rgb *pdest;
-		for (unsigned int y = 0; y < (unsigned int)height; y += 2)
-		{
-			psrc = (Rgb*)(buffer + ((y * width) << 2));
-			pdest = (Rgb*)(buffer + (((y+1) * width) << 2));
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pdest++ = *psrc++;
-			}
-		}
-	} else {
-		Error("Deinterlace called with unexpected colours: %d", colours);
-	}
-	
+  /* Simple deinterlacing. Copy the even lines into the odd lines */
+  
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    const uint8_t *psrc;
+    uint8_t *pdest;
+    for (unsigned int y = 0; y < (unsigned int)height; y += 2)
+    {
+      psrc = buffer + (y * width);
+      pdest = buffer + ((y+1) * width);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pdest++ = *psrc++;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    const uint8_t *psrc;
+    uint8_t *pdest;
+    for (unsigned int y = 0; y < (unsigned int)height; y += 2)
+    {
+      psrc = buffer + ((y * width) * 3);
+      pdest = buffer + (((y+1) * width) * 3);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pdest++ = *psrc++;
+        *pdest++ = *psrc++;
+        *pdest++ = *psrc++;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 )
+  {
+    const Rgb *psrc;
+    Rgb *pdest;
+    for (unsigned int y = 0; y < (unsigned int)height; y += 2)
+    {
+      psrc = (Rgb*)(buffer + ((y * width) << 2));
+      pdest = (Rgb*)(buffer + (((y+1) * width) << 2));
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pdest++ = *psrc++;
+      }
+    }
+  } else {
+    Error("Deinterlace called with unexpected colours: %d", colours);
+  }
+  
 }
 
 void Image::Deinterlace_Linear()
 {
-	/* Simple deinterlacing. The odd lines are average of the line above and line below */
-	
-	const uint8_t *pbelow, *pabove;
-	uint8_t *pcurrent;
-	
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
-		{
-			pabove = buffer + ((y-1) * width);
-			pbelow = buffer + ((y+1) * width);
-			pcurrent = buffer + (y * width);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-			}
-		}
-		/* Special case for the last line */
-		pcurrent = buffer + ((height-1) * width);
-		pabove = buffer + ((height-2) * width);
-		for (unsigned int x = 0; x < (unsigned int)width; x++) {
-			*pcurrent++ = *pabove++;
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
-		{
-			pabove = buffer + (((y-1) * width) * 3);
-			pbelow = buffer + (((y+1) * width) * 3);
-			pcurrent = buffer + ((y * width) * 3);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-			}
-		}
-		/* Special case for the last line */
-		pcurrent = buffer + (((height-1) * width) * 3);
-		pabove = buffer + (((height-2) * width) * 3);
-		for (unsigned int x = 0; x < (unsigned int)width; x++) {
-			*pcurrent++ = *pabove++;
-			*pcurrent++ = *pabove++;
-			*pcurrent++ = *pabove++;
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
-		{
-			pabove = buffer + (((y-1) * width) << 2);
-			pbelow = buffer + (((y+1) * width) << 2);
-			pcurrent = buffer + ((y * width) << 2);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-				*pcurrent++ = (*pabove++ + *pbelow++) >> 1;
-			}
-		}
-		/* Special case for the last line */
-		pcurrent = buffer + (((height-1) * width) << 2);
-		pabove = buffer + (((height-2) * width) << 2);
-		for (unsigned int x = 0; x < (unsigned int)width; x++) {
-			*pcurrent++ = *pabove++;
-			*pcurrent++ = *pabove++;
-			*pcurrent++ = *pabove++;  
-			*pcurrent++ = *pabove++;
-		}
-	} else {
-		Error("Deinterlace called with unexpected colours: %d", colours);
-	}
-	
+  /* Simple deinterlacing. The odd lines are average of the line above and line below */
+  
+  const uint8_t *pbelow, *pabove;
+  uint8_t *pcurrent;
+  
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
+    {
+      pabove = buffer + ((y-1) * width);
+      pbelow = buffer + ((y+1) * width);
+      pcurrent = buffer + (y * width);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+      }
+    }
+    /* Special case for the last line */
+    pcurrent = buffer + ((height-1) * width);
+    pabove = buffer + ((height-2) * width);
+    for (unsigned int x = 0; x < (unsigned int)width; x++) {
+      *pcurrent++ = *pabove++;
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
+    {
+      pabove = buffer + (((y-1) * width) * 3);
+      pbelow = buffer + (((y+1) * width) * 3);
+      pcurrent = buffer + ((y * width) * 3);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+      }
+    }
+    /* Special case for the last line */
+    pcurrent = buffer + (((height-1) * width) * 3);
+    pabove = buffer + (((height-2) * width) * 3);
+    for (unsigned int x = 0; x < (unsigned int)width; x++) {
+      *pcurrent++ = *pabove++;
+      *pcurrent++ = *pabove++;
+      *pcurrent++ = *pabove++;
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)(height-1); y += 2)
+    {
+      pabove = buffer + (((y-1) * width) << 2);
+      pbelow = buffer + (((y+1) * width) << 2);
+      pcurrent = buffer + ((y * width) << 2);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+        *pcurrent++ = (*pabove++ + *pbelow++) >> 1;
+      }
+    }
+    /* Special case for the last line */
+    pcurrent = buffer + (((height-1) * width) << 2);
+    pabove = buffer + (((height-2) * width) << 2);
+    for (unsigned int x = 0; x < (unsigned int)width; x++) {
+      *pcurrent++ = *pabove++;
+      *pcurrent++ = *pabove++;
+      *pcurrent++ = *pabove++;  
+      *pcurrent++ = *pabove++;
+    }
+  } else {
+    Error("Deinterlace called with unexpected colours: %d", colours);
+  }
+  
 }
 
 void Image::Deinterlace_Blend()
 {
-	/* Simple deinterlacing. Blend the fields together. 50% blend */
-	
-	uint8_t *pabove, *pcurrent;
-	
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-		{
-			pabove = buffer + ((y-1) * width);
-			pcurrent = buffer + (y * width);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-		{
-			pabove = buffer + (((y-1) * width) * 3);
-			pcurrent = buffer + ((y * width) * 3);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-		{
-			pabove = buffer + (((y-1) * width) << 2);
-			pcurrent = buffer + ((y * width) << 2);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-				*pabove = (*pabove + *pcurrent) >> 1;
-				*pcurrent++ = *pabove++;
-			}
-		}
-	} else {
-		Error("Deinterlace called with unexpected colours: %d", colours);
-	}
-	
+  /* Simple deinterlacing. Blend the fields together. 50% blend */
+  
+  uint8_t *pabove, *pcurrent;
+  
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
+    {
+      pabove = buffer + ((y-1) * width);
+      pcurrent = buffer + (y * width);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
+    {
+      pabove = buffer + (((y-1) * width) * 3);
+      pcurrent = buffer + ((y * width) * 3);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
+    {
+      pabove = buffer + (((y-1) * width) << 2);
+      pcurrent = buffer + ((y * width) << 2);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+        *pabove = (*pabove + *pcurrent) >> 1;
+        *pcurrent++ = *pabove++;
+      }
+    }
+  } else {
+    Error("Deinterlace called with unexpected colours: %d", colours);
+  }
+  
 }
 
 void Image::Deinterlace_Blend_CustomRatio(int divider)
 {
-	/* Simple deinterlacing. Blend the fields together at a custom ratio. */
-	/* 1 = 50% blending   */
-	/* 2 = 25% blending   */
-	/* 3 = 12.% blending  */
-	/* 4 = 6.25% blending */
-	
-	uint8_t *pabove, *pcurrent;
-	uint8_t subpix1, subpix2;
-	
-	if ( divider < 1 || divider > 4 ) {
-		Error("Deinterlace called with invalid blend ratio");
-	}
-	
-	if ( colours == ZM_COLOUR_GRAY8 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-		{
-			pabove = buffer + ((y-1) * width);
-			pcurrent = buffer + (y * width);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB24 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-		{
-			pabove = buffer + (((y-1) * width) * 3);
-			pcurrent = buffer + ((y * width) * 3);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-			}
-		}
-	}
-	else if ( colours == ZM_COLOUR_RGB32 )
-	{
-		for (unsigned int y = 1; y < (unsigned int)height; y += 2)
-		{
-			pabove = buffer + (((y-1) * width) << 2);
-			pcurrent = buffer + ((y * width) << 2);
-			for (unsigned int x = 0; x < (unsigned int)width; x++) {
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-				subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
-				subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
-				*pcurrent++ = subpix1;
-				*pabove++ = subpix2;
-			}
-		}
-	} else {
-		Error("Deinterlace called with unexpected colours: %d", colours);
-	}
-	
+  /* Simple deinterlacing. Blend the fields together at a custom ratio. */
+  /* 1 = 50% blending   */
+  /* 2 = 25% blending   */
+  /* 3 = 12.% blending  */
+  /* 4 = 6.25% blending */
+  
+  uint8_t *pabove, *pcurrent;
+  uint8_t subpix1, subpix2;
+  
+  if ( divider < 1 || divider > 4 ) {
+    Error("Deinterlace called with invalid blend ratio");
+  }
+  
+  if ( colours == ZM_COLOUR_GRAY8 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
+    {
+      pabove = buffer + ((y-1) * width);
+      pcurrent = buffer + (y * width);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB24 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
+    {
+      pabove = buffer + (((y-1) * width) * 3);
+      pcurrent = buffer + ((y * width) * 3);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+      }
+    }
+  }
+  else if ( colours == ZM_COLOUR_RGB32 )
+  {
+    for (unsigned int y = 1; y < (unsigned int)height; y += 2)
+    {
+      pabove = buffer + (((y-1) * width) << 2);
+      pcurrent = buffer + ((y * width) << 2);
+      for (unsigned int x = 0; x < (unsigned int)width; x++) {
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+        subpix1 = ((*pabove - *pcurrent)>>divider) + *pcurrent;
+        subpix2 = ((*pcurrent - *pabove)>>divider) + *pabove;
+        *pcurrent++ = subpix1;
+        *pabove++ = subpix2;
+      }
+    }
+  } else {
+    Error("Deinterlace called with unexpected colours: %d", colours);
+  }
+  
 }
 
 
 void Image::Deinterlace_4Field(const Image* next_image, unsigned int threshold)
 {
-	if ( !(width == next_image->width && height == next_image->height && colours == next_image->colours && subpixelorder == next_image->subpixelorder) )
-	{
-		Panic( "Attempt to deinterlace different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, next_image->width, next_image->height, next_image->colours, next_image->subpixelorder);
-	}
-	
-	switch(colours) {
-	  case ZM_COLOUR_RGB24:
-	  {
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-	      /* BGR subpixel order */
-	      std_deinterlace_4field_bgr(buffer, next_image->buffer, threshold, width, height);
-	    } else {
-	      /* Assume RGB subpixel order */
-	      std_deinterlace_4field_rgb(buffer, next_image->buffer, threshold, width, height);
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
-	    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      /* ARGB subpixel order */
-	      (*fptr_deinterlace_4field_argb)(buffer, next_image->buffer, threshold, width, height);
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      /* ABGR subpixel order */
-	      (*fptr_deinterlace_4field_abgr)(buffer, next_image->buffer, threshold, width, height);
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      /* BGRA subpixel order */
-	      (*fptr_deinterlace_4field_bgra)(buffer, next_image->buffer, threshold, width, height);
-	    } else {
-	      /* Assume RGBA subpixel order */
-	      (*fptr_deinterlace_4field_rgba)(buffer, next_image->buffer, threshold, width, height);
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_GRAY8:
-	    (*fptr_deinterlace_4field_gray8)(buffer, next_image->buffer, threshold, width, height);
-	    break;
-	  default:
-	    Panic("Deinterlace_4Field called with unexpected colours: %d",colours);
-	    break;
-	}
-	
+  if ( !(width == next_image->width && height == next_image->height && colours == next_image->colours && subpixelorder == next_image->subpixelorder) )
+  {
+    Panic( "Attempt to deinterlace different sized images, expected %dx%dx%d %d, got %dx%dx%d %d", width, height, colours, subpixelorder, next_image->width, next_image->height, next_image->colours, next_image->subpixelorder);
+  }
+  
+  switch(colours) {
+    case ZM_COLOUR_RGB24:
+    {
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+      /* BGR subpixel order */
+      std_deinterlace_4field_bgr(buffer, next_image->buffer, threshold, width, height);
+    } else {
+      /* Assume RGB subpixel order */
+      std_deinterlace_4field_rgb(buffer, next_image->buffer, threshold, width, height);
+    }
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
+    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      /* ARGB subpixel order */
+      (*fptr_deinterlace_4field_argb)(buffer, next_image->buffer, threshold, width, height);
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      /* ABGR subpixel order */
+      (*fptr_deinterlace_4field_abgr)(buffer, next_image->buffer, threshold, width, height);
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* BGRA subpixel order */
+      (*fptr_deinterlace_4field_bgra)(buffer, next_image->buffer, threshold, width, height);
+    } else {
+      /* Assume RGBA subpixel order */
+      (*fptr_deinterlace_4field_rgba)(buffer, next_image->buffer, threshold, width, height);
+    }
+    break;
+    }
+    case ZM_COLOUR_GRAY8:
+    (*fptr_deinterlace_4field_gray8)(buffer, next_image->buffer, threshold, width, height);
+    break;
+    default:
+    Panic("Deinterlace_4Field called with unexpected colours: %d",colours);
+    break;
+  }
+  
 }
 
 
@@ -3124,343 +3124,343 @@ __attribute__((noinline,__target__("sse2")))
 #endif
 void sse2_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
-	static uint32_t divider = 0;
-	static uint32_t clearmask = 0;
-	static double current_blendpercent = 0.0;
-	
-	if(current_blendpercent != blendpercent) {
-		/* Attempt to match the blending percent to one of the possible values */
-		if(blendpercent < 2.34375) {
-			// 1.5625% blending
-			divider = 6;
-			clearmask = 0x03030303;
-		} else if(blendpercent < 4.6875) {
-			// 3.125% blending
-			divider = 5;
-			clearmask = 0x07070707;
-		} else if(blendpercent < 9.375) {
-			// 6.25% blending
-			divider = 4;
-			clearmask = 0x0F0F0F0F;
-		} else if(blendpercent < 18.75) {
-			// 12.5% blending
-			divider = 3;
-			clearmask = 0x1F1F1F1F;
-		} else if(blendpercent < 37.5) {
-			// 25% blending
-			divider = 2;
-			clearmask = 0x3F3F3F3F;
-		} else {
-			// 50% blending
-			divider = 1;
-			clearmask = 0x7F7F7F7F;
-		}
-		current_blendpercent = blendpercent;
-	}
+  static uint32_t divider = 0;
+  static uint32_t clearmask = 0;
+  static double current_blendpercent = 0.0;
+  
+  if(current_blendpercent != blendpercent) {
+    /* Attempt to match the blending percent to one of the possible values */
+    if(blendpercent < 2.34375) {
+      // 1.5625% blending
+      divider = 6;
+      clearmask = 0x03030303;
+    } else if(blendpercent < 4.6875) {
+      // 3.125% blending
+      divider = 5;
+      clearmask = 0x07070707;
+    } else if(blendpercent < 9.375) {
+      // 6.25% blending
+      divider = 4;
+      clearmask = 0x0F0F0F0F;
+    } else if(blendpercent < 18.75) {
+      // 12.5% blending
+      divider = 3;
+      clearmask = 0x1F1F1F1F;
+    } else if(blendpercent < 37.5) {
+      // 25% blending
+      divider = 2;
+      clearmask = 0x3F3F3F3F;
+    } else {
+      // 50% blending
+      divider = 1;
+      clearmask = 0x7F7F7F7F;
+    }
+    current_blendpercent = blendpercent;
+  }
 
-	__asm__ __volatile__(
-	"movd %4, %%xmm3\n\t"
-	"movd %5, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm3, %%xmm3\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x10, %2\n\t"
-	"sse2_fastblend_iter:\n\t"
-	"movdqa (%0,%3),%%xmm0\n\t"
-	"movdqa %%xmm0,%%xmm2\n\t"
-	"movdqa (%1,%3),%%xmm1\n\t"
-	"psrlq  %%xmm4,%%xmm0\n\t"
-	"psrlq  %%xmm4,%%xmm1\n\t"
-	"pand   %%xmm3,%%xmm1\n\t"
-	"pand   %%xmm3,%%xmm0\n\t"
-	"psubb  %%xmm0,%%xmm1\n\t"
-	"paddb  %%xmm2,%%xmm1\n\t"
-	"movntdq %%xmm1,(%2,%3)\n\t"
-	"sub $0x10, %3\n\t"
-	"jnz sse2_fastblend_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (clearmask), "m" (divider)
-	: "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "cc", "memory"
-	);
+  __asm__ __volatile__(
+  "movd %4, %%xmm3\n\t"
+  "movd %5, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm3, %%xmm3\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x10, %2\n\t"
+  "sse2_fastblend_iter:\n\t"
+  "movdqa (%0,%3),%%xmm0\n\t"
+  "movdqa %%xmm0,%%xmm2\n\t"
+  "movdqa (%1,%3),%%xmm1\n\t"
+  "psrlq  %%xmm4,%%xmm0\n\t"
+  "psrlq  %%xmm4,%%xmm1\n\t"
+  "pand   %%xmm3,%%xmm1\n\t"
+  "pand   %%xmm3,%%xmm0\n\t"
+  "psubb  %%xmm0,%%xmm1\n\t"
+  "paddb  %%xmm2,%%xmm1\n\t"
+  "movntdq %%xmm1,(%2,%3)\n\t"
+  "sub $0x10, %3\n\t"
+  "jnz sse2_fastblend_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (clearmask), "m" (divider)
+  : "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
 __attribute__((noinline)) void std_fastblend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
-	static int divider = 0;
-	static double current_blendpercent = 0.0;
-	const uint8_t* const max_ptr = result + count;
-	
-	if(current_blendpercent != blendpercent) {
-		/* Attempt to match the blending percent to one of the possible values */
-		if(blendpercent < 2.34375) {
-			// 1.5625% blending
-			divider = 6;
-		} else if(blendpercent < 4.6875) {
-			// 3.125% blending
-			divider = 5;
-		} else if(blendpercent < 9.375) {
-			// 6.25% blending
-			divider = 4;
-		} else if(blendpercent < 18.75) {
-			// 12.5% blending
-			divider = 3;
-		} else if(blendpercent < 37.5) {
-			// 25% blending
-			divider = 2;
-		} else {
-			// 50% blending
-			divider = 1;
-		}
-		current_blendpercent = blendpercent;
-	}
-	
+  static int divider = 0;
+  static double current_blendpercent = 0.0;
+  const uint8_t* const max_ptr = result + count;
+  
+  if(current_blendpercent != blendpercent) {
+    /* Attempt to match the blending percent to one of the possible values */
+    if(blendpercent < 2.34375) {
+      // 1.5625% blending
+      divider = 6;
+    } else if(blendpercent < 4.6875) {
+      // 3.125% blending
+      divider = 5;
+    } else if(blendpercent < 9.375) {
+      // 6.25% blending
+      divider = 4;
+    } else if(blendpercent < 18.75) {
+      // 12.5% blending
+      divider = 3;
+    } else if(blendpercent < 37.5) {
+      // 25% blending
+      divider = 2;
+    } else {
+      // 50% blending
+      divider = 1;
+    }
+    current_blendpercent = blendpercent;
+  }
+  
 
-	while(result < max_ptr) {
-		result[0] = ((col2[0] - col1[0])>>divider) + col1[0];
-		result[1] = ((col2[1] - col1[1])>>divider) + col1[1];
-		result[2] = ((col2[2] - col1[2])>>divider) + col1[2];
-		result[3] = ((col2[3] - col1[3])>>divider) + col1[3];
-		result[4] = ((col2[4] - col1[4])>>divider) + col1[4];
-		result[5] = ((col2[5] - col1[5])>>divider) + col1[5];
-		result[6] = ((col2[6] - col1[6])>>divider) + col1[6];
-		result[7] = ((col2[7] - col1[7])>>divider) + col1[7];
-		result[8] = ((col2[8] - col1[8])>>divider) + col1[8];
-		result[9] = ((col2[9] - col1[9])>>divider) + col1[9];
-		result[10] = ((col2[10] - col1[10])>>divider) + col1[10];
-		result[11] = ((col2[11] - col1[11])>>divider) + col1[11];
-		result[12] = ((col2[12] - col1[12])>>divider) + col1[12];
-		result[13] = ((col2[13] - col1[13])>>divider) + col1[13];
-		result[14] = ((col2[14] - col1[14])>>divider) + col1[14];
-		result[15] = ((col2[15] - col1[15])>>divider) + col1[15];
-		
-		col1 += 16;
-		col2 += 16;
-		result += 16;
-	}
+  while(result < max_ptr) {
+    result[0] = ((col2[0] - col1[0])>>divider) + col1[0];
+    result[1] = ((col2[1] - col1[1])>>divider) + col1[1];
+    result[2] = ((col2[2] - col1[2])>>divider) + col1[2];
+    result[3] = ((col2[3] - col1[3])>>divider) + col1[3];
+    result[4] = ((col2[4] - col1[4])>>divider) + col1[4];
+    result[5] = ((col2[5] - col1[5])>>divider) + col1[5];
+    result[6] = ((col2[6] - col1[6])>>divider) + col1[6];
+    result[7] = ((col2[7] - col1[7])>>divider) + col1[7];
+    result[8] = ((col2[8] - col1[8])>>divider) + col1[8];
+    result[9] = ((col2[9] - col1[9])>>divider) + col1[9];
+    result[10] = ((col2[10] - col1[10])>>divider) + col1[10];
+    result[11] = ((col2[11] - col1[11])>>divider) + col1[11];
+    result[12] = ((col2[12] - col1[12])>>divider) + col1[12];
+    result[13] = ((col2[13] - col1[13])>>divider) + col1[13];
+    result[14] = ((col2[14] - col1[14])>>divider) + col1[14];
+    result[15] = ((col2[15] - col1[15])>>divider) + col1[15];
+    
+    col1 += 16;
+    col2 += 16;
+    result += 16;
+  }
 }
 
 __attribute__((noinline)) void std_blend(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count, double blendpercent) {
-	double divide = blendpercent / 100.0;
-	double opacity = 1.0 - divide;
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		*result++ = (*col1++ * opacity) + (*col2++ * divide);
-		
-	} 
+  double divide = blendpercent / 100.0;
+  double opacity = 1.0 - divide;
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    *result++ = (*col1++ * opacity) + (*col2++ * divide);
+    
+  } 
 }
 
 /************************************************* DELTA FUNCTIONS *************************************************/
 
 /* Grayscale */
 __attribute__((noinline)) void std_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 16 bytes (16 grayscale pixels) at a time */  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		result[0] = abs(col1[0] - col2[0]);
-		result[1] = abs(col1[1] - col2[1]);
-		result[2] = abs(col1[2] - col2[2]);
-		result[3] = abs(col1[3] - col2[3]);
-		result[4] = abs(col1[4] - col2[4]);
-		result[5] = abs(col1[5] - col2[5]);
-		result[6] = abs(col1[6] - col2[6]);
-		result[7] = abs(col1[7] - col2[7]);
-		result[8] = abs(col1[8] - col2[8]);
-		result[9] = abs(col1[9] - col2[9]);
-		result[10] = abs(col1[10] - col2[10]);
-		result[11] = abs(col1[11] - col2[11]);
-		result[12] = abs(col1[12] - col2[12]);
-		result[13] = abs(col1[13] - col2[13]);
-		result[14] = abs(col1[14] - col2[14]);
-		result[15] = abs(col1[15] - col2[15]);
-		
-		col1 += 16;
-		col2 += 16;
-		result += 16;
-	}  
+  /* Loop unrolling is used to work on 16 bytes (16 grayscale pixels) at a time */  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    result[0] = abs(col1[0] - col2[0]);
+    result[1] = abs(col1[1] - col2[1]);
+    result[2] = abs(col1[2] - col2[2]);
+    result[3] = abs(col1[3] - col2[3]);
+    result[4] = abs(col1[4] - col2[4]);
+    result[5] = abs(col1[5] - col2[5]);
+    result[6] = abs(col1[6] - col2[6]);
+    result[7] = abs(col1[7] - col2[7]);
+    result[8] = abs(col1[8] - col2[8]);
+    result[9] = abs(col1[9] - col2[9]);
+    result[10] = abs(col1[10] - col2[10]);
+    result[11] = abs(col1[11] - col2[11]);
+    result[12] = abs(col1[12] - col2[12]);
+    result[13] = abs(col1[13] - col2[13]);
+    result[14] = abs(col1[14] - col2[14]);
+    result[15] = abs(col1[15] - col2[15]);
+    
+    col1 += 16;
+    col2 += 16;
+    result += 16;
+  }  
 }
 
 /* RGB24: RGB */
 __attribute__((noinline)) void std_delta8_rgb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
-	int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		r = abs(col1[0] - col2[0]);
-		g = abs(col1[1] - col2[1]);
-		b = abs(col1[2] - col2[2]);
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[3] - col2[3]);
-		g = abs(col1[4] - col2[4]);
-		b = abs(col1[5] - col2[5]);
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[6] - col2[6]);
-		g = abs(col1[7] - col2[7]);
-		b = abs(col1[8] - col2[8]);
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[9] - col2[9]);
-		g = abs(col1[10] - col2[10]);
-		b = abs(col1[11] - col2[11]);
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 12;
-		col2 += 12;
-		result += 4;
-	}
+  /* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
+  int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    r = abs(col1[0] - col2[0]);
+    g = abs(col1[1] - col2[1]);
+    b = abs(col1[2] - col2[2]);
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[3] - col2[3]);
+    g = abs(col1[4] - col2[4]);
+    b = abs(col1[5] - col2[5]);
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[6] - col2[6]);
+    g = abs(col1[7] - col2[7]);
+    b = abs(col1[8] - col2[8]);
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[9] - col2[9]);
+    g = abs(col1[10] - col2[10]);
+    b = abs(col1[11] - col2[11]);
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 12;
+    col2 += 12;
+    result += 4;
+  }
 }
 
 /* RGB24: BGR */
 __attribute__((noinline)) void std_delta8_bgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
-	int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		b = abs(col1[0] - col2[0]);
-		g = abs(col1[1] - col2[1]);
-		r = abs(col1[2] - col2[2]);
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[3] - col2[3]);
-		g = abs(col1[4] - col2[4]);
-		r = abs(col1[5] - col2[5]);
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[6] - col2[6]);
-		g = abs(col1[7] - col2[7]);
-		r = abs(col1[8] - col2[8]);
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[9] - col2[9]);
-		g = abs(col1[10] - col2[10]);
-		r = abs(col1[11] - col2[11]);
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 12;
-		col2 += 12;
-		result += 4;
-	}
+  /* Loop unrolling is used to work on 12 bytes (4 rgb24 pixels) at a time */
+  int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    b = abs(col1[0] - col2[0]);
+    g = abs(col1[1] - col2[1]);
+    r = abs(col1[2] - col2[2]);
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[3] - col2[3]);
+    g = abs(col1[4] - col2[4]);
+    r = abs(col1[5] - col2[5]);
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[6] - col2[6]);
+    g = abs(col1[7] - col2[7]);
+    r = abs(col1[8] - col2[8]);
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[9] - col2[9]);
+    g = abs(col1[10] - col2[10]);
+    r = abs(col1[11] - col2[11]);
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 12;
+    col2 += 12;
+    result += 4;
+  }
 }
 
 /* RGB32: RGBA */
 __attribute__((noinline)) void std_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-	int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		r = abs(col1[0] - col2[0]);
-		g = abs(col1[1] - col2[1]);
-		b = abs(col1[2] - col2[2]);
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[4] - col2[4]);
-		g = abs(col1[5] - col2[5]);
-		b = abs(col1[6] - col2[6]);
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[8] - col2[8]);
-		g = abs(col1[9] - col2[9]);
-		b = abs(col1[10] - col2[10]);
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[12] - col2[12]);
-		g = abs(col1[13] - col2[13]);
-		b = abs(col1[14] - col2[14]);
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		col2 += 16;
-		result += 4;
-	}
+  /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
+  int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    r = abs(col1[0] - col2[0]);
+    g = abs(col1[1] - col2[1]);
+    b = abs(col1[2] - col2[2]);
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[4] - col2[4]);
+    g = abs(col1[5] - col2[5]);
+    b = abs(col1[6] - col2[6]);
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[8] - col2[8]);
+    g = abs(col1[9] - col2[9]);
+    b = abs(col1[10] - col2[10]);
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[12] - col2[12]);
+    g = abs(col1[13] - col2[13]);
+    b = abs(col1[14] - col2[14]);
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    col2 += 16;
+    result += 4;
+  }
 }
 
 /* RGB32: BGRA */
 __attribute__((noinline)) void std_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-	int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		b = abs(col1[0] - col2[0]);
-		g = abs(col1[1] - col2[1]);
-		r = abs(col1[2] - col2[2]);
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[4] - col2[4]);
-		g = abs(col1[5] - col2[5]);
-		r = abs(col1[6] - col2[6]);
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[8] - col2[8]);
-		g = abs(col1[9] - col2[9]);
-		r = abs(col1[10] - col2[10]);
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[12] - col2[12]);
-		g = abs(col1[13] - col2[13]);
-		r = abs(col1[14] - col2[14]);
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		col2 += 16;
-		result += 4;
-	}
+  /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
+  int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    b = abs(col1[0] - col2[0]);
+    g = abs(col1[1] - col2[1]);
+    r = abs(col1[2] - col2[2]);
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[4] - col2[4]);
+    g = abs(col1[5] - col2[5]);
+    r = abs(col1[6] - col2[6]);
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[8] - col2[8]);
+    g = abs(col1[9] - col2[9]);
+    r = abs(col1[10] - col2[10]);
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[12] - col2[12]);
+    g = abs(col1[13] - col2[13]);
+    r = abs(col1[14] - col2[14]);
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    col2 += 16;
+    result += 4;
+  }
 }
 
 /* RGB32: ARGB */
 __attribute__((noinline)) void std_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-	int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		r = abs(col1[1] - col2[1]);
-		g = abs(col1[2] - col2[2]);
-		b = abs(col1[3] - col2[3]);
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[5] - col2[5]);
-		g = abs(col1[6] - col2[6]);
-		b = abs(col1[7] - col2[7]);
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[9] - col2[9]);
-		g = abs(col1[10] - col2[10]);
-		b = abs(col1[11] - col2[11]);
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		r = abs(col1[13] - col2[13]);
-		g = abs(col1[14] - col2[14]);
-		b = abs(col1[15] - col2[15]);
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		col2 += 16;
-		result += 4;
-	}
+  /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
+  int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    r = abs(col1[1] - col2[1]);
+    g = abs(col1[2] - col2[2]);
+    b = abs(col1[3] - col2[3]);
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[5] - col2[5]);
+    g = abs(col1[6] - col2[6]);
+    b = abs(col1[7] - col2[7]);
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[9] - col2[9]);
+    g = abs(col1[10] - col2[10]);
+    b = abs(col1[11] - col2[11]);
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    r = abs(col1[13] - col2[13]);
+    g = abs(col1[14] - col2[14]);
+    b = abs(col1[15] - col2[15]);
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    col2 += 16;
+    result += 4;
+  }
 }
 
 /* RGB32: ABGR */
 __attribute__((noinline)) void std_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
-	/* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
-	int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		b = abs(col1[1] - col2[1]);
-		g = abs(col1[2] - col2[2]);
-		r = abs(col1[3] - col2[3]);
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[5] - col2[5]);
-		g = abs(col1[6] - col2[6]);
-		r = abs(col1[7] - col2[7]);
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[9] - col2[9]);
-		g = abs(col1[10] - col2[10]);
-		r = abs(col1[11] - col2[11]);
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		b = abs(col1[13] - col2[13]);
-		g = abs(col1[14] - col2[14]);
-		r = abs(col1[15] - col2[15]);
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		col2 += 16;
-		result += 4;
-	}
+  /* Loop unrolling is used to work on 16 bytes (4 rgb32 pixels) at a time */
+  int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    b = abs(col1[1] - col2[1]);
+    g = abs(col1[2] - col2[2]);
+    r = abs(col1[3] - col2[3]);
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[5] - col2[5]);
+    g = abs(col1[6] - col2[6]);
+    r = abs(col1[7] - col2[7]);
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[9] - col2[9]);
+    g = abs(col1[10] - col2[10]);
+    r = abs(col1[11] - col2[11]);
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    b = abs(col1[13] - col2[13]);
+    g = abs(col1[14] - col2[14]);
+    r = abs(col1[15] - col2[15]);
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    col2 += 16;
+    result += 4;
+  }
 }
 
 /* Grayscale SSE2 */
@@ -3470,27 +3470,27 @@ __attribute__((noinline,__target__("sse2")))
 void sse2_delta8_gray8(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
 
-	__asm__ __volatile__ (
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x10, %2\n\t"
-	"sse2_delta8_gray8_iter:\n\t"
-	"movdqa (%0,%3), %%xmm1\n\t"
-	"movdqa (%1,%3), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm3\n\t"
-	"movdqa %%xmm2, %%xmm4\n\t"
-	"pmaxub %%xmm1, %%xmm2\n\t"
-	"pminub %%xmm3, %%xmm4\n\t"
-	"psubb  %%xmm4, %%xmm2\n\t"
-	"movntdq %%xmm2, (%2,%3)\n\t"
-	"sub $0x10, %3\n\t"
-	"jnz sse2_delta8_gray8_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count)
-	: "%xmm1", "%xmm2", "%xmm3", "%xmm4", "cc", "memory"
-	);
+  __asm__ __volatile__ (
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x10, %2\n\t"
+  "sse2_delta8_gray8_iter:\n\t"
+  "movdqa (%0,%3), %%xmm1\n\t"
+  "movdqa (%1,%3), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm3\n\t"
+  "movdqa %%xmm2, %%xmm4\n\t"
+  "pmaxub %%xmm1, %%xmm2\n\t"
+  "pminub %%xmm3, %%xmm4\n\t"
+  "psubb  %%xmm4, %%xmm2\n\t"
+  "movntdq %%xmm2, (%2,%3)\n\t"
+  "sub $0x10, %3\n\t"
+  "jnz sse2_delta8_gray8_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count)
+  : "%xmm1", "%xmm2", "%xmm3", "%xmm4", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3501,54 +3501,54 @@ __attribute__((noinline,__target__("sse2")))
 void sse2_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
   
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"sse2_delta8_rgba_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t"
-	"movdqa %%xmm2, %%xmm6\n\t"
-	"pmaxub %%xmm1, %%xmm2\n\t"
-	"pminub %%xmm5, %%xmm6\n\t"
-	"psubb %%xmm6, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm3\n\t"
-	"psrld $0x8, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm1, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"packssdw %%xmm1, %%xmm1\n\t"
-	"packuswb %%xmm1, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz sse2_delta8_rgba_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
-	);
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "sse2_delta8_rgba_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t"
+  "movdqa %%xmm2, %%xmm6\n\t"
+  "pmaxub %%xmm1, %%xmm2\n\t"
+  "pminub %%xmm5, %%xmm6\n\t"
+  "psubb %%xmm6, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm3\n\t"
+  "psrld $0x8, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm1, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "packssdw %%xmm1, %%xmm1\n\t"
+  "packuswb %%xmm1, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz sse2_delta8_rgba_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3559,54 +3559,54 @@ __attribute__((noinline,__target__("sse2")))
 void sse2_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
   
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"sse2_delta8_bgra_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t"
-	"movdqa %%xmm2, %%xmm6\n\t"
-	"pmaxub %%xmm1, %%xmm2\n\t"
-	"pminub %%xmm5, %%xmm6\n\t"
-	"psubb %%xmm6, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm3\n\t"
-	"psrld $0x8, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"packssdw %%xmm1, %%xmm1\n\t"
-	"packuswb %%xmm1, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz sse2_delta8_bgra_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
-	);
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "sse2_delta8_bgra_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t"
+  "movdqa %%xmm2, %%xmm6\n\t"
+  "pmaxub %%xmm1, %%xmm2\n\t"
+  "pminub %%xmm5, %%xmm6\n\t"
+  "psubb %%xmm6, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm3\n\t"
+  "psrld $0x8, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "packssdw %%xmm1, %%xmm1\n\t"
+  "packuswb %%xmm1, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz sse2_delta8_bgra_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3617,55 +3617,55 @@ __attribute__((noinline,__target__("sse2")))
 void sse2_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
   
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"sse2_delta8_argb_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t"
-	"movdqa %%xmm2, %%xmm6\n\t"
-	"pmaxub %%xmm1, %%xmm2\n\t"
-	"pminub %%xmm5, %%xmm6\n\t"
-	"psubb %%xmm6, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm3\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"psrld $0x8, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm1, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x18, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"packssdw %%xmm1, %%xmm1\n\t"
-	"packuswb %%xmm1, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz sse2_delta8_argb_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
-	);
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "sse2_delta8_argb_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t"
+  "movdqa %%xmm2, %%xmm6\n\t"
+  "pmaxub %%xmm1, %%xmm2\n\t"
+  "pminub %%xmm5, %%xmm6\n\t"
+  "psubb %%xmm6, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm3\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "psrld $0x8, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm1, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x18, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "packssdw %%xmm1, %%xmm1\n\t"
+  "packuswb %%xmm1, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz sse2_delta8_argb_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3676,55 +3676,55 @@ __attribute__((noinline,__target__("sse2")))
 void sse2_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
   
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"sse2_delta8_abgr_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t"
-	"movdqa %%xmm2, %%xmm6\n\t"
-	"pmaxub %%xmm1, %%xmm2\n\t"
-	"pminub %%xmm5, %%xmm6\n\t"
-	"psubb %%xmm6, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm3\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"psrld $0x8, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x18, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"packssdw %%xmm1, %%xmm1\n\t"
-	"packuswb %%xmm1, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz sse2_delta8_abgr_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
-	);
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "sse2_delta8_abgr_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t"
+  "movdqa %%xmm2, %%xmm6\n\t"
+  "pmaxub %%xmm1, %%xmm2\n\t"
+  "pminub %%xmm5, %%xmm6\n\t"
+  "psubb %%xmm6, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm3\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "psrld $0x8, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x18, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "packssdw %%xmm1, %%xmm1\n\t"
+  "packuswb %%xmm1, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz sse2_delta8_abgr_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3734,52 +3734,52 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_delta8_rgba(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
-	
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"movdqa %4, %%xmm5\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"ssse3_delta8_rgba_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm3\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x8, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm1, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"pshufb %%xmm5, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz ssse3_delta8_rgba_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
-	);
+  
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "movdqa %4, %%xmm5\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "ssse3_delta8_rgba_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm3\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x8, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm1, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "pshufb %%xmm5, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz ssse3_delta8_rgba_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3789,52 +3789,52 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_delta8_bgra(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
-	
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"movdqa %4, %%xmm5\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"ssse3_delta8_bgra_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm3\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x8, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"pshufb %%xmm5, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz ssse3_delta8_bgra_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
-	);
+  
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "movdqa %4, %%xmm5\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "ssse3_delta8_bgra_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm3\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x8, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "pshufb %%xmm5, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz ssse3_delta8_bgra_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3844,53 +3844,53 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_delta8_argb(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
-	
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"movdqa %4, %%xmm5\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"ssse3_delta8_argb_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm3\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"psrld $0x8, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm1, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x18, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"pshufb %%xmm5, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz ssse3_delta8_argb_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
-	);
+  
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "movdqa %4, %%xmm5\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "ssse3_delta8_argb_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm3\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "psrld $0x8, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm1, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x18, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "pshufb %%xmm5, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz ssse3_delta8_argb_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3900,53 +3900,53 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
-	
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"movdqa %4, %%xmm5\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x10, %1\n\t"
-	"sub $0x4, %2\n\t"
-	"ssse3_delta8_abgr_iter:\n\t"
-	"movdqa (%0,%3,4), %%xmm1\n\t"
-	"movdqa (%1,%3,4), %%xmm2\n\t"
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm3\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"psrld $0x8, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x18, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"pshufb %%xmm5, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%2,%3)\n\t"
-	"sub $0x4, %3\n\t"
-	"jnz ssse3_delta8_abgr_iter\n\t"
-	:
-	: "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
-	);
+  
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "movdqa %4, %%xmm5\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x10, %1\n\t"
+  "sub $0x4, %2\n\t"
+  "ssse3_delta8_abgr_iter:\n\t"
+  "movdqa (%0,%3,4), %%xmm1\n\t"
+  "movdqa (%1,%3,4), %%xmm2\n\t"
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm3\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "psrld $0x8, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x18, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "pshufb %%xmm5, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%2,%3)\n\t"
+  "sub $0x4, %3\n\t"
+  "jnz ssse3_delta8_abgr_iter\n\t"
+  :
+  : "r" (col1), "r" (col2), "r" (result), "r" (count), "m" (*movemask)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -3955,198 +3955,198 @@ void ssse3_delta8_abgr(const uint8_t* col1, const uint8_t* col2, uint8_t* result
 
 /* RGB24 to grayscale */
 __attribute__((noinline)) void std_convert_rgb_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		r = col1[0];
-		g = col1[1];
-		b = col1[2];
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[3];
-		g = col1[4];
-		b = col1[5];
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[6];
-		g = col1[7];
-		b = col1[8];
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[9];
-		g = col1[10];
-		b = col1[11];
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 12;
-		result += 4;
-	}
+  unsigned int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    r = col1[0];
+    g = col1[1];
+    b = col1[2];
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[3];
+    g = col1[4];
+    b = col1[5];
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[6];
+    g = col1[7];
+    b = col1[8];
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[9];
+    g = col1[10];
+    b = col1[11];
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 12;
+    result += 4;
+  }
 }
 
 /* BGR24 to grayscale */
 __attribute__((noinline)) void std_convert_bgr_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		b = col1[0];
-		g = col1[1];
-		r = col1[2];
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[3];
-		g = col1[4];
-		r = col1[5];
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[6];
-		g = col1[7];
-		r = col1[8];
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[9];
-		g = col1[10];
-		r = col1[11];
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 12;
-		result += 4;
-	}
+  unsigned int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    b = col1[0];
+    g = col1[1];
+    r = col1[2];
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[3];
+    g = col1[4];
+    r = col1[5];
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[6];
+    g = col1[7];
+    r = col1[8];
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[9];
+    g = col1[10];
+    r = col1[11];
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 12;
+    result += 4;
+  }
 }
 
 /* RGBA to grayscale */
 __attribute__((noinline)) void std_convert_rgba_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		r = col1[0];
-		g = col1[1];
-		b = col1[2];
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[4];
-		g = col1[5];
-		b = col1[6];
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[8];
-		g = col1[9];
-		b = col1[10];
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[12];
-		g = col1[13];
-		b = col1[14];
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		result += 4;
-	}
+  unsigned int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    r = col1[0];
+    g = col1[1];
+    b = col1[2];
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[4];
+    g = col1[5];
+    b = col1[6];
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[8];
+    g = col1[9];
+    b = col1[10];
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[12];
+    g = col1[13];
+    b = col1[14];
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    result += 4;
+  }
 }
 
 /* BGRA to grayscale */
 __attribute__((noinline)) void std_convert_bgra_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		b = col1[0];
-		g = col1[1];
-		r = col1[2];
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[4];
-		g = col1[5];
-		r = col1[6];
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[8];
-		g = col1[9];
-		r = col1[10];
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[12];
-		g = col1[13];
-		r = col1[14];
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		result += 4;
-	}
+  unsigned int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    b = col1[0];
+    g = col1[1];
+    r = col1[2];
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[4];
+    g = col1[5];
+    r = col1[6];
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[8];
+    g = col1[9];
+    r = col1[10];
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[12];
+    g = col1[13];
+    r = col1[14];
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    result += 4;
+  }
 }
 
 /* ARGB to grayscale */
 __attribute__((noinline)) void std_convert_argb_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		r = col1[1];
-		g = col1[2];
-		b = col1[3];
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[5];
-		g = col1[6];
-		b = col1[7];
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[9];
-		g = col1[10];
-		b = col1[11];
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		r = col1[13];
-		g = col1[14];
-		b = col1[15];
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		result += 4;
-	}
+  unsigned int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    r = col1[1];
+    g = col1[2];
+    b = col1[3];
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[5];
+    g = col1[6];
+    b = col1[7];
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[9];
+    g = col1[10];
+    b = col1[11];
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    r = col1[13];
+    g = col1[14];
+    b = col1[15];
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    result += 4;
+  }
 }
 
 /* ABGR to grayscale */
 __attribute__((noinline)) void std_convert_abgr_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		b = col1[1];
-		g = col1[2];
-		r = col1[3];
-		result[0] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[5];
-		g = col1[6];
-		r = col1[7];
-		result[1] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[9];
-		g = col1[10];
-		r = col1[11];
-		result[2] = (r + r + b + g + g + g + g + g)>>3;
-		b = col1[13];
-		g = col1[14];
-		r = col1[15];
-		result[3] = (r + r + b + g + g + g + g + g)>>3;
-		
-		col1 += 16;
-		result += 4;
-	}
+  unsigned int r,g,b;  
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    b = col1[1];
+    g = col1[2];
+    r = col1[3];
+    result[0] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[5];
+    g = col1[6];
+    r = col1[7];
+    result[1] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[9];
+    g = col1[10];
+    r = col1[11];
+    result[2] = (r + r + b + g + g + g + g + g)>>3;
+    b = col1[13];
+    g = col1[14];
+    r = col1[15];
+    result[3] = (r + r + b + g + g + g + g + g)>>3;
+    
+    col1 += 16;
+    result += 4;
+  }
 }
 
 /* Converts a YUYV image into grayscale by extracting the Y channel */
 __attribute__((noinline)) void std_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	const uint16_t* yuvbuf = (const uint16_t*)col1;
-	const uint8_t* const max_ptr = result + count;
-	
-	while(result < max_ptr) {
-		result[0] = (uint8_t)yuvbuf[0];
-		result[1] = (uint8_t)yuvbuf[1];
-		result[2] = (uint8_t)yuvbuf[2];
-		result[3] = (uint8_t)yuvbuf[3];
-		result[4] = (uint8_t)yuvbuf[4];
-		result[5] = (uint8_t)yuvbuf[5];
-		result[6] = (uint8_t)yuvbuf[6];
-		result[7] = (uint8_t)yuvbuf[7];
-		result[8] = (uint8_t)yuvbuf[8];
-		result[9] = (uint8_t)yuvbuf[9];
-		result[10] = (uint8_t)yuvbuf[10];
-		result[11] = (uint8_t)yuvbuf[11];
-		result[12] = (uint8_t)yuvbuf[12];
-		result[13] = (uint8_t)yuvbuf[13];
-		result[14] = (uint8_t)yuvbuf[14];
-		result[15] = (uint8_t)yuvbuf[15];
-		
-		yuvbuf += 16;
-		result += 16;
-	}
+  const uint16_t* yuvbuf = (const uint16_t*)col1;
+  const uint8_t* const max_ptr = result + count;
+  
+  while(result < max_ptr) {
+    result[0] = (uint8_t)yuvbuf[0];
+    result[1] = (uint8_t)yuvbuf[1];
+    result[2] = (uint8_t)yuvbuf[2];
+    result[3] = (uint8_t)yuvbuf[3];
+    result[4] = (uint8_t)yuvbuf[4];
+    result[5] = (uint8_t)yuvbuf[5];
+    result[6] = (uint8_t)yuvbuf[6];
+    result[7] = (uint8_t)yuvbuf[7];
+    result[8] = (uint8_t)yuvbuf[8];
+    result[9] = (uint8_t)yuvbuf[9];
+    result[10] = (uint8_t)yuvbuf[10];
+    result[11] = (uint8_t)yuvbuf[11];
+    result[12] = (uint8_t)yuvbuf[12];
+    result[13] = (uint8_t)yuvbuf[13];
+    result[14] = (uint8_t)yuvbuf[14];
+    result[15] = (uint8_t)yuvbuf[15];
+    
+    yuvbuf += 16;
+    result += 16;
+  }
 }
 
 /* RGBA to grayscale SSSE3 */
@@ -4156,45 +4156,45 @@ __attribute__((noinline,__target__("ssse3")))
 void ssse3_convert_rgba_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
 
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"mov $0xff, %%eax\n\t"
-	"movd %%eax, %%xmm0\n\t"
-	"pshufd $0x0, %%xmm0, %%xmm0\n\t"
-	"movdqa %3, %%xmm5\n\t"
-	"sub $0x10, %0\n\t"
-	"sub $0x4, %1\n\t"
-	"ssse3_convert_rgba_gray8_iter:\n\t"
-	"movdqa (%0,%2,4), %%xmm3\n\t"
-	"psrlq $0x3, %%xmm3\n\t"
-	"pand %%xmm4, %%xmm3\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x8, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"pslld $0x2, %%xmm2\n\t"
-	"paddd %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm3, %%xmm1\n\t"
-	"pand %%xmm0, %%xmm1\n\t"
-	"paddd %%xmm1, %%xmm1\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm3, %%xmm2\n\t"
-	"psrld $0x10, %%xmm2\n\t"
-	"pand %%xmm0, %%xmm2\n\t"
-	"paddd %%xmm2, %%xmm1\n\t"
-	"pshufb %%xmm5, %%xmm1\n\t"
-	"movd %%xmm1, %%eax\n\t"
-	"movnti %%eax, (%1,%2)\n\t"
-	"sub $0x4, %2\n\t"
-	"jnz ssse3_convert_rgba_gray8_iter\n\t"
-	:
-	: "r" (col1), "r" (result), "r" (count), "m" (*movemask)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
-	);
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "mov $0xff, %%eax\n\t"
+  "movd %%eax, %%xmm0\n\t"
+  "pshufd $0x0, %%xmm0, %%xmm0\n\t"
+  "movdqa %3, %%xmm5\n\t"
+  "sub $0x10, %0\n\t"
+  "sub $0x4, %1\n\t"
+  "ssse3_convert_rgba_gray8_iter:\n\t"
+  "movdqa (%0,%2,4), %%xmm3\n\t"
+  "psrlq $0x3, %%xmm3\n\t"
+  "pand %%xmm4, %%xmm3\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x8, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "pslld $0x2, %%xmm2\n\t"
+  "paddd %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm3, %%xmm1\n\t"
+  "pand %%xmm0, %%xmm1\n\t"
+  "paddd %%xmm1, %%xmm1\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm3, %%xmm2\n\t"
+  "psrld $0x10, %%xmm2\n\t"
+  "pand %%xmm0, %%xmm2\n\t"
+  "paddd %%xmm2, %%xmm1\n\t"
+  "pshufb %%xmm5, %%xmm1\n\t"
+  "movd %%xmm1, %%eax\n\t"
+  "movnti %%eax, (%1,%2)\n\t"
+  "sub $0x4, %2\n\t"
+  "jnz ssse3_convert_rgba_gray8_iter\n\t"
+  :
+  : "r" (col1), "r" (result), "r" (count), "m" (*movemask)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -4204,156 +4204,156 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_convert_yuyv_gray8(const uint8_t* col1, uint8_t* result, unsigned long count) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))  
-	unsigned long i = 0;
+  unsigned long i = 0;
   
-	__attribute__((aligned(16))) static const uint8_t movemask1[16] = {0,2,4,6,8,10,12,14,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
-	__attribute__((aligned(16))) static const uint8_t movemask2[16] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0,2,4,6,8,10,12,14};
-	
-	/* XMM0 - General purpose */
-	/* XMM1 - General purpose */
-	/* XMM2 - unused */
-	/* XMM3 - shift mask 1 */
-	/* XMM4 - shift mask 2 */
-	/* XMM5 - unused*/
-	/* XMM6 - unused */
-	/* XMM7 - unused */
+  __attribute__((aligned(16))) static const uint8_t movemask1[16] = {0,2,4,6,8,10,12,14,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF};
+  __attribute__((aligned(16))) static const uint8_t movemask2[16] = {0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0xFF,0,2,4,6,8,10,12,14};
+  
+  /* XMM0 - General purpose */
+  /* XMM1 - General purpose */
+  /* XMM2 - unused */
+  /* XMM3 - shift mask 1 */
+  /* XMM4 - shift mask 2 */
+  /* XMM5 - unused*/
+  /* XMM6 - unused */
+  /* XMM7 - unused */
 
-	__asm__ __volatile__ (
-	"movdqa %4, %%xmm3\n\t"
-	"movdqa %5, %%xmm4\n\t"
-	"algo_ssse3_convert_yuyv_gray8:\n\t"
-	"movdqa (%0), %%xmm0\n\t"
-	"pshufb %%xmm3, %%xmm0\n\t"
-	"movdqa 0x10(%0), %%xmm1\n\t"
-	"pshufb %%xmm4, %%xmm1\n\t"
-	"por %%xmm1, %%xmm0\n\t"
-	"movntdq %%xmm0, (%1)\n\t"
-	"add $0x10, %3\n\t"
-	"add $0x10, %1\n\t"
-	"add $0x20, %0\n\t"
-	"cmp %2, %3\n\t"
-	"jb algo_ssse3_convert_yuyv_gray8\n\t"
-	:
+  __asm__ __volatile__ (
+  "movdqa %4, %%xmm3\n\t"
+  "movdqa %5, %%xmm4\n\t"
+  "algo_ssse3_convert_yuyv_gray8:\n\t"
+  "movdqa (%0), %%xmm0\n\t"
+  "pshufb %%xmm3, %%xmm0\n\t"
+  "movdqa 0x10(%0), %%xmm1\n\t"
+  "pshufb %%xmm4, %%xmm1\n\t"
+  "por %%xmm1, %%xmm0\n\t"
+  "movntdq %%xmm0, (%1)\n\t"
+  "add $0x10, %3\n\t"
+  "add $0x10, %1\n\t"
+  "add $0x20, %0\n\t"
+  "cmp %2, %3\n\t"
+  "jb algo_ssse3_convert_yuyv_gray8\n\t"
+  :
 #if (defined(_DEBUG) && !defined(__x86_64__)) /* Use one less register to allow compilation to success on 32bit with omit frame pointer disabled */
-	: "r" (col1), "r" (result), "m" (count), "r" (i), "m" (*movemask1), "m" (*movemask2)
+  : "r" (col1), "r" (result), "m" (count), "r" (i), "m" (*movemask1), "m" (*movemask2)
 #else
-	: "r" (col1), "r" (result), "r" (count), "r" (i), "m" (*movemask1), "m" (*movemask2)
+  : "r" (col1), "r" (result), "r" (count), "r" (i), "m" (*movemask1), "m" (*movemask2)
 #endif
-	: "%xmm3", "%xmm4", "cc", "memory"
-	);
+  : "%xmm3", "%xmm4", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
 /* YUYV to RGB24 - relocated from zm_local_camera.cpp */
 __attribute__((noinline)) void zm_convert_yuyv_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;
-	unsigned int y1,y2,u,v;
-	for(unsigned int i=0; i < count; i += 2, col1 += 4, result += 6) {
-		y1 = col1[0];
-		u = col1[1];
-		y2 = col1[2];
-		v = col1[3];
+  unsigned int r,g,b;
+  unsigned int y1,y2,u,v;
+  for(unsigned int i=0; i < count; i += 2, col1 += 4, result += 6) {
+    y1 = col1[0];
+    u = col1[1];
+    y2 = col1[2];
+    v = col1[3];
 
-		r = y1 + r_v_table[v];
-		g = y1 - (g_u_table[u]+g_v_table[v]);
-		b = y1 + b_u_table[u];
-		
-		result[0] = r<0?0:(r>255?255:r);
-		result[1] = g<0?0:(g>255?255:g);
-		result[2] = b<0?0:(b>255?255:b);
-		
-		r = y2 + r_v_table[v];
-		g = y2 - (g_u_table[u]+g_v_table[v]);
-		b = y2 + b_u_table[u];
+    r = y1 + r_v_table[v];
+    g = y1 - (g_u_table[u]+g_v_table[v]);
+    b = y1 + b_u_table[u];
+    
+    result[0] = r<0?0:(r>255?255:r);
+    result[1] = g<0?0:(g>255?255:g);
+    result[2] = b<0?0:(b>255?255:b);
+    
+    r = y2 + r_v_table[v];
+    g = y2 - (g_u_table[u]+g_v_table[v]);
+    b = y2 + b_u_table[u];
 
-		result[3] = r<0?0:(r>255?255:r);
-		result[4] = g<0?0:(g>255?255:g);
-		result[5] = b<0?0:(b>255?255:b);
-	}
-	
+    result[3] = r<0?0:(r>255?255:r);
+    result[4] = g<0?0:(g>255?255:g);
+    result[5] = b<0?0:(b>255?255:b);
+  }
+  
 }
 
 /* YUYV to RGBA - modified the one above */
 __attribute__((noinline)) void zm_convert_yuyv_rgba(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;
-	unsigned int y1,y2,u,v;
-	for(unsigned int i=0; i < count; i += 2, col1 += 4, result += 8) {
-		y1 = col1[0];
-		u = col1[1];
-		y2 = col1[2];
-		v = col1[3];
+  unsigned int r,g,b;
+  unsigned int y1,y2,u,v;
+  for(unsigned int i=0; i < count; i += 2, col1 += 4, result += 8) {
+    y1 = col1[0];
+    u = col1[1];
+    y2 = col1[2];
+    v = col1[3];
 
-		r = y1 + r_v_table[v];
-		g = y1 - (g_u_table[u]+g_v_table[v]);
-		b = y1 + b_u_table[u];
-		
-		result[0] = r<0?0:(r>255?255:r);
-		result[1] = g<0?0:(g>255?255:g);
-		result[2] = b<0?0:(b>255?255:b);
-		
-		r = y2 + r_v_table[v];
-		g = y2 - (g_u_table[u]+g_v_table[v]);
-		b = y2 + b_u_table[u];
+    r = y1 + r_v_table[v];
+    g = y1 - (g_u_table[u]+g_v_table[v]);
+    b = y1 + b_u_table[u];
+    
+    result[0] = r<0?0:(r>255?255:r);
+    result[1] = g<0?0:(g>255?255:g);
+    result[2] = b<0?0:(b>255?255:b);
+    
+    r = y2 + r_v_table[v];
+    g = y2 - (g_u_table[u]+g_v_table[v]);
+    b = y2 + b_u_table[u];
 
-		result[4] = r<0?0:(r>255?255:r);
-		result[5] = g<0?0:(g>255?255:g);
-		result[6] = b<0?0:(b>255?255:b);
-	}
-	
+    result[4] = r<0?0:(r>255?255:r);
+    result[5] = g<0?0:(g>255?255:g);
+    result[6] = b<0?0:(b>255?255:b);
+  }
+  
 }
 
 /* RGB555 to RGB24 - relocated from zm_local_camera.cpp */
 __attribute__((noinline)) void zm_convert_rgb555_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {  
-		b = ((*col1)<<3)&0xf8;
-		g = (((*(col1+1))<<6)|((*col1)>>2))&0xf8;
-		r = ((*(col1+1))<<1)&0xf8;
-		result[0] = r;
-		result[1] = g;
-		result[2] = b;
-	}
+  unsigned int r,g,b;  
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {  
+    b = ((*col1)<<3)&0xf8;
+    g = (((*(col1+1))<<6)|((*col1)>>2))&0xf8;
+    r = ((*(col1+1))<<1)&0xf8;
+    result[0] = r;
+    result[1] = g;
+    result[2] = b;
+  }
 }
 
 /* RGB555 to RGBA - modified the one above */
 __attribute__((noinline)) void zm_convert_rgb555_rgba(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {  
-		b = ((*col1)<<3)&0xf8;
-		g = (((*(col1+1))<<6)|((*col1)>>2))&0xf8;
-		r = ((*(col1+1))<<1)&0xf8;
-		result[0] = r;
-		result[1] = g;
-		result[2] = b;
-	}
+  unsigned int r,g,b;  
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {  
+    b = ((*col1)<<3)&0xf8;
+    g = (((*(col1+1))<<6)|((*col1)>>2))&0xf8;
+    r = ((*(col1+1))<<1)&0xf8;
+    result[0] = r;
+    result[1] = g;
+    result[2] = b;
+  }
 }
 
 /* RGB565 to RGB24 - relocated from zm_local_camera.cpp */
 __attribute__((noinline)) void zm_convert_rgb565_rgb(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {  
-		b = ((*col1)<<3)&0xf8;
-		g = (((*(col1+1))<<5)|((*col1)>>3))&0xfc;
-		r = (*(col1+1))&0xf8;
-		result[0] = r;
-		result[1] = g;
-		result[2] = b;
-	}
+  unsigned int r,g,b;  
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 3) {  
+    b = ((*col1)<<3)&0xf8;
+    g = (((*(col1+1))<<5)|((*col1)>>3))&0xfc;
+    r = (*(col1+1))&0xf8;
+    result[0] = r;
+    result[1] = g;
+    result[2] = b;
+  }
 }
 
 /* RGB565 to RGBA - modified the one above */
 __attribute__((noinline)) void zm_convert_rgb565_rgba(const uint8_t* col1, uint8_t* result, unsigned long count) {
-	unsigned int r,g,b;  
-	for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {  
-		b = ((*col1)<<3)&0xf8;
-		g = (((*(col1+1))<<5)|((*col1)>>3))&0xfc;
-		r = (*(col1+1))&0xf8;
-		result[0] = r;
-		result[1] = g;
-		result[2] = b;
-	}
+  unsigned int r,g,b;  
+  for(unsigned int i=0; i < count; i++, col1 += 2, result += 4) {  
+    b = ((*col1)<<3)&0xf8;
+    g = (((*(col1+1))<<5)|((*col1)>>3))&0xfc;
+    r = (*(col1+1))&0xf8;
+    result[0] = r;
+    result[1] = g;
+    result[2] = b;
+  }
 }
 
 /************************************************* DEINTERLACE FUNCTIONS *************************************************/
@@ -4361,461 +4361,461 @@ __attribute__((noinline)) void zm_convert_rgb565_rgba(const uint8_t* col1, uint8
 /* Grayscale */
 __attribute__((noinline)) void std_deinterlace_4field_gray8(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const uint8_t* const max_ptr = col1 + (width*(height-1));
-	const uint8_t *max_ptr2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const uint8_t* const max_ptr = col1 + (width*(height-1));
+  const uint8_t *max_ptr2;
 
-	pcurrent = col1 + width;
-	pncurrent = col2 + width;
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + (width*2);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + width;
-		while(pcurrent < max_ptr2) {
-			if((unsigned int)((abs(*pnabove - *pabove) + abs(*pncurrent - *pcurrent)) >> 1) >= threshold) {
-				*pcurrent = (*pabove + *pbelow) >> 1;
-			}
-			pabove++;
-			pnabove++;
-			pcurrent++;
-			pncurrent++;
-			pbelow++;
-		}
-		pcurrent += width;
-		pncurrent += width;
-		pabove += width;
-		pnabove += width;
-		pbelow += width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + width;
-	while(pcurrent < max_ptr2) {
-		if((unsigned int)((abs(*pnabove - *pabove) + abs(*pncurrent - *pcurrent)) >> 1) >= threshold) {
-			*pcurrent = *pabove;
-		}
-		pabove++;
-		pnabove++;
-		pcurrent++;
-		pncurrent++;
-	}
+  pcurrent = col1 + width;
+  pncurrent = col2 + width;
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + (width*2);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + width;
+    while(pcurrent < max_ptr2) {
+      if((unsigned int)((abs(*pnabove - *pabove) + abs(*pncurrent - *pcurrent)) >> 1) >= threshold) {
+        *pcurrent = (*pabove + *pbelow) >> 1;
+      }
+      pabove++;
+      pnabove++;
+      pcurrent++;
+      pncurrent++;
+      pbelow++;
+    }
+    pcurrent += width;
+    pncurrent += width;
+    pabove += width;
+    pnabove += width;
+    pbelow += width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + width;
+  while(pcurrent < max_ptr2) {
+    if((unsigned int)((abs(*pnabove - *pabove) + abs(*pncurrent - *pcurrent)) >> 1) >= threshold) {
+      *pcurrent = *pabove;
+    }
+    pabove++;
+    pnabove++;
+    pcurrent++;
+    pncurrent++;
+  }
 }
 
 /* RGB */
 __attribute__((noinline)) void std_deinterlace_4field_rgb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const unsigned int row_width = width*3;
-	const uint8_t* const max_ptr = col1 + (row_width * (height-1));
-	const uint8_t *max_ptr2;
-	unsigned int b, g, r;
-	unsigned int delta1, delta2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const unsigned int row_width = width*3;
+  const uint8_t* const max_ptr = col1 + (row_width * (height-1));
+  const uint8_t *max_ptr2;
+  unsigned int b, g, r;
+  unsigned int delta1, delta2;
 
-	pcurrent = col1 + (width*3);
-	pncurrent = col2 + (width*3);
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + ((width*2)*3);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + row_width;
-		while(pcurrent < max_ptr2) {
-			r = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			b = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			r = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			b = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
-				pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
-				pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
-			}
-			pabove += 3;
-			pnabove += 3;
-			pcurrent += 3;
-			pncurrent += 3;
-			pbelow += 3;
-		}
-		pcurrent += row_width;
-		pncurrent += row_width;
-		pabove += row_width;
-		pnabove += row_width;
-		pbelow += row_width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + row_width;
-	while(pcurrent < max_ptr2) {
-			r = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			b = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			r = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			b = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = pabove[0];
-				pcurrent[1] = pabove[1];
-				pcurrent[2] = pabove[2];
-			}
-			pabove += 3;
-			pnabove += 3;
-			pcurrent += 3;
-			pncurrent += 3;
-	}
+  pcurrent = col1 + (width*3);
+  pncurrent = col2 + (width*3);
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + ((width*2)*3);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + row_width;
+    while(pcurrent < max_ptr2) {
+      r = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      b = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      r = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      b = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
+        pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
+        pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
+      }
+      pabove += 3;
+      pnabove += 3;
+      pcurrent += 3;
+      pncurrent += 3;
+      pbelow += 3;
+    }
+    pcurrent += row_width;
+    pncurrent += row_width;
+    pabove += row_width;
+    pnabove += row_width;
+    pbelow += row_width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + row_width;
+  while(pcurrent < max_ptr2) {
+      r = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      b = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      r = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      b = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = pabove[0];
+        pcurrent[1] = pabove[1];
+        pcurrent[2] = pabove[2];
+      }
+      pabove += 3;
+      pnabove += 3;
+      pcurrent += 3;
+      pncurrent += 3;
+  }
 }
 
 /* BGR */
 __attribute__((noinline)) void std_deinterlace_4field_bgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const unsigned int row_width = width*3;
-	const uint8_t* const max_ptr = col1 + (row_width * (height-1));
-	const uint8_t *max_ptr2;
-	unsigned int b, g, r;
-	unsigned int delta1, delta2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const unsigned int row_width = width*3;
+  const uint8_t* const max_ptr = col1 + (row_width * (height-1));
+  const uint8_t *max_ptr2;
+  unsigned int b, g, r;
+  unsigned int delta1, delta2;
 
-	pcurrent = col1 + (width*3);
-	pncurrent = col2 + (width*3);
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + ((width*2)*3);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + row_width;
-		while(pcurrent < max_ptr2) {
-			b = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			r = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			b = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			r = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
-				pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
-				pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
-			}
-			pabove += 3;
-			pnabove += 3;
-			pcurrent += 3;
-			pncurrent += 3;
-			pbelow += 3;
-		}
-		pcurrent += row_width;
-		pncurrent += row_width;
-		pabove += row_width;
-		pnabove += row_width;
-		pbelow += row_width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + row_width;
-	while(pcurrent < max_ptr2) {
-			b = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			r = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			b = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			r = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = pabove[0];
-				pcurrent[1] = pabove[1];
-				pcurrent[2] = pabove[2];
-			}
-			pabove += 3;
-			pnabove += 3;
-			pcurrent += 3;
-			pncurrent += 3;
-	}
+  pcurrent = col1 + (width*3);
+  pncurrent = col2 + (width*3);
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + ((width*2)*3);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + row_width;
+    while(pcurrent < max_ptr2) {
+      b = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      r = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      b = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      r = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
+        pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
+        pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
+      }
+      pabove += 3;
+      pnabove += 3;
+      pcurrent += 3;
+      pncurrent += 3;
+      pbelow += 3;
+    }
+    pcurrent += row_width;
+    pncurrent += row_width;
+    pabove += row_width;
+    pnabove += row_width;
+    pbelow += row_width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + row_width;
+  while(pcurrent < max_ptr2) {
+      b = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      r = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      b = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      r = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = pabove[0];
+        pcurrent[1] = pabove[1];
+        pcurrent[2] = pabove[2];
+      }
+      pabove += 3;
+      pnabove += 3;
+      pcurrent += 3;
+      pncurrent += 3;
+  }
 }
 
 /* RGBA */
 __attribute__((noinline)) void std_deinterlace_4field_rgba(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const unsigned int row_width = width*4;
-	const uint8_t* const max_ptr = col1 + (row_width * (height-1));
-	const uint8_t *max_ptr2;
-	unsigned int b, g, r;
-	unsigned int delta1, delta2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const unsigned int row_width = width*4;
+  const uint8_t* const max_ptr = col1 + (row_width * (height-1));
+  const uint8_t *max_ptr2;
+  unsigned int b, g, r;
+  unsigned int delta1, delta2;
 
-	pcurrent = col1 + row_width;
-	pncurrent = col2 + row_width;
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + (row_width*2);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + row_width;
-		while(pcurrent < max_ptr2) {
-			r = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			b = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			r = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			b = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
-				pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
-				pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-			pbelow += 4;
-		}
-		pcurrent += row_width;
-		pncurrent += row_width;
-		pabove += row_width;
-		pnabove += row_width;
-		pbelow += row_width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + row_width;
-	while(pcurrent < max_ptr2) {
-			r = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			b = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			r = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			b = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = pabove[0];
-				pcurrent[1] = pabove[1];
-				pcurrent[2] = pabove[2];
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-	}
+  pcurrent = col1 + row_width;
+  pncurrent = col2 + row_width;
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + (row_width*2);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + row_width;
+    while(pcurrent < max_ptr2) {
+      r = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      b = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      r = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      b = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
+        pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
+        pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+      pbelow += 4;
+    }
+    pcurrent += row_width;
+    pncurrent += row_width;
+    pabove += row_width;
+    pnabove += row_width;
+    pbelow += row_width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + row_width;
+  while(pcurrent < max_ptr2) {
+      r = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      b = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      r = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      b = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = pabove[0];
+        pcurrent[1] = pabove[1];
+        pcurrent[2] = pabove[2];
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+  }
 }
 
 /* BGRA */
 __attribute__((noinline)) void std_deinterlace_4field_bgra(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const unsigned int row_width = width*4;
-	const uint8_t* const max_ptr = col1 + (row_width * (height-1));
-	const uint8_t *max_ptr2;
-	unsigned int b, g, r;
-	unsigned int delta1, delta2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const unsigned int row_width = width*4;
+  const uint8_t* const max_ptr = col1 + (row_width * (height-1));
+  const uint8_t *max_ptr2;
+  unsigned int b, g, r;
+  unsigned int delta1, delta2;
 
-	pcurrent = col1 + row_width;
-	pncurrent = col2 + row_width;
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + (row_width*2);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + row_width;
-		while(pcurrent < max_ptr2) {
-			b = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			r = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			b = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			r = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
-				pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
-				pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-			pbelow += 4;
-		}
-		pcurrent += row_width;
-		pncurrent += row_width;
-		pabove += row_width;
-		pnabove += row_width;
-		pbelow += row_width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + row_width;
-	while(pcurrent < max_ptr2) {
-			b = abs(pnabove[0] - pabove[0]);
-			g = abs(pnabove[1] - pabove[1]);
-			r = abs(pnabove[2] - pabove[2]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			b = abs(pncurrent[0] - pcurrent[0]);
-			g = abs(pncurrent[1] - pcurrent[1]);
-			r = abs(pncurrent[2] - pcurrent[2]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[0] = pabove[0];
-				pcurrent[1] = pabove[1];
-				pcurrent[2] = pabove[2];
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-	}
+  pcurrent = col1 + row_width;
+  pncurrent = col2 + row_width;
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + (row_width*2);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + row_width;
+    while(pcurrent < max_ptr2) {
+      b = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      r = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      b = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      r = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = (pabove[0] + pbelow[0]) >> 1;
+        pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
+        pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+      pbelow += 4;
+    }
+    pcurrent += row_width;
+    pncurrent += row_width;
+    pabove += row_width;
+    pnabove += row_width;
+    pbelow += row_width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + row_width;
+  while(pcurrent < max_ptr2) {
+      b = abs(pnabove[0] - pabove[0]);
+      g = abs(pnabove[1] - pabove[1]);
+      r = abs(pnabove[2] - pabove[2]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      b = abs(pncurrent[0] - pcurrent[0]);
+      g = abs(pncurrent[1] - pcurrent[1]);
+      r = abs(pncurrent[2] - pcurrent[2]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[0] = pabove[0];
+        pcurrent[1] = pabove[1];
+        pcurrent[2] = pabove[2];
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+  }
 }
 
 /* ARGB */
 __attribute__((noinline)) void std_deinterlace_4field_argb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const unsigned int row_width = width*4;
-	const uint8_t* const max_ptr = col1 + (row_width * (height-1));
-	const uint8_t *max_ptr2;
-	unsigned int b, g, r;
-	unsigned int delta1, delta2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const unsigned int row_width = width*4;
+  const uint8_t* const max_ptr = col1 + (row_width * (height-1));
+  const uint8_t *max_ptr2;
+  unsigned int b, g, r;
+  unsigned int delta1, delta2;
 
-	pcurrent = col1 + row_width;
-	pncurrent = col2 + row_width;
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + (row_width*2);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + row_width;
-		while(pcurrent < max_ptr2) {
-			r = abs(pnabove[1] - pabove[1]);
-			g = abs(pnabove[2] - pabove[2]);
-			b = abs(pnabove[3] - pabove[3]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			r = abs(pncurrent[1] - pcurrent[1]);
-			g = abs(pncurrent[2] - pcurrent[2]);
-			b = abs(pncurrent[3] - pcurrent[3]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
-				pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
-				pcurrent[3] = (pabove[3] + pbelow[3]) >> 1;
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-			pbelow += 4;
-		}
-		pcurrent += row_width;
-		pncurrent += row_width;
-		pabove += row_width;
-		pnabove += row_width;
-		pbelow += row_width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + row_width;
-	while(pcurrent < max_ptr2) {
-			r = abs(pnabove[1] - pabove[1]);
-			g = abs(pnabove[2] - pabove[2]);
-			b = abs(pnabove[3] - pabove[3]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			r = abs(pncurrent[1] - pcurrent[1]);
-			g = abs(pncurrent[2] - pcurrent[2]);
-			b = abs(pncurrent[3] - pcurrent[3]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[1] = pabove[1];
-				pcurrent[2] = pabove[2];
-				pcurrent[3] = pabove[3];
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-	}
+  pcurrent = col1 + row_width;
+  pncurrent = col2 + row_width;
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + (row_width*2);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + row_width;
+    while(pcurrent < max_ptr2) {
+      r = abs(pnabove[1] - pabove[1]);
+      g = abs(pnabove[2] - pabove[2]);
+      b = abs(pnabove[3] - pabove[3]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      r = abs(pncurrent[1] - pcurrent[1]);
+      g = abs(pncurrent[2] - pcurrent[2]);
+      b = abs(pncurrent[3] - pcurrent[3]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
+        pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
+        pcurrent[3] = (pabove[3] + pbelow[3]) >> 1;
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+      pbelow += 4;
+    }
+    pcurrent += row_width;
+    pncurrent += row_width;
+    pabove += row_width;
+    pnabove += row_width;
+    pbelow += row_width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + row_width;
+  while(pcurrent < max_ptr2) {
+      r = abs(pnabove[1] - pabove[1]);
+      g = abs(pnabove[2] - pabove[2]);
+      b = abs(pnabove[3] - pabove[3]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      r = abs(pncurrent[1] - pcurrent[1]);
+      g = abs(pncurrent[2] - pcurrent[2]);
+      b = abs(pncurrent[3] - pcurrent[3]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[1] = pabove[1];
+        pcurrent[2] = pabove[2];
+        pcurrent[3] = pabove[3];
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+  }
 }
 
 /* ABGR */
 __attribute__((noinline)) void std_deinterlace_4field_abgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height)
 {
-	uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
-	const unsigned int row_width = width*4;
-	const uint8_t* const max_ptr = col1 + (row_width * (height-1));
-	const uint8_t *max_ptr2;
-	unsigned int b, g, r;
-	unsigned int delta1, delta2;
+  uint8_t *pcurrent, *pabove, *pncurrent, *pnabove, *pbelow;
+  const unsigned int row_width = width*4;
+  const uint8_t* const max_ptr = col1 + (row_width * (height-1));
+  const uint8_t *max_ptr2;
+  unsigned int b, g, r;
+  unsigned int delta1, delta2;
 
-	pcurrent = col1 + row_width;
-	pncurrent = col2 + row_width;
-	pabove = col1;
-	pnabove = col2;
-	pbelow = col1 + (row_width*2);
-	while(pcurrent < max_ptr)
-	{
-		max_ptr2 = pcurrent + row_width;
-		while(pcurrent < max_ptr2) {
-			b = abs(pnabove[1] - pabove[1]);
-			g = abs(pnabove[2] - pabove[2]);
-			r = abs(pnabove[3] - pabove[3]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			b = abs(pncurrent[1] - pcurrent[1]);
-			g = abs(pncurrent[2] - pcurrent[2]);
-			r = abs(pncurrent[3] - pcurrent[3]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
-				pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
-				pcurrent[3] = (pabove[3] + pbelow[3]) >> 1;
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-			pbelow += 4;
-		}
-		pcurrent += row_width;
-		pncurrent += row_width;
-		pabove += row_width;
-		pnabove += row_width;
-		pbelow += row_width;
-		
-	}
-	
-	/* Special case for the last line */
-	max_ptr2 = pcurrent + row_width;
-	while(pcurrent < max_ptr2) {
-			b = abs(pnabove[1] - pabove[1]);
-			g = abs(pnabove[2] - pabove[2]);
-			r = abs(pnabove[3] - pabove[3]);
-			delta1 = (r + r + b + g + g + g + g + g)>>3;
-			b = abs(pncurrent[1] - pcurrent[1]);
-			g = abs(pncurrent[2] - pcurrent[2]);
-			r = abs(pncurrent[3] - pcurrent[3]);
-			delta2 = (r + r + b + g + g + g + g + g)>>3;
-			if(((delta1 + delta2) >> 1) >= threshold) {
-				pcurrent[1] = pabove[1];
-				pcurrent[2] = pabove[2];
-				pcurrent[3] = pabove[3];
-			}
-			pabove += 4;
-			pnabove += 4;
-			pcurrent += 4;
-			pncurrent += 4;
-	}
+  pcurrent = col1 + row_width;
+  pncurrent = col2 + row_width;
+  pabove = col1;
+  pnabove = col2;
+  pbelow = col1 + (row_width*2);
+  while(pcurrent < max_ptr)
+  {
+    max_ptr2 = pcurrent + row_width;
+    while(pcurrent < max_ptr2) {
+      b = abs(pnabove[1] - pabove[1]);
+      g = abs(pnabove[2] - pabove[2]);
+      r = abs(pnabove[3] - pabove[3]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      b = abs(pncurrent[1] - pcurrent[1]);
+      g = abs(pncurrent[2] - pcurrent[2]);
+      r = abs(pncurrent[3] - pcurrent[3]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[1] = (pabove[1] + pbelow[1]) >> 1;
+        pcurrent[2] = (pabove[2] + pbelow[2]) >> 1;
+        pcurrent[3] = (pabove[3] + pbelow[3]) >> 1;
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+      pbelow += 4;
+    }
+    pcurrent += row_width;
+    pncurrent += row_width;
+    pabove += row_width;
+    pnabove += row_width;
+    pbelow += row_width;
+    
+  }
+  
+  /* Special case for the last line */
+  max_ptr2 = pcurrent + row_width;
+  while(pcurrent < max_ptr2) {
+      b = abs(pnabove[1] - pabove[1]);
+      g = abs(pnabove[2] - pabove[2]);
+      r = abs(pnabove[3] - pabove[3]);
+      delta1 = (r + r + b + g + g + g + g + g)>>3;
+      b = abs(pncurrent[1] - pcurrent[1]);
+      g = abs(pncurrent[2] - pcurrent[2]);
+      r = abs(pncurrent[3] - pcurrent[3]);
+      delta2 = (r + r + b + g + g + g + g + g)>>3;
+      if(((delta1 + delta2) >> 1) >= threshold) {
+        pcurrent[1] = pabove[1];
+        pcurrent[2] = pabove[2];
+        pcurrent[3] = pabove[3];
+      }
+      pabove += 4;
+      pnabove += 4;
+      pcurrent += 4;
+      pncurrent += 4;
+  }
 }
 
 /* Grayscale SSSE3 */
@@ -4825,132 +4825,132 @@ __attribute__((noinline,__target__("ssse3")))
 void ssse3_deinterlace_4field_gray8(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
 
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-	union {
-		uint32_t int32;
-		uint8_t int8a[4];
-	} threshold_mask;
-	threshold_mask.int8a[0] = threshold;
-	threshold_mask.int8a[1] = 0;
-	threshold_mask.int8a[2] = threshold;
-	threshold_mask.int8a[3] = 0;
+  union {
+    uint32_t int32;
+    uint8_t int8a[4];
+  } threshold_mask;
+  threshold_mask.int8a[0] = threshold;
+  threshold_mask.int8a[1] = 0;
+  threshold_mask.int8a[2] = threshold;
+  threshold_mask.int8a[3] = 0;
 
-	unsigned long row_width = width;
-	uint8_t* max_ptr = col1 + (row_width * (height-2));
-	uint8_t* max_ptr2 = col1 + row_width;
+  unsigned long row_width = width;
+  uint8_t* max_ptr = col1 + (row_width * (height-2));
+  uint8_t* max_ptr2 = col1 + row_width;
 
-	__asm__ __volatile__ (
-	/* Load the threshold */
-	"mov %5, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	/* Zero the temporary register */
-	"pxor %%xmm0, %%xmm0\n\t"
+  __asm__ __volatile__ (
+  /* Load the threshold */
+  "mov %5, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  /* Zero the temporary register */
+  "pxor %%xmm0, %%xmm0\n\t"
 
-	"algo_ssse3_deinterlace_4field_gray8:\n\t"
+  "algo_ssse3_deinterlace_4field_gray8:\n\t"
 
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"pmaxub %%xmm2, %%xmm1\n\t"
-	"pminub %%xmm5, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "pmaxub %%xmm2, %%xmm1\n\t"
+  "pminub %%xmm5, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"pmaxub %%xmm2, %%xmm1\n\t"
-	"pminub %%xmm6, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "pmaxub %%xmm2, %%xmm1\n\t"
+  "pminub %%xmm6, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
-	"movdqa %%xmm1, %%xmm2\n\t"
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
+  "movdqa %%xmm1, %%xmm2\n\t"
 
-	/* Do the comparison on words instead of bytes because we don't have unsigned comparison */
-	"punpcklbw %%xmm0, %%xmm1\n\t"                     // Expand pixels 0-7 into words into xmm1
-	"punpckhbw %%xmm0, %%xmm2\n\t"                     // Expand pixels 8-15 into words into xmm2
-	"pcmpgtw %%xmm4, %%xmm1\n\t"                       // Compare average delta with threshold for pixels 0-7
-	"pcmpgtw %%xmm4, %%xmm2\n\t"                       // Compare average delta with threshold for pixels 8-15
-	"packsswb %%xmm2, %%xmm1\n\t"                      // Pack the comparison results into xmm1
+  /* Do the comparison on words instead of bytes because we don't have unsigned comparison */
+  "punpcklbw %%xmm0, %%xmm1\n\t"           // Expand pixels 0-7 into words into xmm1
+  "punpckhbw %%xmm0, %%xmm2\n\t"           // Expand pixels 8-15 into words into xmm2
+  "pcmpgtw %%xmm4, %%xmm1\n\t"             // Compare average delta with threshold for pixels 0-7
+  "pcmpgtw %%xmm4, %%xmm2\n\t"             // Compare average delta with threshold for pixels 8-15
+  "packsswb %%xmm2, %%xmm1\n\t"            // Pack the comparison results into xmm1
 
-	"movdqa (%0,%4), %%xmm2\n\t"                       // Load pbelow
-	"pavgb %%xmm5, %%xmm2\n\t"                         // Average pabove and pbelow
-	"pand %%xmm1, %%xmm2\n\t"                          // Filter out pixels in avg that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "movdqa (%0,%4), %%xmm2\n\t"             // Load pbelow
+  "pavgb %%xmm5, %%xmm2\n\t"             // Average pabove and pbelow
+  "pand %%xmm1, %%xmm2\n\t"              // Filter out pixels in avg that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm2, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
+  "por %%xmm2, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
 
-	"sub %4, %0\n\t"                                   // Restore pcurrent to pabove
-	"sub %4, %1\n\t"                                   // Restore pncurrent to pnabove
+  "sub %4, %0\n\t"                   // Restore pcurrent to pabove
+  "sub %4, %1\n\t"                   // Restore pncurrent to pnabove
 
-	/* Next pixels */
-	"add $0x10, %0\n\t"                                // Add 16 to pcurrent
-	"add $0x10, %1\n\t"                                // Add 16 to pncurrent
+  /* Next pixels */
+  "add $0x10, %0\n\t"                // Add 16 to pcurrent
+  "add $0x10, %1\n\t"                // Add 16 to pncurrent
 
-	/* Check if we reached the row end */
-	"cmp %2, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_gray8\n\t"       // Go for another iteration
+  /* Check if we reached the row end */
+  "cmp %2, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_gray8\n\t"     // Go for another iteration
 
-	/* Next row */
-	"add %4, %0\n\t"                                   // Add width to pcurrent
-	"add %4, %1\n\t"                                   // Add width to pncurrent
-	"mov %0, %2\n\t"
-	"add %4, %2\n\t"                                   // Add width to max_ptr2
+  /* Next row */
+  "add %4, %0\n\t"                   // Add width to pcurrent
+  "add %4, %1\n\t"                   // Add width to pncurrent
+  "mov %0, %2\n\t"
+  "add %4, %2\n\t"                   // Add width to max_ptr2
 
-	/* Check if we reached the end */
-	"cmp %3, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_gray8\n\t"       // Go for another iteration
+  /* Check if we reached the end */
+  "cmp %3, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_gray8\n\t"     // Go for another iteration
 
-	/* Special case for the last line */
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"pmaxub %%xmm2, %%xmm1\n\t"
-	"pminub %%xmm5, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Special case for the last line */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "pmaxub %%xmm2, %%xmm1\n\t"
+  "pminub %%xmm5, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"pmaxub %%xmm2, %%xmm1\n\t"
-	"pminub %%xmm6, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "pmaxub %%xmm2, %%xmm1\n\t"
+  "pminub %%xmm6, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
-	"movdqa %%xmm1, %%xmm2\n\t"
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
+  "movdqa %%xmm1, %%xmm2\n\t"
 
-	/* Do the comparison on words instead of bytes because we don't have unsigned comparison */
-	"punpcklbw %%xmm0, %%xmm1\n\t"                     // Expand pixels 0-7 into words into xmm1
-	"punpckhbw %%xmm0, %%xmm2\n\t"                     // Expand pixels 8-15 into words into xmm2
-	"pcmpgtw %%xmm4, %%xmm1\n\t"                       // Compare average delta with threshold for pixels 0-7
-	"pcmpgtw %%xmm4, %%xmm2\n\t"                       // Compare average delta with threshold for pixels 8-15
-	"packsswb %%xmm2, %%xmm1\n\t"                      // Pack the comparison results into xmm1
+  /* Do the comparison on words instead of bytes because we don't have unsigned comparison */
+  "punpcklbw %%xmm0, %%xmm1\n\t"           // Expand pixels 0-7 into words into xmm1
+  "punpckhbw %%xmm0, %%xmm2\n\t"           // Expand pixels 8-15 into words into xmm2
+  "pcmpgtw %%xmm4, %%xmm1\n\t"             // Compare average delta with threshold for pixels 0-7
+  "pcmpgtw %%xmm4, %%xmm2\n\t"             // Compare average delta with threshold for pixels 8-15
+  "packsswb %%xmm2, %%xmm1\n\t"            // Pack the comparison results into xmm1
 
-	"pand %%xmm1, %%xmm5\n\t"                          // Filter out pixels in pabove that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "pand %%xmm1, %%xmm5\n\t"              // Filter out pixels in pabove that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm5, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
-	:
-	: "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_mask.int32)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
-	);
+  "por %%xmm5, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
+  :
+  : "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_mask.int32)
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -4960,180 +4960,180 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_deinterlace_4field_rgba(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-	__attribute__((aligned(16))) static const uint8_t movemask2[16] = {1,1,1,1,1,0,0,2,9,9,9,9,9,8,8,10};
+  __attribute__((aligned(16))) static const uint8_t movemask2[16] = {1,1,1,1,1,0,0,2,9,9,9,9,9,8,8,10};
 
-	const uint32_t threshold_val = threshold;
+  const uint32_t threshold_val = threshold;
 
-	unsigned long row_width = width*4;
-	uint8_t* max_ptr = col1 + (row_width * (height-2));
-	uint8_t* max_ptr2 = col1 + row_width;
+  unsigned long row_width = width*4;
+  uint8_t* max_ptr = col1 + (row_width * (height-2));
+  uint8_t* max_ptr2 = col1 + row_width;
 
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"movdqa %6, %%xmm3\n\t"
-	"mov %5, %%eax\n\t"
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "movdqa %6, %%xmm3\n\t"
+  "mov %5, %%eax\n\t"
 #if defined(__x86_64__)
-	"movd %%eax, %%xmm8\n\t"
-	"pshufd $0x0, %%xmm8, %%xmm8\n\t"
+  "movd %%eax, %%xmm8\n\t"
+  "pshufd $0x0, %%xmm8, %%xmm8\n\t"
 #endif
-	/* Zero the temporary register */
-	"pxor %%xmm0, %%xmm0\n\t"
+  /* Zero the temporary register */
+  "pxor %%xmm0, %%xmm0\n\t"
 
-	"algo_ssse3_deinterlace_4field_rgba:\n\t"
+  "algo_ssse3_deinterlace_4field_rgba:\n\t"
 
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"movdqa (%0,%4), %%xmm2\n\t"                       // Load pbelow
-	"pavgb %%xmm5, %%xmm2\n\t"                         // Average pabove and pbelow
-	"pand %%xmm1, %%xmm2\n\t"                          // Filter out pixels in avg that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "movdqa (%0,%4), %%xmm2\n\t"             // Load pbelow
+  "pavgb %%xmm5, %%xmm2\n\t"             // Average pabove and pbelow
+  "pand %%xmm1, %%xmm2\n\t"              // Filter out pixels in avg that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm2, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
+  "por %%xmm2, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
 
-	"sub %4, %0\n\t"                                   // Restore pcurrent to pabove
-	"sub %4, %1\n\t"                                   // Restore pncurrent to pnabove
+  "sub %4, %0\n\t"                   // Restore pcurrent to pabove
+  "sub %4, %1\n\t"                   // Restore pncurrent to pnabove
 
-	/* Next pixels */
-	"add $0x10, %0\n\t"                                // Add 16 to pcurrent
-	"add $0x10, %1\n\t"                                // Add 16 to pncurrent
+  /* Next pixels */
+  "add $0x10, %0\n\t"                // Add 16 to pcurrent
+  "add $0x10, %1\n\t"                // Add 16 to pncurrent
 
-	/* Check if we reached the row end */
-	"cmp %2, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_rgba\n\t"        // Go for another iteration
+  /* Check if we reached the row end */
+  "cmp %2, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_rgba\n\t"    // Go for another iteration
 
-	/* Next row */
-	"add %4, %0\n\t"                                   // Add width to pcurrent
-	"add %4, %1\n\t"                                   // Add width to pncurrent
-	"mov %0, %2\n\t"
-	"add %4, %2\n\t"                                   // Add width to max_ptr2
+  /* Next row */
+  "add %4, %0\n\t"                   // Add width to pcurrent
+  "add %4, %1\n\t"                   // Add width to pncurrent
+  "mov %0, %2\n\t"
+  "add %4, %2\n\t"                   // Add width to max_ptr2
 
-	/* Check if we reached the end */
-	"cmp %3, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_rgba\n\t"        // Go for another iteration
+  /* Check if we reached the end */
+  "cmp %3, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_rgba\n\t"    // Go for another iteration
 
-	/* Special case for the last line */
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Special case for the last line */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"pand %%xmm1, %%xmm5\n\t"                          // Filter out pixels in pabove that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "pand %%xmm1, %%xmm5\n\t"              // Filter out pixels in pabove that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm5, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
-	:
-	: "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
+  "por %%xmm5, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
+  :
+  : "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
 #if defined(__x86_64__)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
 #else
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
 #endif
-	);
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -5143,180 +5143,180 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_deinterlace_4field_bgra(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-	__attribute__((aligned(16))) static const uint8_t movemask2[16] = {1,1,1,1,1,2,2,0,9,9,9,9,9,10,10,8};
+  __attribute__((aligned(16))) static const uint8_t movemask2[16] = {1,1,1,1,1,2,2,0,9,9,9,9,9,10,10,8};
 
-	const uint32_t threshold_val = threshold;
+  const uint32_t threshold_val = threshold;
 
-	unsigned long row_width = width*4;
-	uint8_t* max_ptr = col1 + (row_width * (height-2));
-	uint8_t* max_ptr2 = col1 + row_width;
+  unsigned long row_width = width*4;
+  uint8_t* max_ptr = col1 + (row_width * (height-2));
+  uint8_t* max_ptr2 = col1 + row_width;
 
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"movdqa %6, %%xmm3\n\t"
-	"mov %5, %%eax\n\t"
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "movdqa %6, %%xmm3\n\t"
+  "mov %5, %%eax\n\t"
 #if defined(__x86_64__)
-	"movd %%eax, %%xmm8\n\t"
-	"pshufd $0x0, %%xmm8, %%xmm8\n\t"
+  "movd %%eax, %%xmm8\n\t"
+  "pshufd $0x0, %%xmm8, %%xmm8\n\t"
 #endif
-	/* Zero the temporary register */
-	"pxor %%xmm0, %%xmm0\n\t"
+  /* Zero the temporary register */
+  "pxor %%xmm0, %%xmm0\n\t"
 
-	"algo_ssse3_deinterlace_4field_bgra:\n\t"
+  "algo_ssse3_deinterlace_4field_bgra:\n\t"
 
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"movdqa (%0,%4), %%xmm2\n\t"                       // Load pbelow
-	"pavgb %%xmm5, %%xmm2\n\t"                         // Average pabove and pbelow
-	"pand %%xmm1, %%xmm2\n\t"                          // Filter out pixels in avg that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "movdqa (%0,%4), %%xmm2\n\t"             // Load pbelow
+  "pavgb %%xmm5, %%xmm2\n\t"             // Average pabove and pbelow
+  "pand %%xmm1, %%xmm2\n\t"              // Filter out pixels in avg that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm2, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
+  "por %%xmm2, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
 
-	"sub %4, %0\n\t"                                   // Restore pcurrent to pabove
-	"sub %4, %1\n\t"                                   // Restore pncurrent to pnabove
+  "sub %4, %0\n\t"                   // Restore pcurrent to pabove
+  "sub %4, %1\n\t"                   // Restore pncurrent to pnabove
 
-	/* Next pixels */
-	"add $0x10, %0\n\t"                                // Add 16 to pcurrent
-	"add $0x10, %1\n\t"                                // Add 16 to pncurrent
+  /* Next pixels */
+  "add $0x10, %0\n\t"                // Add 16 to pcurrent
+  "add $0x10, %1\n\t"                // Add 16 to pncurrent
 
-	/* Check if we reached the row end */
-	"cmp %2, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_bgra\n\t"        // Go for another iteration
+  /* Check if we reached the row end */
+  "cmp %2, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_bgra\n\t"    // Go for another iteration
 
-	/* Next row */
-	"add %4, %0\n\t"                                   // Add width to pcurrent
-	"add %4, %1\n\t"                                   // Add width to pncurrent
-	"mov %0, %2\n\t"
-	"add %4, %2\n\t"                                   // Add width to max_ptr2
+  /* Next row */
+  "add %4, %0\n\t"                   // Add width to pcurrent
+  "add %4, %1\n\t"                   // Add width to pncurrent
+  "mov %0, %2\n\t"
+  "add %4, %2\n\t"                   // Add width to max_ptr2
 
-	/* Check if we reached the end */
-	"cmp %3, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_bgra\n\t"        // Go for another iteration
+  /* Check if we reached the end */
+  "cmp %3, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_bgra\n\t"    // Go for another iteration
 
-	/* Special case for the last line */
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Special case for the last line */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"pand %%xmm1, %%xmm5\n\t"                          // Filter out pixels in pabove that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "pand %%xmm1, %%xmm5\n\t"              // Filter out pixels in pabove that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm5, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
-	:
-	: "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
+  "por %%xmm5, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
+  :
+  : "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
 #if defined(__x86_64__)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
 #else
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
 #endif
-	);
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -5326,180 +5326,180 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_deinterlace_4field_argb(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-	__attribute__((aligned(16))) static const uint8_t movemask2[16] = {2,2,2,2,2,1,1,3,10,10,10,10,10,9,9,11};
+  __attribute__((aligned(16))) static const uint8_t movemask2[16] = {2,2,2,2,2,1,1,3,10,10,10,10,10,9,9,11};
 
-	const uint32_t threshold_val = threshold;
+  const uint32_t threshold_val = threshold;
 
-	unsigned long row_width = width*4;
-	uint8_t* max_ptr = col1 + (row_width * (height-2));
-	uint8_t* max_ptr2 = col1 + row_width;
+  unsigned long row_width = width*4;
+  uint8_t* max_ptr = col1 + (row_width * (height-2));
+  uint8_t* max_ptr2 = col1 + row_width;
 
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"movdqa %6, %%xmm3\n\t"
-	"mov %5, %%eax\n\t"
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "movdqa %6, %%xmm3\n\t"
+  "mov %5, %%eax\n\t"
 #if defined(__x86_64__)
-	"movd %%eax, %%xmm8\n\t"
-	"pshufd $0x0, %%xmm8, %%xmm8\n\t"
+  "movd %%eax, %%xmm8\n\t"
+  "pshufd $0x0, %%xmm8, %%xmm8\n\t"
 #endif
-	/* Zero the temporary register */
-	"pxor %%xmm0, %%xmm0\n\t"
+  /* Zero the temporary register */
+  "pxor %%xmm0, %%xmm0\n\t"
 
-	"algo_ssse3_deinterlace_4field_argb:\n\t"
+  "algo_ssse3_deinterlace_4field_argb:\n\t"
 
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"movdqa (%0,%4), %%xmm2\n\t"                       // Load pbelow
-	"pavgb %%xmm5, %%xmm2\n\t"                         // Average pabove and pbelow
-	"pand %%xmm1, %%xmm2\n\t"                          // Filter out pixels in avg that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "movdqa (%0,%4), %%xmm2\n\t"             // Load pbelow
+  "pavgb %%xmm5, %%xmm2\n\t"             // Average pabove and pbelow
+  "pand %%xmm1, %%xmm2\n\t"              // Filter out pixels in avg that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm2, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
+  "por %%xmm2, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
 
-	"sub %4, %0\n\t"                                   // Restore pcurrent to pabove
-	"sub %4, %1\n\t"                                   // Restore pncurrent to pnabove
+  "sub %4, %0\n\t"                   // Restore pcurrent to pabove
+  "sub %4, %1\n\t"                   // Restore pncurrent to pnabove
 
-	/* Next pixels */
-	"add $0x10, %0\n\t"                                // Add 16 to pcurrent
-	"add $0x10, %1\n\t"                                // Add 16 to pncurrent
+  /* Next pixels */
+  "add $0x10, %0\n\t"                // Add 16 to pcurrent
+  "add $0x10, %1\n\t"                // Add 16 to pncurrent
 
-	/* Check if we reached the row end */
-	"cmp %2, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_argb\n\t"        // Go for another iteration
+  /* Check if we reached the row end */
+  "cmp %2, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_argb\n\t"    // Go for another iteration
 
-	/* Next row */
-	"add %4, %0\n\t"                                   // Add width to pcurrent
-	"add %4, %1\n\t"                                   // Add width to pncurrent
-	"mov %0, %2\n\t"
-	"add %4, %2\n\t"                                   // Add width to max_ptr2
+  /* Next row */
+  "add %4, %0\n\t"                   // Add width to pcurrent
+  "add %4, %1\n\t"                   // Add width to pncurrent
+  "mov %0, %2\n\t"
+  "add %4, %2\n\t"                   // Add width to max_ptr2
 
-	/* Check if we reached the end */
-	"cmp %3, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_argb\n\t"        // Go for another iteration
+  /* Check if we reached the end */
+  "cmp %3, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_argb\n\t"    // Go for another iteration
 
-	/* Special case for the last line */
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Special case for the last line */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"pand %%xmm1, %%xmm5\n\t"                          // Filter out pixels in pabove that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "pand %%xmm1, %%xmm5\n\t"              // Filter out pixels in pabove that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm5, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
-	:
-	: "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
+  "por %%xmm5, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
+  :
+  : "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
 #if defined(__x86_64__)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
 #else
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
 #endif
-	);
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
 
@@ -5509,179 +5509,179 @@ __attribute__((noinline,__target__("ssse3")))
 #endif
 void ssse3_deinterlace_4field_abgr(uint8_t* col1, uint8_t* col2, unsigned int threshold, unsigned int width, unsigned int height) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-	__attribute__((aligned(16))) static const uint8_t movemask2[16] = {2,2,2,2,2,3,3,1,10,10,10,10,10,11,11,9};
+  __attribute__((aligned(16))) static const uint8_t movemask2[16] = {2,2,2,2,2,3,3,1,10,10,10,10,10,11,11,9};
 
-	const uint32_t threshold_val = threshold;
+  const uint32_t threshold_val = threshold;
 
-	unsigned long row_width = width*4;
-	uint8_t* max_ptr = col1 + (row_width * (height-2));
-	uint8_t* max_ptr2 = col1 + row_width;
+  unsigned long row_width = width*4;
+  uint8_t* max_ptr = col1 + (row_width * (height-2));
+  uint8_t* max_ptr2 = col1 + row_width;
 
-	__asm__ __volatile__ (
-	"mov $0x1F1F1F1F, %%eax\n\t"
-	"movd %%eax, %%xmm4\n\t"
-	"pshufd $0x0, %%xmm4, %%xmm4\n\t"
-	"movdqa %6, %%xmm3\n\t"
-	"mov %5, %%eax\n\t"
+  __asm__ __volatile__ (
+  "mov $0x1F1F1F1F, %%eax\n\t"
+  "movd %%eax, %%xmm4\n\t"
+  "pshufd $0x0, %%xmm4, %%xmm4\n\t"
+  "movdqa %6, %%xmm3\n\t"
+  "mov %5, %%eax\n\t"
 #if defined(__x86_64__)
-	"movd %%eax, %%xmm8\n\t"
-	"pshufd $0x0, %%xmm8, %%xmm8\n\t"
+  "movd %%eax, %%xmm8\n\t"
+  "pshufd $0x0, %%xmm8, %%xmm8\n\t"
 #endif
-	/* Zero the temporary register */
-	"pxor %%xmm0, %%xmm0\n\t"
+  /* Zero the temporary register */
+  "pxor %%xmm0, %%xmm0\n\t"
 
-	"algo_ssse3_deinterlace_4field_abgr:\n\t"
+  "algo_ssse3_deinterlace_4field_abgr:\n\t"
 
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"movdqa (%0,%4), %%xmm2\n\t"                       // Load pbelow
-	"pavgb %%xmm5, %%xmm2\n\t"                         // Average pabove and pbelow
-	"pand %%xmm1, %%xmm2\n\t"                          // Filter out pixels in avg that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "movdqa (%0,%4), %%xmm2\n\t"             // Load pbelow
+  "pavgb %%xmm5, %%xmm2\n\t"             // Average pabove and pbelow
+  "pand %%xmm1, %%xmm2\n\t"              // Filter out pixels in avg that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm2, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
+  "por %%xmm2, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
 
-	"sub %4, %0\n\t"                                   // Restore pcurrent to pabove
-	"sub %4, %1\n\t"                                   // Restore pncurrent to pnabove
+  "sub %4, %0\n\t"                   // Restore pcurrent to pabove
+  "sub %4, %1\n\t"                   // Restore pncurrent to pnabove
 
-	/* Next pixels */
-	"add $0x10, %0\n\t"                                // Add 16 to pcurrent
-	"add $0x10, %1\n\t"                                // Add 16 to pncurrent
+  /* Next pixels */
+  "add $0x10, %0\n\t"                // Add 16 to pcurrent
+  "add $0x10, %1\n\t"                // Add 16 to pncurrent
 
-	/* Check if we reached the row end */
-	"cmp %2, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_abgr\n\t"        // Go for another iteration
+  /* Check if we reached the row end */
+  "cmp %2, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_abgr\n\t"    // Go for another iteration
 
-	/* Next row */
-	"add %4, %0\n\t"                                   // Add width to pcurrent
-	"add %4, %1\n\t"                                   // Add width to pncurrent
-	"mov %0, %2\n\t"
-	"add %4, %2\n\t"                                   // Add width to max_ptr2
+  /* Next row */
+  "add %4, %0\n\t"                   // Add width to pcurrent
+  "add %4, %1\n\t"                   // Add width to pncurrent
+  "mov %0, %2\n\t"
+  "add %4, %2\n\t"                   // Add width to max_ptr2
 
-	/* Check if we reached the end */
-	"cmp %3, %0\n\t"
-	"jb algo_ssse3_deinterlace_4field_abgr\n\t"        // Go for another iteration
+  /* Check if we reached the end */
+  "cmp %3, %0\n\t"
+  "jb algo_ssse3_deinterlace_4field_abgr\n\t"    // Go for another iteration
 
-	/* Special case for the last line */
-	/* Load pabove into xmm1 and pnabove into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
-	"movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
+  /* Special case for the last line */
+  /* Load pabove into xmm1 and pnabove into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm5\n\t" /* Keep backup of pabove in xmm5 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
+  "movdqa %%xmm1, %%xmm7\n\t" /* Backup of delta2 in xmm7 for now */
 
-	/* Next row */
-	"add %4, %0\n\t"
-	"add %4, %1\n\t"
+  /* Next row */
+  "add %4, %0\n\t"
+  "add %4, %1\n\t"
 
-	/* Load pcurrent into xmm1 and pncurrent into xmm2 */
-	"movdqa (%0), %%xmm1\n\t"
-	"movdqa (%1), %%xmm2\n\t"
-	"movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
-	"psrlq $0x3, %%xmm1\n\t"
-	"psrlq $0x3, %%xmm2\n\t"
-	"pand %%xmm4, %%xmm1\n\t"
-	"pand %%xmm4, %%xmm2\n\t"
-	"psubb %%xmm2, %%xmm1\n\t"
-	"pabsb %%xmm1, %%xmm2\n\t"
-	"movdqa %%xmm2, %%xmm1\n\t"
-	"punpckldq %%xmm1, %%xmm1\n\t"
-	"pshufb %%xmm3, %%xmm1\n\t"
-	"psadbw %%xmm0, %%xmm1\n\t"
-	"punpckhdq %%xmm2, %%xmm2\n\t"
-	"pshufb %%xmm3, %%xmm2\n\t"
-	"psadbw %%xmm0, %%xmm2\n\t"
-	"packuswb %%xmm2, %%xmm1\n\t"
+  /* Load pcurrent into xmm1 and pncurrent into xmm2 */
+  "movdqa (%0), %%xmm1\n\t"
+  "movdqa (%1), %%xmm2\n\t"
+  "movdqa %%xmm1, %%xmm6\n\t" /* Keep backup of pcurrent in xmm6 */
+  "psrlq $0x3, %%xmm1\n\t"
+  "psrlq $0x3, %%xmm2\n\t"
+  "pand %%xmm4, %%xmm1\n\t"
+  "pand %%xmm4, %%xmm2\n\t"
+  "psubb %%xmm2, %%xmm1\n\t"
+  "pabsb %%xmm1, %%xmm2\n\t"
+  "movdqa %%xmm2, %%xmm1\n\t"
+  "punpckldq %%xmm1, %%xmm1\n\t"
+  "pshufb %%xmm3, %%xmm1\n\t"
+  "psadbw %%xmm0, %%xmm1\n\t"
+  "punpckhdq %%xmm2, %%xmm2\n\t"
+  "pshufb %%xmm3, %%xmm2\n\t"
+  "psadbw %%xmm0, %%xmm2\n\t"
+  "packuswb %%xmm2, %%xmm1\n\t"
 
-	"pavgb %%xmm7, %%xmm1\n\t"                         // Average the two deltas together
+  "pavgb %%xmm7, %%xmm1\n\t"             // Average the two deltas together
 
 #if defined(__x86_64__)
-	"pcmpgtd %%xmm8, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm8, %%xmm1\n\t"             // Compare average delta with the threshold
 #else
-	"movd %%eax, %%xmm7\n\t"                           // Setup the threshold
-	"pshufd $0x0, %%xmm7, %%xmm7\n\t"
+  "movd %%eax, %%xmm7\n\t"               // Setup the threshold
+  "pshufd $0x0, %%xmm7, %%xmm7\n\t"
 
-	"pcmpgtd %%xmm7, %%xmm1\n\t"                       // Compare average delta with the threshold
+  "pcmpgtd %%xmm7, %%xmm1\n\t"             // Compare average delta with the threshold
 #endif
-	"pand %%xmm1, %%xmm5\n\t"                          // Filter out pixels in pabove that shouldn't be copied
-	"pandn %%xmm6, %%xmm1\n\t"                         // Filter out pixels in pcurrent that should be replaced
+  "pand %%xmm1, %%xmm5\n\t"              // Filter out pixels in pabove that shouldn't be copied
+  "pandn %%xmm6, %%xmm1\n\t"             // Filter out pixels in pcurrent that should be replaced
 
-	"por %%xmm5, %%xmm1\n\t"                           // Put the new values in pcurrent
-	"movntdq %%xmm1, (%0)\n\t"                         // Write pcurrent
-	:
-	: "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
+  "por %%xmm5, %%xmm1\n\t"               // Put the new values in pcurrent
+  "movntdq %%xmm1, (%0)\n\t"             // Write pcurrent
+  :
+  : "r" (col1), "r" (col2), "r" (max_ptr2), "r" (max_ptr), "r" (row_width), "m" (threshold_val), "m" (*movemask2)
 #if defined(__x86_64__)
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "%xmm8", "cc", "memory"
 #else
-	: "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
+  : "%eax", "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
 #endif
-	);
+  );
 #else
-	Panic("SSE function called on a non x86\\x86-64 platform");
+  Panic("SSE function called on a non x86\\x86-64 platform");
 #endif
 }
diff --git a/src/zm_image_analyser.cpp b/src/zm_image_analyser.cpp
index 1445e9864..8f03160d9 100644
--- a/src/zm_image_analyser.cpp
+++ b/src/zm_image_analyser.cpp
@@ -7,7 +7,7 @@
  */
 ImageAnalyser::ImageAnalyser(const ImageAnalyser& source)
 {
-    m_Detectors = source.m_Detectors;
+  m_Detectors = source.m_Detectors;
 }
 
 
@@ -17,18 +17,18 @@ ImageAnalyser::ImageAnalyser(const ImageAnalyser& source)
  */
 ImageAnalyser& ImageAnalyser::operator=(const ImageAnalyser& source)
 {
-    m_Detectors = source.m_Detectors;
-    return *this;
+  m_Detectors = source.m_Detectors;
+  return *this;
 }
 
 
 
 ImageAnalyser::~ImageAnalyser()
 {
-    for(DetectorsList::reverse_iterator It = m_Detectors.rbegin();
-        It != m_Detectors.rend();
-        ++It)
-      delete *It;
+  for(DetectorsList::reverse_iterator It = m_Detectors.rbegin();
+    It != m_Detectors.rend();
+    ++It)
+    delete *It;
 }
 
 
@@ -42,23 +42,23 @@ ImageAnalyser::~ImageAnalyser()
  */
 int ImageAnalyser::DoDetection(const Image &comp_image, Zone** zones, int n_numZones, Event::StringSetMap noteSetMap, std::string& det_cause)
 {
-    Event::StringSet zoneSet;
-    int score = 0;
+  Event::StringSet zoneSet;
+  int score = 0;
 
-    for(DetectorsList::iterator It = m_Detectors.begin();
-        It != m_Detectors.end();
-        ++It)
+  for(DetectorsList::iterator It = m_Detectors.begin();
+    It != m_Detectors.end();
+    ++It)
+  {
+    int detect_score = (*It)->Detect(comp_image, zones, n_numZones, zoneSet);
+    if (detect_score)
     {
-        int detect_score = (*It)->Detect(comp_image, zones, n_numZones, zoneSet);
-        if (detect_score)
-        {
-            score += detect_score;
-            noteSetMap[(*It)->getDetectionCause()] = zoneSet;
-            if (det_cause.length())
-                det_cause += ", ";
-            det_cause += (*It)->getDetectionCause();
-        }
+      score += detect_score;
+      noteSetMap[(*It)->getDetectionCause()] = zoneSet;
+      if (det_cause.length())
+        det_cause += ", ";
+      det_cause += (*It)->getDetectionCause();
     }
-    return score;
+  }
+  return score;
 }
 
diff --git a/src/zm_image_analyser.h b/src/zm_image_analyser.h
index 74cc7a73a..c853c82a3 100644
--- a/src/zm_image_analyser.h
+++ b/src/zm_image_analyser.h
@@ -22,18 +22,18 @@ using namespace std;
 //! Class for handling image detection.
 class ImageAnalyser {
   public:
-    
-    //!Default constructor.
-    ImageAnalyser() {};
+  
+  //!Default constructor.
+  ImageAnalyser() {};
 
-    //! Destructor.
-    ~ImageAnalyser();
+  //! Destructor.
+  ~ImageAnalyser();
 
-    //! Copy constructor.
-    ImageAnalyser(const ImageAnalyser& source);
+  //! Copy constructor.
+  ImageAnalyser(const ImageAnalyser& source);
 
-    //! Overloaded operator=.
-    ImageAnalyser& operator=(const ImageAnalyser& source);
+  //! Overloaded operator=.
+  ImageAnalyser& operator=(const ImageAnalyser& source);
 
 private: 
 
diff --git a/src/zm_jpeg.cpp b/src/zm_jpeg.cpp
index 92f757ca1..c47bbe267 100644
--- a/src/zm_jpeg.cpp
+++ b/src/zm_jpeg.cpp
@@ -32,65 +32,65 @@ static int jpeg_err_count = 0;
 
 void zm_jpeg_error_exit( j_common_ptr cinfo )
 {
-	static char buffer[JMSG_LENGTH_MAX];
-	zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
+  static char buffer[JMSG_LENGTH_MAX];
+  zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
 
-	(zmerr->pub.format_message)( cinfo, buffer ); 
+  (zmerr->pub.format_message)( cinfo, buffer ); 
 
-	Error( "%s", buffer );
-	if ( ++jpeg_err_count == MAX_JPEG_ERRS )
-	{
-		Fatal( "Maximum number (%d) of JPEG errors reached, exiting", jpeg_err_count );
-	}
+  Error( "%s", buffer );
+  if ( ++jpeg_err_count == MAX_JPEG_ERRS )
+  {
+    Fatal( "Maximum number (%d) of JPEG errors reached, exiting", jpeg_err_count );
+  }
 
-	longjmp( zmerr->setjmp_buffer, 1 );
+  longjmp( zmerr->setjmp_buffer, 1 );
 }
 
 void zm_jpeg_emit_message( j_common_ptr cinfo, int msg_level )
 {
-	static char buffer[JMSG_LENGTH_MAX];
-	zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
+  static char buffer[JMSG_LENGTH_MAX];
+  zm_error_ptr zmerr = (zm_error_ptr)cinfo->err;
 
-	if ( msg_level < 0 )
-	{
-		/* It's a warning message.  Since corrupt files may generate many warnings,
-		 * the policy implemented here is to show only the first warning,
-		 * unless trace_level >= 3.
-		 */
-		if ( zmerr->pub.num_warnings == 0 || zmerr->pub.trace_level >= 3 )
-		{
-			(zmerr->pub.format_message)( cinfo, buffer );
-			if (!strstr(buffer, "Corrupt JPEG data:")) 
-			Warning( "%s", buffer );
-		}
-		/* Always count warnings in num_warnings. */
-		zmerr->pub.num_warnings++;
-	}
-	else
-	{
-		/* It's a trace message.  Show it if trace_level >= msg_level. */
-		if ( zmerr->pub.trace_level >= msg_level )
-		{
-			(zmerr->pub.format_message)( cinfo, buffer ); 
-			Debug( msg_level, "%s", buffer );
-		}
-	}
+  if ( msg_level < 0 )
+  {
+    /* It's a warning message.  Since corrupt files may generate many warnings,
+     * the policy implemented here is to show only the first warning,
+     * unless trace_level >= 3.
+     */
+    if ( zmerr->pub.num_warnings == 0 || zmerr->pub.trace_level >= 3 )
+    {
+      (zmerr->pub.format_message)( cinfo, buffer );
+      if (!strstr(buffer, "Corrupt JPEG data:")) 
+      Warning( "%s", buffer );
+    }
+    /* Always count warnings in num_warnings. */
+    zmerr->pub.num_warnings++;
+  }
+  else
+  {
+    /* It's a trace message.  Show it if trace_level >= msg_level. */
+    if ( zmerr->pub.trace_level >= msg_level )
+    {
+      (zmerr->pub.format_message)( cinfo, buffer ); 
+      Debug( msg_level, "%s", buffer );
+    }
+  }
 }
 
 /* Expanded data destination object for memory */
 
 typedef struct
 {
-    struct jpeg_destination_mgr pub; /* public fields */
+  struct jpeg_destination_mgr pub; /* public fields */
 
-    JOCTET *outbuffer;		/* target buffer */
-    int   *outbuffer_size;
-    JOCTET *buffer;		/* start of buffer */
+  JOCTET *outbuffer;    /* target buffer */
+  int   *outbuffer_size;
+  JOCTET *buffer;    /* start of buffer */
 } mem_destination_mgr;
 
 typedef mem_destination_mgr * mem_dest_ptr;
 
-#define OUTPUT_BUF_SIZE  4096	/* choose an efficiently fwrite'able size */
+#define OUTPUT_BUF_SIZE  4096  /* choose an efficiently fwrite'able size */
 
 /*
  * Initialize destination --- called by jpeg_start_compress
@@ -99,15 +99,15 @@ typedef mem_destination_mgr * mem_dest_ptr;
 
 static void init_destination (j_compress_ptr cinfo)
 {
-    mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+  mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
-    /* Allocate the output buffer --- it will be released when done with image */
-    dest->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
+  /* Allocate the output buffer --- it will be released when done with image */
+  dest->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_IMAGE, OUTPUT_BUF_SIZE * SIZEOF(JOCTET));
 
-    dest->pub.next_output_byte = dest->buffer;
-    dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+  dest->pub.next_output_byte = dest->buffer;
+  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 
-    *(dest->outbuffer_size) = 0;
+  *(dest->outbuffer_size) = 0;
 }
 
 
@@ -136,15 +136,15 @@ static void init_destination (j_compress_ptr cinfo)
 
 static boolean empty_output_buffer (j_compress_ptr cinfo)
 {
-    mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+  mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
 
-    memcpy( dest->outbuffer+*(dest->outbuffer_size), dest->buffer, OUTPUT_BUF_SIZE );
-    *(dest->outbuffer_size) += OUTPUT_BUF_SIZE;
+  memcpy( dest->outbuffer+*(dest->outbuffer_size), dest->buffer, OUTPUT_BUF_SIZE );
+  *(dest->outbuffer_size) += OUTPUT_BUF_SIZE;
 
-    dest->pub.next_output_byte = dest->buffer;
-    dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
+  dest->pub.next_output_byte = dest->buffer;
+  dest->pub.free_in_buffer = OUTPUT_BUF_SIZE;
 
-    return( TRUE );
+  return( TRUE );
 }
 
 /*
@@ -158,14 +158,14 @@ static boolean empty_output_buffer (j_compress_ptr cinfo)
 
 static void term_destination (j_compress_ptr cinfo)
 {
-    mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
-    size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
+  mem_dest_ptr dest = (mem_dest_ptr) cinfo->dest;
+  size_t datacount = OUTPUT_BUF_SIZE - dest->pub.free_in_buffer;
 
-    if ( datacount > 0 )
-    {
-        memcpy( dest->outbuffer+*(dest->outbuffer_size), dest->buffer, datacount );
-        *(dest->outbuffer_size) += datacount;
-    }
+  if ( datacount > 0 )
+  {
+    memcpy( dest->outbuffer+*(dest->outbuffer_size), dest->buffer, datacount );
+    *(dest->outbuffer_size) += datacount;
+  }
 }
 
 
@@ -177,45 +177,45 @@ static void term_destination (j_compress_ptr cinfo)
 
 void zm_jpeg_mem_dest (j_compress_ptr cinfo, JOCTET *outbuffer, int *outbuffer_size )
 {
-    mem_dest_ptr dest;
+  mem_dest_ptr dest;
 
-    /* The destination object is made permanent so that multiple JPEG images
-     * can be written to the same file without re-executing jpeg_stdio_dest.
-     * This makes it dangerous to use this manager and a different destination
-     * manager serially with the same JPEG object, because their private object
-     * sizes may be different.  Caveat programmer.
-     */
-    if ( cinfo->dest == NULL )
-    {
-        /* first time for this JPEG object? */
-        cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_destination_mgr));
-    }
+  /* The destination object is made permanent so that multiple JPEG images
+   * can be written to the same file without re-executing jpeg_stdio_dest.
+   * This makes it dangerous to use this manager and a different destination
+   * manager serially with the same JPEG object, because their private object
+   * sizes may be different.  Caveat programmer.
+   */
+  if ( cinfo->dest == NULL )
+  {
+    /* first time for this JPEG object? */
+    cinfo->dest = (struct jpeg_destination_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_destination_mgr));
+  }
 
-    dest = (mem_dest_ptr) cinfo->dest;
-    dest->pub.init_destination = init_destination;
-    dest->pub.empty_output_buffer = empty_output_buffer;
-    dest->pub.term_destination = term_destination;
-    dest->outbuffer = outbuffer;
-    dest->outbuffer_size = outbuffer_size;
+  dest = (mem_dest_ptr) cinfo->dest;
+  dest->pub.init_destination = init_destination;
+  dest->pub.empty_output_buffer = empty_output_buffer;
+  dest->pub.term_destination = term_destination;
+  dest->outbuffer = outbuffer;
+  dest->outbuffer_size = outbuffer_size;
 }
 
 /* Expanded data source object for memory input */
 
 typedef struct
 {
-    struct jpeg_source_mgr pub;	/* public fields */
+  struct jpeg_source_mgr pub;  /* public fields */
 
-    JOCTET * inbuffer;		/* source stream */
-    int    inbuffer_size;
-    int    inbuffer_size_hwm; /* High water mark */
+  JOCTET * inbuffer;    /* source stream */
+  int  inbuffer_size;
+  int  inbuffer_size_hwm; /* High water mark */
 
-    JOCTET * buffer;		/* start of buffer */
-    boolean start_of_data;	/* have we gotten any data yet? */
+  JOCTET * buffer;    /* start of buffer */
+  boolean start_of_data;  /* have we gotten any data yet? */
 } mem_source_mgr;
 
 typedef mem_source_mgr * mem_src_ptr;
 
-#define INPUT_BUF_SIZE  4096	/* choose an efficiently fread'able size */
+#define INPUT_BUF_SIZE  4096  /* choose an efficiently fread'able size */
 
 /*
  * Initialize source --- called by jpeg_read_header
@@ -224,14 +224,14 @@ typedef mem_source_mgr * mem_src_ptr;
 
 static void init_source (j_decompress_ptr cinfo)
 {
-    mem_src_ptr src = (mem_src_ptr) cinfo->src;
+  mem_src_ptr src = (mem_src_ptr) cinfo->src;
 
-    /* We reset the empty-input-file flag for each image,
-     * but we don't clear the input buffer.
-     * This is correct behavior for reading a series of images from one source.
-     */
-    src->start_of_data = TRUE;
-    src->pub.bytes_in_buffer = 0;
+  /* We reset the empty-input-file flag for each image,
+   * but we don't clear the input buffer.
+   * This is correct behavior for reading a series of images from one source.
+   */
+  src->start_of_data = TRUE;
+  src->pub.bytes_in_buffer = 0;
 }
 
 
@@ -270,26 +270,26 @@ static void init_source (j_decompress_ptr cinfo)
 
 static boolean fill_input_buffer (j_decompress_ptr cinfo)
 {
-    mem_src_ptr src = (mem_src_ptr) cinfo->src;
-    size_t nbytes;
+  mem_src_ptr src = (mem_src_ptr) cinfo->src;
+  size_t nbytes;
 
-    memcpy( src->buffer, src->inbuffer, (size_t) src->inbuffer_size );
-    nbytes = src->inbuffer_size;
+  memcpy( src->buffer, src->inbuffer, (size_t) src->inbuffer_size );
+  nbytes = src->inbuffer_size;
 
-    if ( nbytes <= 0 )
-    {
-        if ( src->start_of_data )	/* Treat empty input file as fatal error */
-            ERREXIT(cinfo, JERR_INPUT_EMPTY);
-        WARNMS(cinfo, JWRN_JPEG_EOF);
-        /* Insert a fake EOI marker */
-        src->buffer[0] = (JOCTET) 0xFF;
-        src->buffer[1] = (JOCTET) JPEG_EOI;
-        nbytes = 2;
-    }
+  if ( nbytes <= 0 )
+  {
+    if ( src->start_of_data )  /* Treat empty input file as fatal error */
+      ERREXIT(cinfo, JERR_INPUT_EMPTY);
+    WARNMS(cinfo, JWRN_JPEG_EOF);
+    /* Insert a fake EOI marker */
+    src->buffer[0] = (JOCTET) 0xFF;
+    src->buffer[1] = (JOCTET) JPEG_EOI;
+    nbytes = 2;
+  }
 
-    src->pub.next_input_byte = src->buffer;
-    src->pub.bytes_in_buffer = nbytes;
-    src->start_of_data = FALSE;
+  src->pub.next_input_byte = src->buffer;
+  src->pub.bytes_in_buffer = nbytes;
+  src->start_of_data = FALSE;
 
   return( TRUE );
 }
@@ -309,25 +309,25 @@ static boolean fill_input_buffer (j_decompress_ptr cinfo)
 
 static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
 {
-    mem_src_ptr src = (mem_src_ptr) cinfo->src;
+  mem_src_ptr src = (mem_src_ptr) cinfo->src;
 
-    /* Just a dumb implementation for now.  Could use fseek() except
-     * it doesn't work on pipes.  Not clear that being smart is worth
-     * any trouble anyway --- large skips are infrequent.
-     */
-    if ( num_bytes > 0 )
+  /* Just a dumb implementation for now.  Could use fseek() except
+   * it doesn't work on pipes.  Not clear that being smart is worth
+   * any trouble anyway --- large skips are infrequent.
+   */
+  if ( num_bytes > 0 )
+  {
+    while ( num_bytes > (long) src->pub.bytes_in_buffer )
     {
-        while ( num_bytes > (long) src->pub.bytes_in_buffer )
-        {
-            num_bytes -= (long) src->pub.bytes_in_buffer;
-            (void) fill_input_buffer(cinfo);
-            /* note we assume that fill_input_buffer will never return FALSE,
-             * so suspension need not be handled.
-             */
-        }
-        src->pub.next_input_byte += (size_t) num_bytes;
-        src->pub.bytes_in_buffer -= (size_t) num_bytes;
+      num_bytes -= (long) src->pub.bytes_in_buffer;
+      (void) fill_input_buffer(cinfo);
+      /* note we assume that fill_input_buffer will never return FALSE,
+       * so suspension need not be handled.
+       */
     }
+    src->pub.next_input_byte += (size_t) num_bytes;
+    src->pub.bytes_in_buffer -= (size_t) num_bytes;
+  }
 }
 
 
@@ -342,7 +342,7 @@ static void skip_input_data (j_decompress_ptr cinfo, long num_bytes)
 
 static void term_source (j_decompress_ptr cinfo)
 {
-    /* no work necessary here */
+  /* no work necessary here */
 }
 
 
@@ -354,114 +354,114 @@ static void term_source (j_decompress_ptr cinfo)
 
 void zm_jpeg_mem_src( j_decompress_ptr cinfo, const JOCTET *inbuffer, int inbuffer_size )
 {
-    mem_src_ptr src;
-
-    /* The source object and input buffer are made permanent so that a series
-     * of JPEG images can be read from the same file by calling zm_jpeg_mem_src
-     * only before the first one.  (If we discarded the buffer at the end of
-     * one image, we'd likely lose the start of the next one.)
-     * This makes it unsafe to use this manager and a different source
-     * manager serially with the same JPEG object.  Caveat programmer.
-     */
-    if ( cinfo->src == NULL )
-    {
-  	    /* first time for this JPEG object? */
-        cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_source_mgr));
-        src = (mem_src_ptr) cinfo->src;
-        src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, inbuffer_size * SIZEOF(JOCTET));
-	    src->inbuffer_size_hwm = inbuffer_size;
-    }
-    else
-    {
-        src = (mem_src_ptr) cinfo->src;
-	    if ( src->inbuffer_size_hwm < inbuffer_size )
-	    {
-            src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, inbuffer_size * SIZEOF(JOCTET));
-	        src->inbuffer_size_hwm = inbuffer_size;
-	    }
-    }
+  mem_src_ptr src;
 
+  /* The source object and input buffer are made permanent so that a series
+   * of JPEG images can be read from the same file by calling zm_jpeg_mem_src
+   * only before the first one.  (If we discarded the buffer at the end of
+   * one image, we'd likely lose the start of the next one.)
+   * This makes it unsafe to use this manager and a different source
+   * manager serially with the same JPEG object.  Caveat programmer.
+   */
+  if ( cinfo->src == NULL )
+  {
+      /* first time for this JPEG object? */
+    cinfo->src = (struct jpeg_source_mgr *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, SIZEOF(mem_source_mgr));
     src = (mem_src_ptr) cinfo->src;
-    src->pub.init_source = init_source;
-    src->pub.fill_input_buffer = fill_input_buffer;
-    src->pub.skip_input_data = skip_input_data;
-    src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
-    src->pub.term_source = term_source;
-    src->inbuffer = (JOCTET *)inbuffer;
-    src->inbuffer_size = inbuffer_size;
-    src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
-    src->pub.next_input_byte = NULL; /* until buffer loaded */
+    src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, inbuffer_size * SIZEOF(JOCTET));
+    src->inbuffer_size_hwm = inbuffer_size;
+  }
+  else
+  {
+    src = (mem_src_ptr) cinfo->src;
+    if ( src->inbuffer_size_hwm < inbuffer_size )
+    {
+      src->buffer = (JOCTET *)(*cinfo->mem->alloc_small) ((j_common_ptr) cinfo, JPOOL_PERMANENT, inbuffer_size * SIZEOF(JOCTET));
+      src->inbuffer_size_hwm = inbuffer_size;
+    }
+  }
+
+  src = (mem_src_ptr) cinfo->src;
+  src->pub.init_source = init_source;
+  src->pub.fill_input_buffer = fill_input_buffer;
+  src->pub.skip_input_data = skip_input_data;
+  src->pub.resync_to_restart = jpeg_resync_to_restart; /* use default method */
+  src->pub.term_source = term_source;
+  src->inbuffer = (JOCTET *)inbuffer;
+  src->inbuffer_size = inbuffer_size;
+  src->pub.bytes_in_buffer = 0; /* forces fill_input_buffer on first read */
+  src->pub.next_input_byte = NULL; /* until buffer loaded */
 }
 
 void zm_use_std_huff_tables( j_decompress_ptr cinfo ) {
-	/* JPEG standard Huffman tables (cf. JPEG standard section K.3) */
-	/* IMPORTANT: these are only valid for 8-bit data precision! */
-	static const JHUFF_TBL dclumin = {
-	  { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 },
-	  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
-	  FALSE
-	};
-	static const JHUFF_TBL dcchrome = {
-	  { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 },
-	  { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
-	  FALSE
-	};
-	static const JHUFF_TBL aclumin = {
-	  { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d },
-	  { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
-	    0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
-	    0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
-	    0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
-	    0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
-	    0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
-	    0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
-	    0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
-	    0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
-	    0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
-	    0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
-	    0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
-	    0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
-	    0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
-	    0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
-	    0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
-	    0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
-	    0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
-	    0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
-	    0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-	    0xf9, 0xfa },
-	  FALSE
-	};
-	static const JHUFF_TBL acchrome = {
-	  { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 },
-	  { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
-	    0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
-	    0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
-	    0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
-	    0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
-	    0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
-	    0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
-	    0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
-	    0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
-	    0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
-	    0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
-	    0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
-	    0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
-	    0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
-	    0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
-	    0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
-	    0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
-	    0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
-	    0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
-	    0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
-	    0xf9, 0xfa },
-	  FALSE
-	};
-	
-	cinfo->dc_huff_tbl_ptrs[0] = (JHUFF_TBL*)&dclumin;
-	cinfo->dc_huff_tbl_ptrs[1] = (JHUFF_TBL*)&dcchrome;
-	cinfo->ac_huff_tbl_ptrs[0] = (JHUFF_TBL*)&aclumin;
-	cinfo->ac_huff_tbl_ptrs[1] = (JHUFF_TBL*)&acchrome;
-	
+  /* JPEG standard Huffman tables (cf. JPEG standard section K.3) */
+  /* IMPORTANT: these are only valid for 8-bit data precision! */
+  static const JHUFF_TBL dclumin = {
+    { /* 0-base */ 0, 0, 1, 5, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0, 0, 0 },
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
+    FALSE
+  };
+  static const JHUFF_TBL dcchrome = {
+    { /* 0-base */ 0, 0, 3, 1, 1, 1, 1, 1, 1, 1, 1, 1, 0, 0, 0, 0, 0 },
+    { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11 },
+    FALSE
+  };
+  static const JHUFF_TBL aclumin = {
+    { /* 0-base */ 0, 0, 2, 1, 3, 3, 2, 4, 3, 5, 5, 4, 4, 0, 0, 1, 0x7d },
+    { 0x01, 0x02, 0x03, 0x00, 0x04, 0x11, 0x05, 0x12,
+    0x21, 0x31, 0x41, 0x06, 0x13, 0x51, 0x61, 0x07,
+    0x22, 0x71, 0x14, 0x32, 0x81, 0x91, 0xa1, 0x08,
+    0x23, 0x42, 0xb1, 0xc1, 0x15, 0x52, 0xd1, 0xf0,
+    0x24, 0x33, 0x62, 0x72, 0x82, 0x09, 0x0a, 0x16,
+    0x17, 0x18, 0x19, 0x1a, 0x25, 0x26, 0x27, 0x28,
+    0x29, 0x2a, 0x34, 0x35, 0x36, 0x37, 0x38, 0x39,
+    0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48, 0x49,
+    0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58, 0x59,
+    0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68, 0x69,
+    0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78, 0x79,
+    0x7a, 0x83, 0x84, 0x85, 0x86, 0x87, 0x88, 0x89,
+    0x8a, 0x92, 0x93, 0x94, 0x95, 0x96, 0x97, 0x98,
+    0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5, 0xa6, 0xa7,
+    0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4, 0xb5, 0xb6,
+    0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3, 0xc4, 0xc5,
+    0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2, 0xd3, 0xd4,
+    0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda, 0xe1, 0xe2,
+    0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9, 0xea,
+    0xf1, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+    0xf9, 0xfa },
+    FALSE
+  };
+  static const JHUFF_TBL acchrome = {
+    { /* 0-base */ 0, 0, 2, 1, 2, 4, 4, 3, 4, 7, 5, 4, 4, 0, 1, 2, 0x77 },
+    { 0x00, 0x01, 0x02, 0x03, 0x11, 0x04, 0x05, 0x21,
+    0x31, 0x06, 0x12, 0x41, 0x51, 0x07, 0x61, 0x71,
+    0x13, 0x22, 0x32, 0x81, 0x08, 0x14, 0x42, 0x91,
+    0xa1, 0xb1, 0xc1, 0x09, 0x23, 0x33, 0x52, 0xf0,
+    0x15, 0x62, 0x72, 0xd1, 0x0a, 0x16, 0x24, 0x34,
+    0xe1, 0x25, 0xf1, 0x17, 0x18, 0x19, 0x1a, 0x26,
+    0x27, 0x28, 0x29, 0x2a, 0x35, 0x36, 0x37, 0x38,
+    0x39, 0x3a, 0x43, 0x44, 0x45, 0x46, 0x47, 0x48,
+    0x49, 0x4a, 0x53, 0x54, 0x55, 0x56, 0x57, 0x58,
+    0x59, 0x5a, 0x63, 0x64, 0x65, 0x66, 0x67, 0x68,
+    0x69, 0x6a, 0x73, 0x74, 0x75, 0x76, 0x77, 0x78,
+    0x79, 0x7a, 0x82, 0x83, 0x84, 0x85, 0x86, 0x87,
+    0x88, 0x89, 0x8a, 0x92, 0x93, 0x94, 0x95, 0x96,
+    0x97, 0x98, 0x99, 0x9a, 0xa2, 0xa3, 0xa4, 0xa5,
+    0xa6, 0xa7, 0xa8, 0xa9, 0xaa, 0xb2, 0xb3, 0xb4,
+    0xb5, 0xb6, 0xb7, 0xb8, 0xb9, 0xba, 0xc2, 0xc3,
+    0xc4, 0xc5, 0xc6, 0xc7, 0xc8, 0xc9, 0xca, 0xd2,
+    0xd3, 0xd4, 0xd5, 0xd6, 0xd7, 0xd8, 0xd9, 0xda,
+    0xe2, 0xe3, 0xe4, 0xe5, 0xe6, 0xe7, 0xe8, 0xe9,
+    0xea, 0xf2, 0xf3, 0xf4, 0xf5, 0xf6, 0xf7, 0xf8,
+    0xf9, 0xfa },
+    FALSE
+  };
+  
+  cinfo->dc_huff_tbl_ptrs[0] = (JHUFF_TBL*)&dclumin;
+  cinfo->dc_huff_tbl_ptrs[1] = (JHUFF_TBL*)&dcchrome;
+  cinfo->ac_huff_tbl_ptrs[0] = (JHUFF_TBL*)&aclumin;
+  cinfo->ac_huff_tbl_ptrs[1] = (JHUFF_TBL*)&acchrome;
+  
 }
 
 }
diff --git a/src/zm_jpeg.h b/src/zm_jpeg.h
index 94290869a..b7807d0d3 100644
--- a/src/zm_jpeg.h
+++ b/src/zm_jpeg.h
@@ -32,8 +32,8 @@ extern "C"
 /* Stuff for overriden error handlers */
 struct zm_error_mgr
 {
-	struct jpeg_error_mgr pub;
-	jmp_buf setjmp_buffer;
+  struct jpeg_error_mgr pub;
+  jmp_buf setjmp_buffer;
 };
 
 typedef struct zm_error_mgr *zm_error_ptr;
diff --git a/src/zm_libvlc_camera.cpp b/src/zm_libvlc_camera.cpp
index 1f756f6e0..2352adb32 100644
--- a/src/zm_libvlc_camera.cpp
+++ b/src/zm_libvlc_camera.cpp
@@ -25,102 +25,102 @@
 // Do all the buffer checking work here to avoid unnecessary locking 
 void* LibvlcLockBuffer(void* opaque, void** planes)
 {
-    LibvlcPrivateData* data = (LibvlcPrivateData*)opaque;
-    data->mutex.lock();
-    
-    uint8_t* buffer = data->buffer;
-    data->buffer = data->prevBuffer;
-    data->prevBuffer = buffer;
-    
-    *planes = data->buffer;
-    return NULL;
+  LibvlcPrivateData* data = (LibvlcPrivateData*)opaque;
+  data->mutex.lock();
+  
+  uint8_t* buffer = data->buffer;
+  data->buffer = data->prevBuffer;
+  data->prevBuffer = buffer;
+  
+  *planes = data->buffer;
+  return NULL;
 }
 
 void LibvlcUnlockBuffer(void* opaque, void* picture, void *const *planes)
 {
-    LibvlcPrivateData* data = (LibvlcPrivateData*)opaque;
-    
-    bool newFrame = false;
-    for(uint32_t i = 0; i < data->bufferSize; i++)
+  LibvlcPrivateData* data = (LibvlcPrivateData*)opaque;
+  
+  bool newFrame = false;
+  for(uint32_t i = 0; i < data->bufferSize; i++)
+  {
+    if(data->buffer[i] != data->prevBuffer[i])
     {
-        if(data->buffer[i] != data->prevBuffer[i])
-        {
-            newFrame = true;
-            break;
-        }
-    }
-    data->mutex.unlock();
-    
-    time_t now;
-    time(&now);
-    // Return frames slightly faster than 1fps (if time() supports greater than one second resolution)
-    if(newFrame || difftime(now, data->prevTime) >= 0.8)
-    {
-        data->prevTime = now;
-        data->newImage.updateValueSignal(true);
+      newFrame = true;
+      break;
     }
+  }
+  data->mutex.unlock();
+  
+  time_t now;
+  time(&now);
+  // Return frames slightly faster than 1fps (if time() supports greater than one second resolution)
+  if(newFrame || difftime(now, data->prevTime) >= 0.8)
+  {
+    data->prevTime = now;
+    data->newImage.updateValueSignal(true);
+  }
 }
 
-LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, LIBVLC_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
-    mPath( p_path ),
-    mMethod( p_method ),
-    mOptions( p_options )
-{	
-	mLibvlcInstance = NULL;
-    mLibvlcMedia = NULL;
-	mLibvlcMediaPlayer = NULL;
-    mLibvlcData.buffer = NULL;
-    mLibvlcData.prevBuffer = NULL;
+LibvlcCamera::LibvlcCamera( int p_id, const std::string &p_path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+  Camera( p_id, LIBVLC_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+  mPath( p_path ),
+  mMethod( p_method ),
+  mOptions( p_options )
+{  
+  mLibvlcInstance = NULL;
+  mLibvlcMedia = NULL;
+  mLibvlcMediaPlayer = NULL;
+  mLibvlcData.buffer = NULL;
+  mLibvlcData.prevBuffer = NULL;
 
-	/* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
-	if(colours == ZM_COLOUR_RGB32) {
-		subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-        mTargetChroma = "RV32";
-        mBpp = 4;
-	} else if(colours == ZM_COLOUR_RGB24) {
-        subpixelorder = ZM_SUBPIX_ORDER_BGR;
-        mTargetChroma = "RV24";
-        mBpp = 3;
-	} else if(colours == ZM_COLOUR_GRAY8) {
-		subpixelorder = ZM_SUBPIX_ORDER_NONE;
-        mTargetChroma = "GREY";
-        mBpp = 1;
-	} else {
-		Panic("Unexpected colours: %d",colours);
-	}
-    
-	if ( capture )
-	{
-		Initialise();
-	}
+  /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
+  if(colours == ZM_COLOUR_RGB32) {
+    subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+    mTargetChroma = "RV32";
+    mBpp = 4;
+  } else if(colours == ZM_COLOUR_RGB24) {
+    subpixelorder = ZM_SUBPIX_ORDER_BGR;
+    mTargetChroma = "RV24";
+    mBpp = 3;
+  } else if(colours == ZM_COLOUR_GRAY8) {
+    subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    mTargetChroma = "GREY";
+    mBpp = 1;
+  } else {
+    Panic("Unexpected colours: %d",colours);
+  }
+  
+  if ( capture )
+  {
+    Initialise();
+  }
 }
 
 LibvlcCamera::~LibvlcCamera()
 {
-	if ( capture )
-	{
-		Terminate();
-	}
-    if(mLibvlcMediaPlayer != NULL)
-    {
-        libvlc_media_player_release(mLibvlcMediaPlayer);
-        mLibvlcMediaPlayer = NULL;
-    }
-    if(mLibvlcMedia != NULL)
-    {
-        libvlc_media_release(mLibvlcMedia);
-        mLibvlcMedia = NULL;
-    }
-    if(mLibvlcInstance != NULL)
-    {
-        libvlc_release(mLibvlcInstance);
-        mLibvlcInstance = NULL;
-    }
-    if (mOptArgV != NULL)
-    {
-    	delete[] mOptArgV;
-    }
+  if ( capture )
+  {
+    Terminate();
+  }
+  if(mLibvlcMediaPlayer != NULL)
+  {
+    libvlc_media_player_release(mLibvlcMediaPlayer);
+    mLibvlcMediaPlayer = NULL;
+  }
+  if(mLibvlcMedia != NULL)
+  {
+    libvlc_media_release(mLibvlcMedia);
+    mLibvlcMedia = NULL;
+  }
+  if(mLibvlcInstance != NULL)
+  {
+    libvlc_release(mLibvlcInstance);
+    mLibvlcInstance = NULL;
+  }
+  if (mOptArgV != NULL)
+  {
+    delete[] mOptArgV;
+  }
 }
 
 void LibvlcCamera::Initialise()
@@ -129,105 +129,105 @@ void LibvlcCamera::Initialise()
 
 void LibvlcCamera::Terminate()
 {
-    libvlc_media_player_stop(mLibvlcMediaPlayer);
-    if(mLibvlcData.buffer != NULL)
-    {
-        zm_freealigned(mLibvlcData.buffer);
-    }
-    if(mLibvlcData.prevBuffer != NULL)
-    {
-        zm_freealigned(mLibvlcData.prevBuffer);
-    }
+  libvlc_media_player_stop(mLibvlcMediaPlayer);
+  if(mLibvlcData.buffer != NULL)
+  {
+    zm_freealigned(mLibvlcData.buffer);
+  }
+  if(mLibvlcData.prevBuffer != NULL)
+  {
+    zm_freealigned(mLibvlcData.prevBuffer);
+  }
 }
 
 int LibvlcCamera::PrimeCapture()
 {
-    Info("Priming capture from %s", mPath.c_str());
-    
-    StringVector opVect = split(Options(), ",");
-    
-    // Set transport method as specified by method field, rtpUni is default
-    if ( Method() == "rtpMulti" )
-    	opVect.push_back("--rtsp-mcast");
-    else if ( Method() == "rtpRtsp" )
-        opVect.push_back("--rtsp-tcp");
-    else if ( Method() == "rtpRtspHttp" )
-        opVect.push_back("--rtsp-http");
+  Info("Priming capture from %s", mPath.c_str());
+  
+  StringVector opVect = split(Options(), ",");
+  
+  // Set transport method as specified by method field, rtpUni is default
+  if ( Method() == "rtpMulti" )
+    opVect.push_back("--rtsp-mcast");
+  else if ( Method() == "rtpRtsp" )
+    opVect.push_back("--rtsp-tcp");
+  else if ( Method() == "rtpRtspHttp" )
+    opVect.push_back("--rtsp-http");
 
-    if (opVect.size() > 0) 
-    {
-    	mOptArgV = new char*[opVect.size()];
-    	Debug(2, "Number of Options: %d",opVect.size());
-    	for (size_t i=0; i< opVect.size(); i++) {
-    		opVect[i] = trimSpaces(opVect[i]);
-    		mOptArgV[i] = (char *)opVect[i].c_str();
-    		Debug(2, "set option %d to '%s'", i,  opVect[i].c_str());
-    	}
+  if (opVect.size() > 0) 
+  {
+    mOptArgV = new char*[opVect.size()];
+    Debug(2, "Number of Options: %d",opVect.size());
+    for (size_t i=0; i< opVect.size(); i++) {
+      opVect[i] = trimSpaces(opVect[i]);
+      mOptArgV[i] = (char *)opVect[i].c_str();
+      Debug(2, "set option %d to '%s'", i,  opVect[i].c_str());
     }
+  }
 
-    mLibvlcInstance = libvlc_new (opVect.size(), (const char* const*)mOptArgV);
-    if(mLibvlcInstance == NULL)
-        Fatal("Unable to create libvlc instance due to: %s", libvlc_errmsg());
-     
-    mLibvlcMedia = libvlc_media_new_location(mLibvlcInstance, mPath.c_str());
-    if(mLibvlcMedia == NULL)
-        Fatal("Unable to open input %s due to: %s", mPath.c_str(), libvlc_errmsg());
-	
-    mLibvlcMediaPlayer = libvlc_media_player_new_from_media(mLibvlcMedia);
-    if(mLibvlcMediaPlayer == NULL)
-        Fatal("Unable to create player for %s due to: %s", mPath.c_str(), libvlc_errmsg());
+  mLibvlcInstance = libvlc_new (opVect.size(), (const char* const*)mOptArgV);
+  if(mLibvlcInstance == NULL)
+    Fatal("Unable to create libvlc instance due to: %s", libvlc_errmsg());
+   
+  mLibvlcMedia = libvlc_media_new_location(mLibvlcInstance, mPath.c_str());
+  if(mLibvlcMedia == NULL)
+    Fatal("Unable to open input %s due to: %s", mPath.c_str(), libvlc_errmsg());
+  
+  mLibvlcMediaPlayer = libvlc_media_player_new_from_media(mLibvlcMedia);
+  if(mLibvlcMediaPlayer == NULL)
+    Fatal("Unable to create player for %s due to: %s", mPath.c_str(), libvlc_errmsg());
 
-	libvlc_video_set_format(mLibvlcMediaPlayer, mTargetChroma.c_str(), width, height, width * mBpp);
-    libvlc_video_set_callbacks(mLibvlcMediaPlayer, &LibvlcLockBuffer, &LibvlcUnlockBuffer, NULL, &mLibvlcData);
+  libvlc_video_set_format(mLibvlcMediaPlayer, mTargetChroma.c_str(), width, height, width * mBpp);
+  libvlc_video_set_callbacks(mLibvlcMediaPlayer, &LibvlcLockBuffer, &LibvlcUnlockBuffer, NULL, &mLibvlcData);
 
-    mLibvlcData.bufferSize = width * height * mBpp;
-    // Libvlc wants 32 byte alignment for images (should in theory do this for all image lines)
-    mLibvlcData.buffer = (uint8_t*)zm_mallocaligned(32, mLibvlcData.bufferSize);
-    mLibvlcData.prevBuffer = (uint8_t*)zm_mallocaligned(32, mLibvlcData.bufferSize);
-    
-    mLibvlcData.newImage.setValueImmediate(false);
+  mLibvlcData.bufferSize = width * height * mBpp;
+  // Libvlc wants 32 byte alignment for images (should in theory do this for all image lines)
+  mLibvlcData.buffer = (uint8_t*)zm_mallocaligned(32, mLibvlcData.bufferSize);
+  mLibvlcData.prevBuffer = (uint8_t*)zm_mallocaligned(32, mLibvlcData.bufferSize);
+  
+  mLibvlcData.newImage.setValueImmediate(false);
 
-    libvlc_media_player_play(mLibvlcMediaPlayer);
-    
-    return(0);
+  libvlc_media_player_play(mLibvlcMediaPlayer);
+  
+  return(0);
 }
 
 int LibvlcCamera::PreCapture()
-{    
-    return(0);
+{  
+  return(0);
 }
 
 // Should not return -1 as cancels capture. Always wait for image if available.
 int LibvlcCamera::Capture( Image &image )
 {   
-    while(!mLibvlcData.newImage.getValueImmediate())
-        mLibvlcData.newImage.getUpdatedValue(1);
+  while(!mLibvlcData.newImage.getValueImmediate())
+    mLibvlcData.newImage.getUpdatedValue(1);
 
-    mLibvlcData.mutex.lock();
-    image.Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
-    mLibvlcData.newImage.setValueImmediate(false);
-    mLibvlcData.mutex.unlock();
-    
-    return (0);
+  mLibvlcData.mutex.lock();
+  image.Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
+  mLibvlcData.newImage.setValueImmediate(false);
+  mLibvlcData.mutex.unlock();
+  
+  return (0);
 }
 
 // Should not return -1 as cancels capture. Always wait for image if available.
 int LibvlcCamera::CaptureAndRecord( Image &image, bool recording, char* event_directory )
 {
-    while(!mLibvlcData.newImage.getValueImmediate())
-        mLibvlcData.newImage.getUpdatedValue(1);
+  while(!mLibvlcData.newImage.getValueImmediate())
+    mLibvlcData.newImage.getUpdatedValue(1);
 
-    mLibvlcData.mutex.lock();
-    image.Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
-    mLibvlcData.newImage.setValueImmediate(false);
-    mLibvlcData.mutex.unlock();
+  mLibvlcData.mutex.lock();
+  image.Assign(width, height, colours, subpixelorder, mLibvlcData.buffer, width * height * mBpp);
+  mLibvlcData.newImage.setValueImmediate(false);
+  mLibvlcData.mutex.unlock();
 
-    return (0);
+  return (0);
 }
 
 int LibvlcCamera::PostCapture()
 {
-    return(0);
+  return(0);
 }
 
 #endif // HAVE_LIBVLC
diff --git a/src/zm_libvlc_camera.h b/src/zm_libvlc_camera.h
index 38e258c11..7c52a30cd 100644
--- a/src/zm_libvlc_camera.h
+++ b/src/zm_libvlc_camera.h
@@ -33,45 +33,45 @@
 // Used by libvlc callbacks
 struct LibvlcPrivateData
 {
-    uint8_t* buffer;
-    uint8_t* prevBuffer;
-    time_t prevTime;
-    uint32_t bufferSize;
-    Mutex mutex;
-    ThreadData<bool> newImage;
+  uint8_t* buffer;
+  uint8_t* prevBuffer;
+  time_t prevTime;
+  uint32_t bufferSize;
+  Mutex mutex;
+  ThreadData<bool> newImage;
 };
 
 class LibvlcCamera : public Camera
 {
 protected:
-    std::string mPath;
-    std::string mMethod;
-    std::string mOptions;
-    char **mOptArgV;
-	LibvlcPrivateData mLibvlcData;
-    std::string mTargetChroma;
-    uint8_t mBpp;
+  std::string mPath;
+  std::string mMethod;
+  std::string mOptions;
+  char **mOptArgV;
+  LibvlcPrivateData mLibvlcData;
+  std::string mTargetChroma;
+  uint8_t mBpp;
 
-    libvlc_instance_t *mLibvlcInstance;
-    libvlc_media_t *mLibvlcMedia;
-    libvlc_media_player_t *mLibvlcMediaPlayer;
+  libvlc_instance_t *mLibvlcInstance;
+  libvlc_media_t *mLibvlcMedia;
+  libvlc_media_player_t *mLibvlcMediaPlayer;
 
 public:
-	LibvlcCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	~LibvlcCamera();
+  LibvlcCamera( int p_id, const std::string &path, const std::string &p_method, const std::string &p_options, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  ~LibvlcCamera();
 
-    const std::string &Path() const { return( mPath ); }
-    const std::string &Options() const { return( mOptions ); }
-    const std::string &Method() const { return( mMethod ); }
+  const std::string &Path() const { return( mPath ); }
+  const std::string &Options() const { return( mOptions ); }
+  const std::string &Method() const { return( mMethod ); }
 
-	void Initialise();
-	void Terminate();
+  void Initialise();
+  void Terminate();
 
-	int PrimeCapture();
-	int PreCapture();
-	int Capture( Image &image );
-        int CaptureAndRecord( Image &image, bool recording, char* event_directory );
-	int PostCapture();
+  int PrimeCapture();
+  int PreCapture();
+  int Capture( Image &image );
+  int CaptureAndRecord( Image &image, bool recording, char* event_directory );
+  int PostCapture();
 };
 
 #endif // HAVE_LIBVLC
diff --git a/src/zm_local_camera.cpp b/src/zm_local_camera.cpp
index 022f35dbe..42774bd03 100644
--- a/src/zm_local_camera.cpp
+++ b/src/zm_local_camera.cpp
@@ -43,216 +43,216 @@ static unsigned int BigEndian;
 
 static int vidioctl( int fd, int request, void *arg )
 {
-    int result = -1;
-    do
-    {
-        result = ioctl( fd, request, arg );
-    } while ( result == -1 && errno == EINTR );
-    return( result );
+  int result = -1;
+  do
+  {
+    result = ioctl( fd, request, arg );
+  } while ( result == -1 && errno == EINTR );
+  return( result );
 }
 
 #if HAVE_LIBSWSCALE
 static _AVPIXELFORMAT getFfPixFormatFromV4lPalette( int v4l_version, int palette )
 {
-    _AVPIXELFORMAT pixFormat = AV_PIX_FMT_NONE;
-     
+  _AVPIXELFORMAT pixFormat = AV_PIX_FMT_NONE;
+   
 #if ZM_HAS_V4L2
-    if ( v4l_version == 2 )
+  if ( v4l_version == 2 )
+  {
+    switch( palette )
     {
-        switch( palette )
-        {
 #if defined(V4L2_PIX_FMT_RGB444) && defined(AV_PIX_FMT_RGB444)
-            case V4L2_PIX_FMT_RGB444 :
-                pixFormat = AV_PIX_FMT_RGB444;
-                break;
+      case V4L2_PIX_FMT_RGB444 :
+        pixFormat = AV_PIX_FMT_RGB444;
+        break;
 #endif // V4L2_PIX_FMT_RGB444
-            case V4L2_PIX_FMT_RGB555 :
-                pixFormat = AV_PIX_FMT_RGB555;
-                break;
-            case V4L2_PIX_FMT_RGB565 :
-                pixFormat = AV_PIX_FMT_RGB565;
-                break;
-            case V4L2_PIX_FMT_BGR24 :
-                pixFormat = AV_PIX_FMT_BGR24;
-                break;
-            case V4L2_PIX_FMT_RGB24 :
-                pixFormat = AV_PIX_FMT_RGB24;
-                break;
-            case V4L2_PIX_FMT_BGR32 :
-                pixFormat = AV_PIX_FMT_BGRA;
-                break;
-            case V4L2_PIX_FMT_RGB32 :
-                pixFormat = AV_PIX_FMT_ARGB;
-                break;
-            case V4L2_PIX_FMT_GREY :
-                pixFormat = AV_PIX_FMT_GRAY8;
-                break;
-            case V4L2_PIX_FMT_YUYV :
-                pixFormat = AV_PIX_FMT_YUYV422;
-                break;
-            case V4L2_PIX_FMT_YUV422P :
-                pixFormat = AV_PIX_FMT_YUV422P;
-                break;
-            case V4L2_PIX_FMT_YUV411P :
-                pixFormat = AV_PIX_FMT_YUV411P;
-                break;
+      case V4L2_PIX_FMT_RGB555 :
+        pixFormat = AV_PIX_FMT_RGB555;
+        break;
+      case V4L2_PIX_FMT_RGB565 :
+        pixFormat = AV_PIX_FMT_RGB565;
+        break;
+      case V4L2_PIX_FMT_BGR24 :
+        pixFormat = AV_PIX_FMT_BGR24;
+        break;
+      case V4L2_PIX_FMT_RGB24 :
+        pixFormat = AV_PIX_FMT_RGB24;
+        break;
+      case V4L2_PIX_FMT_BGR32 :
+        pixFormat = AV_PIX_FMT_BGRA;
+        break;
+      case V4L2_PIX_FMT_RGB32 :
+        pixFormat = AV_PIX_FMT_ARGB;
+        break;
+      case V4L2_PIX_FMT_GREY :
+        pixFormat = AV_PIX_FMT_GRAY8;
+        break;
+      case V4L2_PIX_FMT_YUYV :
+        pixFormat = AV_PIX_FMT_YUYV422;
+        break;
+      case V4L2_PIX_FMT_YUV422P :
+        pixFormat = AV_PIX_FMT_YUV422P;
+        break;
+      case V4L2_PIX_FMT_YUV411P :
+        pixFormat = AV_PIX_FMT_YUV411P;
+        break;
 #ifdef V4L2_PIX_FMT_YUV444
-            case V4L2_PIX_FMT_YUV444 :
-                pixFormat = AV_PIX_FMT_YUV444P;
-                break;
+      case V4L2_PIX_FMT_YUV444 :
+        pixFormat = AV_PIX_FMT_YUV444P;
+        break;
 #endif // V4L2_PIX_FMT_YUV444
-            case V4L2_PIX_FMT_YUV410 :
-                pixFormat = AV_PIX_FMT_YUV410P;
-                break;
-            case V4L2_PIX_FMT_YUV420 :
-                pixFormat = AV_PIX_FMT_YUV420P;
-                break;
-            case V4L2_PIX_FMT_JPEG :
-            case V4L2_PIX_FMT_MJPEG :
-                pixFormat = AV_PIX_FMT_YUVJ444P;
-                break;
-            case V4L2_PIX_FMT_UYVY :
-                pixFormat = AV_PIX_FMT_UYVY422;
-                break;
-            // These don't seem to have ffmpeg equivalents
-            // See if you can match any of the ones in the default clause below!?
-            case V4L2_PIX_FMT_RGB332 :
-            case V4L2_PIX_FMT_RGB555X :
-            case V4L2_PIX_FMT_RGB565X :
-            //case V4L2_PIX_FMT_Y16 :
-            //case V4L2_PIX_FMT_PAL8 :
-            case V4L2_PIX_FMT_YVU410 :
-            case V4L2_PIX_FMT_YVU420 :
-            case V4L2_PIX_FMT_Y41P :
-            //case V4L2_PIX_FMT_YUV555 :
-            //case V4L2_PIX_FMT_YUV565 :
-            //case V4L2_PIX_FMT_YUV32 :
-            case V4L2_PIX_FMT_NV12 :
-            case V4L2_PIX_FMT_NV21 :
-            case V4L2_PIX_FMT_YYUV :
-            case V4L2_PIX_FMT_HI240 :
-            case V4L2_PIX_FMT_HM12 :
-            //case V4L2_PIX_FMT_SBGGR8 :
-            //case V4L2_PIX_FMT_SGBRG8 :
-            //case V4L2_PIX_FMT_SBGGR16 :
-            case V4L2_PIX_FMT_DV :
-            case V4L2_PIX_FMT_MPEG :
-            case V4L2_PIX_FMT_WNVA :
-            case V4L2_PIX_FMT_SN9C10X :
-            case V4L2_PIX_FMT_PWC1 :
-            case V4L2_PIX_FMT_PWC2 :
-            case V4L2_PIX_FMT_ET61X251 :
-            //case V4L2_PIX_FMT_SPCA501 :
-            //case V4L2_PIX_FMT_SPCA505 :
-            //case V4L2_PIX_FMT_SPCA508 :
-            //case V4L2_PIX_FMT_SPCA561 :
-            //case V4L2_PIX_FMT_PAC207 :
-            //case V4L2_PIX_FMT_PJPG :
-            //case V4L2_PIX_FMT_YVYU :
-            default :
-            {
-                Fatal( "Can't find swscale format for palette %d", palette );
-                break;
-                // These are all spare and may match some of the above
-                pixFormat = AV_PIX_FMT_YUVJ420P;
-                pixFormat = AV_PIX_FMT_YUVJ422P;
-                pixFormat = AV_PIX_FMT_UYVY422;
-                pixFormat = AV_PIX_FMT_UYYVYY411;
-                pixFormat = AV_PIX_FMT_BGR565;
-                pixFormat = AV_PIX_FMT_BGR555;
-                pixFormat = AV_PIX_FMT_BGR8;
-                pixFormat = AV_PIX_FMT_BGR4;
-                pixFormat = AV_PIX_FMT_BGR4_BYTE;
-                pixFormat = AV_PIX_FMT_RGB8;
-                pixFormat = AV_PIX_FMT_RGB4;
-                pixFormat = AV_PIX_FMT_RGB4_BYTE;
-                pixFormat = AV_PIX_FMT_NV12;
-                pixFormat = AV_PIX_FMT_NV21;
-                pixFormat = AV_PIX_FMT_RGB32_1;
-                pixFormat = AV_PIX_FMT_BGR32_1;
-                pixFormat = AV_PIX_FMT_GRAY16BE;
-                pixFormat = AV_PIX_FMT_GRAY16LE;
-                pixFormat = AV_PIX_FMT_YUV440P;
-                pixFormat = AV_PIX_FMT_YUVJ440P;
-                pixFormat = AV_PIX_FMT_YUVA420P;
-                //pixFormat = AV_PIX_FMT_VDPAU_H264;
-                //pixFormat = AV_PIX_FMT_VDPAU_MPEG1;
-                //pixFormat = AV_PIX_FMT_VDPAU_MPEG2;
-            }
-        }
+      case V4L2_PIX_FMT_YUV410 :
+        pixFormat = AV_PIX_FMT_YUV410P;
+        break;
+      case V4L2_PIX_FMT_YUV420 :
+        pixFormat = AV_PIX_FMT_YUV420P;
+        break;
+      case V4L2_PIX_FMT_JPEG :
+      case V4L2_PIX_FMT_MJPEG :
+        pixFormat = AV_PIX_FMT_YUVJ444P;
+        break;
+      case V4L2_PIX_FMT_UYVY :
+        pixFormat = AV_PIX_FMT_UYVY422;
+        break;
+      // These don't seem to have ffmpeg equivalents
+      // See if you can match any of the ones in the default clause below!?
+      case V4L2_PIX_FMT_RGB332 :
+      case V4L2_PIX_FMT_RGB555X :
+      case V4L2_PIX_FMT_RGB565X :
+      //case V4L2_PIX_FMT_Y16 :
+      //case V4L2_PIX_FMT_PAL8 :
+      case V4L2_PIX_FMT_YVU410 :
+      case V4L2_PIX_FMT_YVU420 :
+      case V4L2_PIX_FMT_Y41P :
+      //case V4L2_PIX_FMT_YUV555 :
+      //case V4L2_PIX_FMT_YUV565 :
+      //case V4L2_PIX_FMT_YUV32 :
+      case V4L2_PIX_FMT_NV12 :
+      case V4L2_PIX_FMT_NV21 :
+      case V4L2_PIX_FMT_YYUV :
+      case V4L2_PIX_FMT_HI240 :
+      case V4L2_PIX_FMT_HM12 :
+      //case V4L2_PIX_FMT_SBGGR8 :
+      //case V4L2_PIX_FMT_SGBRG8 :
+      //case V4L2_PIX_FMT_SBGGR16 :
+      case V4L2_PIX_FMT_DV :
+      case V4L2_PIX_FMT_MPEG :
+      case V4L2_PIX_FMT_WNVA :
+      case V4L2_PIX_FMT_SN9C10X :
+      case V4L2_PIX_FMT_PWC1 :
+      case V4L2_PIX_FMT_PWC2 :
+      case V4L2_PIX_FMT_ET61X251 :
+      //case V4L2_PIX_FMT_SPCA501 :
+      //case V4L2_PIX_FMT_SPCA505 :
+      //case V4L2_PIX_FMT_SPCA508 :
+      //case V4L2_PIX_FMT_SPCA561 :
+      //case V4L2_PIX_FMT_PAC207 :
+      //case V4L2_PIX_FMT_PJPG :
+      //case V4L2_PIX_FMT_YVYU :
+      default :
+      {
+        Fatal( "Can't find swscale format for palette %d", palette );
+        break;
+        // These are all spare and may match some of the above
+        pixFormat = AV_PIX_FMT_YUVJ420P;
+        pixFormat = AV_PIX_FMT_YUVJ422P;
+        pixFormat = AV_PIX_FMT_UYVY422;
+        pixFormat = AV_PIX_FMT_UYYVYY411;
+        pixFormat = AV_PIX_FMT_BGR565;
+        pixFormat = AV_PIX_FMT_BGR555;
+        pixFormat = AV_PIX_FMT_BGR8;
+        pixFormat = AV_PIX_FMT_BGR4;
+        pixFormat = AV_PIX_FMT_BGR4_BYTE;
+        pixFormat = AV_PIX_FMT_RGB8;
+        pixFormat = AV_PIX_FMT_RGB4;
+        pixFormat = AV_PIX_FMT_RGB4_BYTE;
+        pixFormat = AV_PIX_FMT_NV12;
+        pixFormat = AV_PIX_FMT_NV21;
+        pixFormat = AV_PIX_FMT_RGB32_1;
+        pixFormat = AV_PIX_FMT_BGR32_1;
+        pixFormat = AV_PIX_FMT_GRAY16BE;
+        pixFormat = AV_PIX_FMT_GRAY16LE;
+        pixFormat = AV_PIX_FMT_YUV440P;
+        pixFormat = AV_PIX_FMT_YUVJ440P;
+        pixFormat = AV_PIX_FMT_YUVA420P;
+        //pixFormat = AV_PIX_FMT_VDPAU_H264;
+        //pixFormat = AV_PIX_FMT_VDPAU_MPEG1;
+        //pixFormat = AV_PIX_FMT_VDPAU_MPEG2;
+      }
     }
+  }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
+  if ( v4l_version == 1 )
+  {
+    switch( palette )
     {
-        switch( palette )
-        {
-            case VIDEO_PALETTE_RGB32 :
-		if(BigEndian)
-			pixFormat = AV_PIX_FMT_ARGB;
-		else
-			pixFormat = AV_PIX_FMT_BGRA;
-		break;
-            case VIDEO_PALETTE_RGB24 :
-		if(BigEndian)
-			pixFormat = AV_PIX_FMT_RGB24;
-		else
-			pixFormat = AV_PIX_FMT_BGR24;
-		break;
-            case VIDEO_PALETTE_GREY :
-                pixFormat = AV_PIX_FMT_GRAY8;
-                break;
-            case VIDEO_PALETTE_RGB555 :
-                pixFormat = AV_PIX_FMT_RGB555;
-                break;
-            case VIDEO_PALETTE_RGB565 :
-                pixFormat = AV_PIX_FMT_RGB565;
-                break;
-            case VIDEO_PALETTE_YUYV :
-            case VIDEO_PALETTE_YUV422 :
-                pixFormat = AV_PIX_FMT_YUYV422;
-                break;
-            case VIDEO_PALETTE_YUV422P :
-                pixFormat = AV_PIX_FMT_YUV422P;
-                break;
-            case VIDEO_PALETTE_YUV420P :
-                pixFormat = AV_PIX_FMT_YUV420P;
-                break;
-            default :
-            {
-                Fatal( "Can't find swscale format for palette %d", palette );
-                break;
-                // These are all spare and may match some of the above
-                pixFormat = AV_PIX_FMT_YUVJ420P;
-                pixFormat = AV_PIX_FMT_YUVJ422P;
-                pixFormat = AV_PIX_FMT_YUVJ444P;
-                pixFormat = AV_PIX_FMT_UYVY422;
-                pixFormat = AV_PIX_FMT_UYYVYY411;
-                pixFormat = AV_PIX_FMT_BGR565;
-                pixFormat = AV_PIX_FMT_BGR555;
-                pixFormat = AV_PIX_FMT_BGR8;
-                pixFormat = AV_PIX_FMT_BGR4;
-                pixFormat = AV_PIX_FMT_BGR4_BYTE;
-                pixFormat = AV_PIX_FMT_RGB8;
-                pixFormat = AV_PIX_FMT_RGB4;
-                pixFormat = AV_PIX_FMT_RGB4_BYTE;
-                pixFormat = AV_PIX_FMT_NV12;
-                pixFormat = AV_PIX_FMT_NV21;
-                pixFormat = AV_PIX_FMT_RGB32_1;
-                pixFormat = AV_PIX_FMT_BGR32_1;
-                pixFormat = AV_PIX_FMT_GRAY16BE;
-                pixFormat = AV_PIX_FMT_GRAY16LE;
-                pixFormat = AV_PIX_FMT_YUV440P;
-                pixFormat = AV_PIX_FMT_YUVJ440P;
-                pixFormat = AV_PIX_FMT_YUVA420P;
-                //pixFormat = AV_PIX_FMT_VDPAU_H264;
-                //pixFormat = AV_PIX_FMT_VDPAU_MPEG1;
-                //pixFormat = AV_PIX_FMT_VDPAU_MPEG2;
-            }
-        }
+      case VIDEO_PALETTE_RGB32 :
+    if(BigEndian)
+      pixFormat = AV_PIX_FMT_ARGB;
+    else
+      pixFormat = AV_PIX_FMT_BGRA;
+    break;
+      case VIDEO_PALETTE_RGB24 :
+    if(BigEndian)
+      pixFormat = AV_PIX_FMT_RGB24;
+    else
+      pixFormat = AV_PIX_FMT_BGR24;
+    break;
+      case VIDEO_PALETTE_GREY :
+        pixFormat = AV_PIX_FMT_GRAY8;
+        break;
+      case VIDEO_PALETTE_RGB555 :
+        pixFormat = AV_PIX_FMT_RGB555;
+        break;
+      case VIDEO_PALETTE_RGB565 :
+        pixFormat = AV_PIX_FMT_RGB565;
+        break;
+      case VIDEO_PALETTE_YUYV :
+      case VIDEO_PALETTE_YUV422 :
+        pixFormat = AV_PIX_FMT_YUYV422;
+        break;
+      case VIDEO_PALETTE_YUV422P :
+        pixFormat = AV_PIX_FMT_YUV422P;
+        break;
+      case VIDEO_PALETTE_YUV420P :
+        pixFormat = AV_PIX_FMT_YUV420P;
+        break;
+      default :
+      {
+        Fatal( "Can't find swscale format for palette %d", palette );
+        break;
+        // These are all spare and may match some of the above
+        pixFormat = AV_PIX_FMT_YUVJ420P;
+        pixFormat = AV_PIX_FMT_YUVJ422P;
+        pixFormat = AV_PIX_FMT_YUVJ444P;
+        pixFormat = AV_PIX_FMT_UYVY422;
+        pixFormat = AV_PIX_FMT_UYYVYY411;
+        pixFormat = AV_PIX_FMT_BGR565;
+        pixFormat = AV_PIX_FMT_BGR555;
+        pixFormat = AV_PIX_FMT_BGR8;
+        pixFormat = AV_PIX_FMT_BGR4;
+        pixFormat = AV_PIX_FMT_BGR4_BYTE;
+        pixFormat = AV_PIX_FMT_RGB8;
+        pixFormat = AV_PIX_FMT_RGB4;
+        pixFormat = AV_PIX_FMT_RGB4_BYTE;
+        pixFormat = AV_PIX_FMT_NV12;
+        pixFormat = AV_PIX_FMT_NV21;
+        pixFormat = AV_PIX_FMT_RGB32_1;
+        pixFormat = AV_PIX_FMT_BGR32_1;
+        pixFormat = AV_PIX_FMT_GRAY16BE;
+        pixFormat = AV_PIX_FMT_GRAY16LE;
+        pixFormat = AV_PIX_FMT_YUV440P;
+        pixFormat = AV_PIX_FMT_YUVJ440P;
+        pixFormat = AV_PIX_FMT_YUVA420P;
+        //pixFormat = AV_PIX_FMT_VDPAU_H264;
+        //pixFormat = AV_PIX_FMT_VDPAU_MPEG1;
+        //pixFormat = AV_PIX_FMT_VDPAU_MPEG2;
+      }
     }
+  }
 #endif // ZM_HAS_V4L1
-    return( pixFormat );
+  return( pixFormat );
 }
 #endif // HAVE_LIBSWSCALE
 
@@ -286,1936 +286,1954 @@ AVFrame **LocalCamera::capturePictures = 0;
 
 LocalCamera *LocalCamera::last_camera = NULL;
 
-LocalCamera::LocalCamera( int p_id, const std::string &p_device, int p_channel, int p_standard, bool p_v4l_multi_buffer, unsigned int p_v4l_captures_per_frame, const std::string &p_method, int p_width, int p_height, int p_colours, int p_palette, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, unsigned int p_extras) :
-    Camera( p_id, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
-    device( p_device ),
-    channel( p_channel ),
-    standard( p_standard ),
-    palette( p_palette ),
-    channel_index( 0 ),
-    extras ( p_extras )
+LocalCamera::LocalCamera(
+  int p_id,
+  const std::string &p_device,
+  int p_channel,
+  int p_standard,
+  bool p_v4l_multi_buffer,
+  unsigned int p_v4l_captures_per_frame,
+  const std::string &p_method,
+  int p_width,
+  int p_height,
+  int p_colours,
+  int p_palette,
+  int p_brightness,
+  int p_contrast,
+  int p_hue,
+  int p_colour,
+  bool p_capture,
+	bool p_record_audio,
+  unsigned int p_extras) :
+    Camera( p_id, LOCAL_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+  device( p_device ),
+  channel( p_channel ),
+  standard( p_standard ),
+  palette( p_palette ),
+  channel_index( 0 ),
+  extras ( p_extras )
 {
-    // If we are the first, or only, input on this device then
-    // do the initial opening etc
-    device_prime = (camera_count++ == 0);
-    v4l_version = (p_method=="v4l2"?2:1);
-	v4l_multi_buffer = p_v4l_multi_buffer;
-	v4l_captures_per_frame = p_v4l_captures_per_frame;
-    
-    if ( capture )
+  // If we are the first, or only, input on this device then
+  // do the initial opening etc
+  device_prime = (camera_count++ == 0);
+  v4l_version = (p_method=="v4l2"?2:1);
+  v4l_multi_buffer = p_v4l_multi_buffer;
+  v4l_captures_per_frame = p_v4l_captures_per_frame;
+  
+  if ( capture )
+  {
+    if ( device_prime )
     {
-        if ( device_prime )
-        {
-            Debug( 2, "V4L support enabled, using V4L%d api", v4l_version );
-        }
+      Debug( 2, "V4L support enabled, using V4L%d api", v4l_version );
+    }
 
-        if ( !last_camera || channel != last_camera->channel )
-        {
-            // We are the first, or only, input that uses this channel
-            channel_prime = true;
-            channel_index = channel_count++;
-            channels[channel_index] = channel;
-            standards[channel_index] = standard;
-        }
-        else
-        {
-            // We are the second, or subsequent, input using this channel
-            channel_prime = false;
-        }
-        
+    if ( !last_camera || channel != last_camera->channel )
+    {
+      // We are the first, or only, input that uses this channel
+      channel_prime = true;
+      channel_index = channel_count++;
+      channels[channel_index] = channel;
+      standards[channel_index] = standard;
+    }
+    else
+    {
+      // We are the second, or subsequent, input using this channel
+      channel_prime = false;
     }
     
-	/* The V4L1 API doesn't care about endianness, we need to check the endianness of the machine */
-	uint32_t checkval = 0xAABBCCDD;
-	if(*(unsigned char*)&checkval == 0xDD) {
-		BigEndian = 0;
-		Debug(2,"little-endian processor detected");
-	} else if(*(unsigned char*)&checkval == 0xAA) {
-		BigEndian = 1;
-		Debug(2,"Big-endian processor detected");
-	} else {
-		Error("Unable to detect the processor's endianness. Assuming little-endian.");
-		BigEndian = 0;
-	}   
-	
+  }
+  
+  /* The V4L1 API doesn't care about endianness, we need to check the endianness of the machine */
+  uint32_t checkval = 0xAABBCCDD;
+  if(*(unsigned char*)&checkval == 0xDD) {
+    BigEndian = 0;
+    Debug(2,"little-endian processor detected");
+  } else if(*(unsigned char*)&checkval == 0xAA) {
+    BigEndian = 1;
+    Debug(2,"Big-endian processor detected");
+  } else {
+    Error("Unable to detect the processor's endianness. Assuming little-endian.");
+    BigEndian = 0;
+  }   
+  
 #if ZM_HAS_V4L2
-	if( v4l_version == 2 && palette == 0 ) {
-		/* Use automatic format selection */
-		Debug(2,"Using automatic format selection");
-		palette = AutoSelectFormat(colours);
-		if(palette == 0) {
-			Error("Automatic format selection failed. Falling back to YUYV");
-			palette = V4L2_PIX_FMT_YUYV;
-		} else {
-			if(capture) {
-				Info("Selected capture palette: %s (%c%c%c%c)", palette_desc, palette&0xff, (palette>>8)&0xff, (palette>>16)&0xff, (palette>>24)&0xff);
-			}
-		}
-	}
+  if( v4l_version == 2 && palette == 0 ) {
+    /* Use automatic format selection */
+    Debug(2,"Using automatic format selection");
+    palette = AutoSelectFormat(colours);
+    if(palette == 0) {
+      Error("Automatic format selection failed. Falling back to YUYV");
+      palette = V4L2_PIX_FMT_YUYV;
+    } else {
+      if(capture) {
+        Info("Selected capture palette: %s (%c%c%c%c)", palette_desc, palette&0xff, (palette>>8)&0xff, (palette>>16)&0xff, (palette>>24)&0xff);
+      }
+    }
+  }
 #endif
-	
-	if( capture ) {
-		if ( last_camera ) {
-			if ( (p_method == "v4l2" && v4l_version != 2) || (p_method == "v4l1" && v4l_version != 1) ) 
-				Fatal( "Different Video For Linux version used for monitors sharing same device" );
-			
-			if ( standard != last_camera->standard )
-				Warning( "Different video standards defined for monitors sharing same device, results may be unpredictable or completely wrong" );
-			
-			if ( palette != last_camera->palette )
-				Warning( "Different video palettes defined for monitors sharing same device, results may be unpredictable or completely wrong" );
-			
-			if ( width != last_camera->width || height != last_camera->height )
-				Warning( "Different capture sizes defined for monitors sharing same device, results may be unpredictable or completely wrong" );
-		}
-	
+  
+  if( capture ) {
+    if ( last_camera ) {
+      if ( (p_method == "v4l2" && v4l_version != 2) || (p_method == "v4l1" && v4l_version != 1) ) 
+        Fatal( "Different Video For Linux version used for monitors sharing same device" );
+      
+      if ( standard != last_camera->standard )
+        Warning( "Different video standards defined for monitors sharing same device, results may be unpredictable or completely wrong" );
+      
+      if ( palette != last_camera->palette )
+        Warning( "Different video palettes defined for monitors sharing same device, results may be unpredictable or completely wrong" );
+      
+      if ( width != last_camera->width || height != last_camera->height )
+        Warning( "Different capture sizes defined for monitors sharing same device, results may be unpredictable or completely wrong" );
+    }
+  
 #if HAVE_LIBSWSCALE
-		/* Get ffmpeg pixel format based on capture palette and endianness */
-		capturePixFormat = getFfPixFormatFromV4lPalette( v4l_version, palette );
-		imagePixFormat = AV_PIX_FMT_NONE;
+    /* Get ffmpeg pixel format based on capture palette and endianness */
+    capturePixFormat = getFfPixFormatFromV4lPalette( v4l_version, palette );
+    imagePixFormat = AV_PIX_FMT_NONE;
 #endif // HAVE_LIBSWSCALE   
-	}
+  }
 
-	/* V4L2 format matching */
+  /* V4L2 format matching */
 #if ZM_HAS_V4L2
-	if ( v4l_version == 2 ) {
-		/* Try to find a match for the selected palette and target colourspace */
-		
-		/* RGB32 palette and 32bit target colourspace */
-		if(palette == V4L2_PIX_FMT_RGB32 && colours == ZM_COLOUR_RGB32) {
-			conversion_type = 0;
-			subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-			
-		/* BGR32 palette and 32bit target colourspace */
-		} else if(palette == V4L2_PIX_FMT_BGR32 && colours == ZM_COLOUR_RGB32) {
-			conversion_type = 0;
-			subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-			
-		/* RGB24 palette and 24bit target colourspace */
-		} else if(palette == V4L2_PIX_FMT_RGB24 && colours == ZM_COLOUR_RGB24) {
-			conversion_type = 0;
-			subpixelorder = ZM_SUBPIX_ORDER_RGB;
-			
-		/* BGR24 palette and 24bit target colourspace */
-		} else if(palette == V4L2_PIX_FMT_BGR24 && colours == ZM_COLOUR_RGB24) {
-			conversion_type = 0;
-			subpixelorder = ZM_SUBPIX_ORDER_BGR;
-			
-		/* Grayscale palette and grayscale target colourspace */
-		} else if(palette == V4L2_PIX_FMT_GREY && colours == ZM_COLOUR_GRAY8) {
-			conversion_type = 0;
-			subpixelorder = ZM_SUBPIX_ORDER_NONE;
-		/* Unable to find a solution for the selected palette and target colourspace. Conversion required. Notify the user of performance penalty */
-		} else {
-			if( capture )
+  if ( v4l_version == 2 ) {
+    /* Try to find a match for the selected palette and target colourspace */
+    
+    /* RGB32 palette and 32bit target colourspace */
+    if(palette == V4L2_PIX_FMT_RGB32 && colours == ZM_COLOUR_RGB32) {
+      conversion_type = 0;
+      subpixelorder = ZM_SUBPIX_ORDER_ARGB;
+      
+    /* BGR32 palette and 32bit target colourspace */
+    } else if(palette == V4L2_PIX_FMT_BGR32 && colours == ZM_COLOUR_RGB32) {
+      conversion_type = 0;
+      subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+      
+    /* RGB24 palette and 24bit target colourspace */
+    } else if(palette == V4L2_PIX_FMT_RGB24 && colours == ZM_COLOUR_RGB24) {
+      conversion_type = 0;
+      subpixelorder = ZM_SUBPIX_ORDER_RGB;
+      
+    /* BGR24 palette and 24bit target colourspace */
+    } else if(palette == V4L2_PIX_FMT_BGR24 && colours == ZM_COLOUR_RGB24) {
+      conversion_type = 0;
+      subpixelorder = ZM_SUBPIX_ORDER_BGR;
+      
+    /* Grayscale palette and grayscale target colourspace */
+    } else if(palette == V4L2_PIX_FMT_GREY && colours == ZM_COLOUR_GRAY8) {
+      conversion_type = 0;
+      subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    /* Unable to find a solution for the selected palette and target colourspace. Conversion required. Notify the user of performance penalty */
+    } else {
+      if( capture )
 #if HAVE_LIBSWSCALE
-				Info("No direct match for the selected palette (%c%c%c%c) and target colorspace (%d). Format conversion is required, performance penalty expected", (capturePixFormat)&0xff,((capturePixFormat>>8)&0xff),((capturePixFormat>>16)&0xff),((capturePixFormat>>24)&0xff), colours );
+        Info("No direct match for the selected palette (%c%c%c%c) and target colorspace (%d). Format conversion is required, performance penalty expected", (capturePixFormat)&0xff,((capturePixFormat>>8)&0xff),((capturePixFormat>>16)&0xff),((capturePixFormat>>24)&0xff), colours );
 #else
-				Info("No direct match for the selected palette and target colorspace. Format conversion is required, performance penalty expected");
+        Info("No direct match for the selected palette and target colorspace. Format conversion is required, performance penalty expected");
 #endif
 #if HAVE_LIBSWSCALE
-			/* Try using swscale for the conversion */
-			conversion_type = 1; 
-			Debug(2,"Using swscale for image conversion");
-			if(colours == ZM_COLOUR_RGB32) {
-				subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				imagePixFormat = AV_PIX_FMT_RGBA;
-			} else if(colours == ZM_COLOUR_RGB24) {
-				subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				imagePixFormat = AV_PIX_FMT_RGB24;
-			} else if(colours == ZM_COLOUR_GRAY8) {
-				subpixelorder = ZM_SUBPIX_ORDER_NONE;
-				imagePixFormat = AV_PIX_FMT_GRAY8;
-			} else {
-				Panic("Unexpected colours: %d",colours);
-			}
-			if( capture ) {
+      /* Try using swscale for the conversion */
+      conversion_type = 1; 
+      Debug(2,"Using swscale for image conversion");
+      if(colours == ZM_COLOUR_RGB32) {
+        subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        imagePixFormat = AV_PIX_FMT_RGBA;
+      } else if(colours == ZM_COLOUR_RGB24) {
+        subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        imagePixFormat = AV_PIX_FMT_RGB24;
+      } else if(colours == ZM_COLOUR_GRAY8) {
+        subpixelorder = ZM_SUBPIX_ORDER_NONE;
+        imagePixFormat = AV_PIX_FMT_GRAY8;
+      } else {
+        Panic("Unexpected colours: %d",colours);
+      }
+      if( capture ) {
 #if LIBSWSCALE_VERSION_CHECK(0, 8, 0, 8, 0)
-				if(!sws_isSupportedInput(capturePixFormat)) {
-					Error("swscale does not support the used capture format: %c%c%c%c",(capturePixFormat)&0xff,((capturePixFormat>>8)&0xff),((capturePixFormat>>16)&0xff),((capturePixFormat>>24)&0xff));
-					conversion_type = 2; /* Try ZM format conversions */
-				}
-				if(!sws_isSupportedOutput(imagePixFormat)) {
-					Error("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
-					conversion_type = 2; /* Try ZM format conversions */
-				}
+        if(!sws_isSupportedInput(capturePixFormat)) {
+          Error("swscale does not support the used capture format: %c%c%c%c",(capturePixFormat)&0xff,((capturePixFormat>>8)&0xff),((capturePixFormat>>16)&0xff),((capturePixFormat>>24)&0xff));
+          conversion_type = 2; /* Try ZM format conversions */
+        }
+        if(!sws_isSupportedOutput(imagePixFormat)) {
+          Error("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
+          conversion_type = 2; /* Try ZM format conversions */
+        }
 #endif
-			}
+      }
 #else
-			/* Don't have swscale, see what we can do */
-			conversion_type = 2;
+      /* Don't have swscale, see what we can do */
+      conversion_type = 2;
 #endif
-			/* Our YUYV->Grayscale conversion is a lot faster than swscale's */
-			if(colours == ZM_COLOUR_GRAY8 && palette == V4L2_PIX_FMT_YUYV) {
-				conversion_type = 2;
-			}
-			
-			/* JPEG */
-			if(palette == V4L2_PIX_FMT_JPEG || palette == V4L2_PIX_FMT_MJPEG) {
-				Debug(2,"Using JPEG image decoding");
-				conversion_type = 3;
-			}
-			
-			if(conversion_type == 2) {
-				Debug(2,"Using ZM for image conversion");
-				if(palette == V4L2_PIX_FMT_RGB32 && colours == ZM_COLOUR_GRAY8) {
-					conversion_fptr = &std_convert_argb_gray8;
-					subpixelorder = ZM_SUBPIX_ORDER_NONE;
-				} else if(palette == V4L2_PIX_FMT_BGR32 && colours == ZM_COLOUR_GRAY8) {
-					conversion_fptr = &std_convert_bgra_gray8;
-					subpixelorder = ZM_SUBPIX_ORDER_NONE;
-				} else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_GRAY8) {
-					/* Fast YUYV->Grayscale conversion by extracting the Y channel */
-					if(config.cpu_extensions && sseversion >= 35) {
-						conversion_fptr = &ssse3_convert_yuyv_gray8;
-						Debug(2,"Using SSSE3 YUYV->grayscale fast conversion");
-					} else {
-						conversion_fptr = &std_convert_yuyv_gray8;
-						Debug(2,"Using standard YUYV->grayscale fast conversion");
-					}
-					subpixelorder = ZM_SUBPIX_ORDER_NONE;
-				} else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_RGB24) {
-					conversion_fptr = &zm_convert_yuyv_rgb;
-					subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				} else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_RGB32) {
-					conversion_fptr = &zm_convert_yuyv_rgba;
-					subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				} else if(palette == V4L2_PIX_FMT_RGB555 && colours == ZM_COLOUR_RGB24) {
-					conversion_fptr = &zm_convert_rgb555_rgb;
-					subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				} else if(palette == V4L2_PIX_FMT_RGB555 && colours == ZM_COLOUR_RGB32) {
-					conversion_fptr = &zm_convert_rgb555_rgba;
-					subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				} else if(palette == V4L2_PIX_FMT_RGB565 && colours == ZM_COLOUR_RGB24) {
-					conversion_fptr = &zm_convert_rgb565_rgb;
-					subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				} else if(palette == V4L2_PIX_FMT_RGB565 && colours == ZM_COLOUR_RGB32) {
-					conversion_fptr = &zm_convert_rgb565_rgba;
-					subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				} else {
-					Fatal("Unable to find a suitable format conversion for the selected palette and target colorspace.");
-				}
-			}
-		}
-	}
+      /* Our YUYV->Grayscale conversion is a lot faster than swscale's */
+      if(colours == ZM_COLOUR_GRAY8 && palette == V4L2_PIX_FMT_YUYV) {
+        conversion_type = 2;
+      }
+      
+      /* JPEG */
+      if(palette == V4L2_PIX_FMT_JPEG || palette == V4L2_PIX_FMT_MJPEG) {
+        Debug(2,"Using JPEG image decoding");
+        conversion_type = 3;
+      }
+      
+      if(conversion_type == 2) {
+        Debug(2,"Using ZM for image conversion");
+        if(palette == V4L2_PIX_FMT_RGB32 && colours == ZM_COLOUR_GRAY8) {
+          conversion_fptr = &std_convert_argb_gray8;
+          subpixelorder = ZM_SUBPIX_ORDER_NONE;
+        } else if(palette == V4L2_PIX_FMT_BGR32 && colours == ZM_COLOUR_GRAY8) {
+          conversion_fptr = &std_convert_bgra_gray8;
+          subpixelorder = ZM_SUBPIX_ORDER_NONE;
+        } else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_GRAY8) {
+          /* Fast YUYV->Grayscale conversion by extracting the Y channel */
+          if(config.cpu_extensions && sseversion >= 35) {
+            conversion_fptr = &ssse3_convert_yuyv_gray8;
+            Debug(2,"Using SSSE3 YUYV->grayscale fast conversion");
+          } else {
+            conversion_fptr = &std_convert_yuyv_gray8;
+            Debug(2,"Using standard YUYV->grayscale fast conversion");
+          }
+          subpixelorder = ZM_SUBPIX_ORDER_NONE;
+        } else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_RGB24) {
+          conversion_fptr = &zm_convert_yuyv_rgb;
+          subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        } else if(palette == V4L2_PIX_FMT_YUYV && colours == ZM_COLOUR_RGB32) {
+          conversion_fptr = &zm_convert_yuyv_rgba;
+          subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        } else if(palette == V4L2_PIX_FMT_RGB555 && colours == ZM_COLOUR_RGB24) {
+          conversion_fptr = &zm_convert_rgb555_rgb;
+          subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        } else if(palette == V4L2_PIX_FMT_RGB555 && colours == ZM_COLOUR_RGB32) {
+          conversion_fptr = &zm_convert_rgb555_rgba;
+          subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        } else if(palette == V4L2_PIX_FMT_RGB565 && colours == ZM_COLOUR_RGB24) {
+          conversion_fptr = &zm_convert_rgb565_rgb;
+          subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        } else if(palette == V4L2_PIX_FMT_RGB565 && colours == ZM_COLOUR_RGB32) {
+          conversion_fptr = &zm_convert_rgb565_rgba;
+          subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        } else {
+          Fatal("Unable to find a suitable format conversion for the selected palette and target colorspace.");
+        }
+      }
+    }
+  }
 #endif // ZM_HAS_V4L2
 
-	  /* V4L1 format matching */
+    /* V4L1 format matching */
 #if ZM_HAS_V4L1
-	if ( v4l_version == 1) {
-		/* Try to find a match for the selected palette and target colourspace */
-		
-		/* RGB32 palette and 32bit target colourspace */
-		if(palette == VIDEO_PALETTE_RGB32 && colours == ZM_COLOUR_RGB32) {
-			conversion_type = 0;
-			if(BigEndian) {
-				subpixelorder = ZM_SUBPIX_ORDER_ARGB;
-			} else {
-				subpixelorder = ZM_SUBPIX_ORDER_BGRA;
-			}
-			
-		/* RGB24 palette and 24bit target colourspace */
-		} else if(palette == VIDEO_PALETTE_RGB24 && colours == ZM_COLOUR_RGB24) {
-			conversion_type = 0;
-			if(BigEndian) {
-				subpixelorder = ZM_SUBPIX_ORDER_RGB;
-			} else {
-				subpixelorder = ZM_SUBPIX_ORDER_BGR;
-			}
-			
-		/* Grayscale palette and grayscale target colourspace */
-		} else if(palette == VIDEO_PALETTE_GREY && colours == ZM_COLOUR_GRAY8) {
-			conversion_type = 0;
-			subpixelorder = ZM_SUBPIX_ORDER_NONE;
-		/* Unable to find a solution for the selected palette and target colourspace. Conversion required. Notify the user of performance penalty */
-		} else {
-			if( capture )
-				Info("No direct match for the selected palette and target colorspace. Format conversion is required, performance penalty expected");
+  if ( v4l_version == 1) {
+    /* Try to find a match for the selected palette and target colourspace */
+    
+    /* RGB32 palette and 32bit target colourspace */
+    if(palette == VIDEO_PALETTE_RGB32 && colours == ZM_COLOUR_RGB32) {
+      conversion_type = 0;
+      if(BigEndian) {
+        subpixelorder = ZM_SUBPIX_ORDER_ARGB;
+      } else {
+        subpixelorder = ZM_SUBPIX_ORDER_BGRA;
+      }
+      
+    /* RGB24 palette and 24bit target colourspace */
+    } else if(palette == VIDEO_PALETTE_RGB24 && colours == ZM_COLOUR_RGB24) {
+      conversion_type = 0;
+      if(BigEndian) {
+        subpixelorder = ZM_SUBPIX_ORDER_RGB;
+      } else {
+        subpixelorder = ZM_SUBPIX_ORDER_BGR;
+      }
+      
+    /* Grayscale palette and grayscale target colourspace */
+    } else if(palette == VIDEO_PALETTE_GREY && colours == ZM_COLOUR_GRAY8) {
+      conversion_type = 0;
+      subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    /* Unable to find a solution for the selected palette and target colourspace. Conversion required. Notify the user of performance penalty */
+    } else {
+      if( capture )
+        Info("No direct match for the selected palette and target colorspace. Format conversion is required, performance penalty expected");
 #if HAVE_LIBSWSCALE
-			/* Try using swscale for the conversion */
-			conversion_type = 1; 
-			Debug(2,"Using swscale for image conversion");
-			if(colours == ZM_COLOUR_RGB32) {
-				subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				imagePixFormat = AV_PIX_FMT_RGBA;
-			} else if(colours == ZM_COLOUR_RGB24) {
-				subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				imagePixFormat = AV_PIX_FMT_RGB24;
-			} else if(colours == ZM_COLOUR_GRAY8) {
-				subpixelorder = ZM_SUBPIX_ORDER_NONE;
-				imagePixFormat = AV_PIX_FMT_GRAY8;
-			} else {
-				Panic("Unexpected colours: %d",colours);
-			}
-			if( capture ) {
-				if(!sws_isSupportedInput(capturePixFormat)) {
-					Error("swscale does not support the used capture format");
-					conversion_type = 2; /* Try ZM format conversions */
-				}
-				if(!sws_isSupportedOutput(imagePixFormat)) {
-					Error("swscale does not support the target format");
-					conversion_type = 2; /* Try ZM format conversions */
-				}
-			}
+      /* Try using swscale for the conversion */
+      conversion_type = 1; 
+      Debug(2,"Using swscale for image conversion");
+      if(colours == ZM_COLOUR_RGB32) {
+        subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        imagePixFormat = AV_PIX_FMT_RGBA;
+      } else if(colours == ZM_COLOUR_RGB24) {
+        subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        imagePixFormat = AV_PIX_FMT_RGB24;
+      } else if(colours == ZM_COLOUR_GRAY8) {
+        subpixelorder = ZM_SUBPIX_ORDER_NONE;
+        imagePixFormat = AV_PIX_FMT_GRAY8;
+      } else {
+        Panic("Unexpected colours: %d",colours);
+      }
+      if( capture ) {
+        if(!sws_isSupportedInput(capturePixFormat)) {
+          Error("swscale does not support the used capture format");
+          conversion_type = 2; /* Try ZM format conversions */
+        }
+        if(!sws_isSupportedOutput(imagePixFormat)) {
+          Error("swscale does not support the target format");
+          conversion_type = 2; /* Try ZM format conversions */
+        }
+      }
 #else
-			/* Don't have swscale, see what we can do */
-			conversion_type = 2;
+      /* Don't have swscale, see what we can do */
+      conversion_type = 2;
 #endif
-			/* Our YUYV->Grayscale conversion is a lot faster than swscale's */
-			if(colours == ZM_COLOUR_GRAY8 && (palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422)) {
-				conversion_type = 2;
-			}
-			
-			if(conversion_type == 2) {
-				Debug(2,"Using ZM for image conversion");
-				if(palette == VIDEO_PALETTE_RGB32 && colours == ZM_COLOUR_GRAY8) {
-					if(BigEndian) {
-						conversion_fptr = &std_convert_argb_gray8;
-						subpixelorder = ZM_SUBPIX_ORDER_NONE;
-					} else {
-						conversion_fptr = &std_convert_bgra_gray8;
-						subpixelorder = ZM_SUBPIX_ORDER_NONE;
-					}
-				} else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_GRAY8) {
-					/* Fast YUYV->Grayscale conversion by extracting the Y channel */
-					if(config.cpu_extensions && sseversion >= 35) {
-						conversion_fptr = &ssse3_convert_yuyv_gray8;
-						Debug(2,"Using SSSE3 YUYV->grayscale fast conversion");
-					} else {
-						conversion_fptr = &std_convert_yuyv_gray8;
-						Debug(2,"Using standard YUYV->grayscale fast conversion");
-					}
-					subpixelorder = ZM_SUBPIX_ORDER_NONE;
-				} else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_RGB24) {
-					conversion_fptr = &zm_convert_yuyv_rgb;
-					subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				} else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_RGB32) {
-					conversion_fptr = &zm_convert_yuyv_rgba;
-					subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				} else if(palette == VIDEO_PALETTE_RGB555 && colours == ZM_COLOUR_RGB24) {
-					conversion_fptr = &zm_convert_rgb555_rgb;
-					subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				} else if(palette == VIDEO_PALETTE_RGB555 && colours == ZM_COLOUR_RGB32) {
-					conversion_fptr = &zm_convert_rgb555_rgba;
-					subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				} else if(palette == VIDEO_PALETTE_RGB565 && colours == ZM_COLOUR_RGB24) {
-					conversion_fptr = &zm_convert_rgb565_rgb;
-					subpixelorder = ZM_SUBPIX_ORDER_RGB;
-				} else if(palette == VIDEO_PALETTE_RGB565 && colours == ZM_COLOUR_RGB32) {
-					conversion_fptr = &zm_convert_rgb565_rgba;
-					subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-				} else {
-					Fatal("Unable to find a suitable format conversion for the selected palette and target colorspace.");
-				}
-			}
-		}
-	}
-#endif // ZM_HAS_V4L1    
+      /* Our YUYV->Grayscale conversion is a lot faster than swscale's */
+      if(colours == ZM_COLOUR_GRAY8 && (palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422)) {
+        conversion_type = 2;
+      }
+      
+      if(conversion_type == 2) {
+        Debug(2,"Using ZM for image conversion");
+        if(palette == VIDEO_PALETTE_RGB32 && colours == ZM_COLOUR_GRAY8) {
+          if(BigEndian) {
+            conversion_fptr = &std_convert_argb_gray8;
+            subpixelorder = ZM_SUBPIX_ORDER_NONE;
+          } else {
+            conversion_fptr = &std_convert_bgra_gray8;
+            subpixelorder = ZM_SUBPIX_ORDER_NONE;
+          }
+        } else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_GRAY8) {
+          /* Fast YUYV->Grayscale conversion by extracting the Y channel */
+          if(config.cpu_extensions && sseversion >= 35) {
+            conversion_fptr = &ssse3_convert_yuyv_gray8;
+            Debug(2,"Using SSSE3 YUYV->grayscale fast conversion");
+          } else {
+            conversion_fptr = &std_convert_yuyv_gray8;
+            Debug(2,"Using standard YUYV->grayscale fast conversion");
+          }
+          subpixelorder = ZM_SUBPIX_ORDER_NONE;
+        } else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_RGB24) {
+          conversion_fptr = &zm_convert_yuyv_rgb;
+          subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        } else if((palette == VIDEO_PALETTE_YUYV || palette == VIDEO_PALETTE_YUV422) && colours == ZM_COLOUR_RGB32) {
+          conversion_fptr = &zm_convert_yuyv_rgba;
+          subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        } else if(palette == VIDEO_PALETTE_RGB555 && colours == ZM_COLOUR_RGB24) {
+          conversion_fptr = &zm_convert_rgb555_rgb;
+          subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        } else if(palette == VIDEO_PALETTE_RGB555 && colours == ZM_COLOUR_RGB32) {
+          conversion_fptr = &zm_convert_rgb555_rgba;
+          subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        } else if(palette == VIDEO_PALETTE_RGB565 && colours == ZM_COLOUR_RGB24) {
+          conversion_fptr = &zm_convert_rgb565_rgb;
+          subpixelorder = ZM_SUBPIX_ORDER_RGB;
+        } else if(palette == VIDEO_PALETTE_RGB565 && colours == ZM_COLOUR_RGB32) {
+          conversion_fptr = &zm_convert_rgb565_rgba;
+          subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+        } else {
+          Fatal("Unable to find a suitable format conversion for the selected palette and target colorspace.");
+        }
+      }
+    }
+  }
+#endif // ZM_HAS_V4L1  
 
-	last_camera = this;
-	Debug(3,"Selected subpixelorder: %d",subpixelorder);
+  last_camera = this;
+  Debug(3,"Selected subpixelorder: %d",subpixelorder);
 
 #if HAVE_LIBSWSCALE
-	/* Initialize swscale stuff */
-	if(capture && conversion_type == 1) {
+  /* Initialize swscale stuff */
+  if(capture && conversion_type == 1) {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-		tmpPicture = av_frame_alloc();
+    tmpPicture = av_frame_alloc();
 #else
-		tmpPicture = avcodec_alloc_frame();
+    tmpPicture = avcodec_alloc_frame();
 #endif
-		if ( !tmpPicture )
-			Fatal( "Could not allocate temporary picture" );
-		
-		int pSize = avpicture_get_size( imagePixFormat, width, height );
-		if( (unsigned int)pSize != imagesize) {
-			Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
-		}
-		
-		imgConversionContext = sws_getContext(width, height, capturePixFormat, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
-		
-		if ( !imgConversionContext ) {
-			Fatal( "Unable to initialise image scaling context" );
-                }
-		
-	}
+    if ( !tmpPicture )
+      Fatal( "Could not allocate temporary picture" );
+    
+    int pSize = avpicture_get_size( imagePixFormat, width, height );
+    if( (unsigned int)pSize != imagesize) {
+      Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
+    }
+    
+    imgConversionContext = sws_getContext(width, height, capturePixFormat, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
+    
+    if ( !imgConversionContext ) {
+      Fatal( "Unable to initialise image scaling context" );
+        }
+    
+  }
 #endif
 }
 
 LocalCamera::~LocalCamera()
 {
-	if ( device_prime && capture )
-		Terminate();
-	
+  if ( device_prime && capture )
+    Terminate();
+  
 #if HAVE_LIBSWSCALE
-	/* Clean up swscale stuff */
-	if(capture && conversion_type == 1) {
-		sws_freeContext(imgConversionContext);
-		imgConversionContext = NULL;
-		
+  /* Clean up swscale stuff */
+  if(capture && conversion_type == 1) {
+    sws_freeContext(imgConversionContext);
+    imgConversionContext = NULL;
+    
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-		av_frame_free( &tmpPicture );
+    av_frame_free( &tmpPicture );
 #else
-		av_freep( &tmpPicture );
+    av_freep( &tmpPicture );
 #endif
-	}
+  }
 #endif
 }
 
 void LocalCamera::Initialise()
 {
 #if HAVE_LIBSWSCALE
-    if ( logDebugging() )
-        av_log_set_level( AV_LOG_DEBUG );
-    else
-        av_log_set_level( AV_LOG_QUIET );
+  if ( logDebugging() )
+    av_log_set_level( AV_LOG_DEBUG );
+  else
+    av_log_set_level( AV_LOG_QUIET );
 #endif // HAVE_LIBSWSCALE
 
-    struct stat st; 
+  struct stat st; 
 
-    if ( stat( device.c_str(), &st ) < 0 )
-		Fatal( "Failed to stat video device %s: %s", device.c_str(), strerror(errno) );
+  if ( stat( device.c_str(), &st ) < 0 )
+    Fatal( "Failed to stat video device %s: %s", device.c_str(), strerror(errno) );
 
-    if ( !S_ISCHR(st.st_mode) )
-		Fatal( "File %s is not device file: %s", device.c_str(), strerror(errno) );
+  if ( !S_ISCHR(st.st_mode) )
+    Fatal( "File %s is not device file: %s", device.c_str(), strerror(errno) );
 
-    Debug( 3, "Opening video device %s", device.c_str() );
-    //if ( (vid_fd = open( device.c_str(), O_RDWR|O_NONBLOCK, 0 )) < 0 )
-    if ( (vid_fd = open( device.c_str(), O_RDWR, 0 )) < 0 )
-		Fatal( "Failed to open video device %s: %s", device.c_str(), strerror(errno) );
+  Debug( 3, "Opening video device %s", device.c_str() );
+  //if ( (vid_fd = open( device.c_str(), O_RDWR|O_NONBLOCK, 0 )) < 0 )
+  if ( (vid_fd = open( device.c_str(), O_RDWR, 0 )) < 0 )
+    Fatal( "Failed to open video device %s: %s", device.c_str(), strerror(errno) );
 
 #if ZM_HAS_V4L2
-    Debug( 2, "V4L2 support enabled, using V4L%d api", v4l_version );
-    if ( v4l_version == 2 )
+  Debug( 2, "V4L2 support enabled, using V4L%d api", v4l_version );
+  if ( v4l_version == 2 )
+  {
+    struct v4l2_capability vid_cap;
+
+    Debug( 3, "Checking video device capabilities" );
+    if ( vidioctl( vid_fd, VIDIOC_QUERYCAP, &vid_cap ) < 0 )
+      Fatal( "Failed to query video device: %s", strerror(errno) );
+
+    if ( !(vid_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) )
+      Fatal( "Video device is not video capture device" );
+
+    if ( !(vid_cap.capabilities & V4L2_CAP_STREAMING) )
+      Fatal( "Video device does not support streaming i/o" );
+
+    Debug( 3, "Setting up video format" );
+
+    memset( &v4l2_data.fmt, 0, sizeof(v4l2_data.fmt) );
+    v4l2_data.fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+
+    if ( vidioctl( vid_fd, VIDIOC_G_FMT, &v4l2_data.fmt ) < 0 )
+      Fatal( "Failed to get video format: %s", strerror(errno) );
+
+    Debug( 4, " v4l2_data.fmt.type = %08x",  v4l2_data.fmt.type );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.width = %08x",  v4l2_data.fmt.fmt.pix.width );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.height = %08x",  v4l2_data.fmt.fmt.pix.height );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.pixelformat = %08x",  v4l2_data.fmt.fmt.pix.pixelformat );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.field = %08x",  v4l2_data.fmt.fmt.pix.field );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.bytesperline = %08x",  v4l2_data.fmt.fmt.pix.bytesperline );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.sizeimage = %08x",  v4l2_data.fmt.fmt.pix.sizeimage );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.colorspace = %08x",  v4l2_data.fmt.fmt.pix.colorspace );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.priv = %08x",  v4l2_data.fmt.fmt.pix.priv );
+
+    v4l2_data.fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+    v4l2_data.fmt.fmt.pix.width = width; 
+    v4l2_data.fmt.fmt.pix.height = height;
+    v4l2_data.fmt.fmt.pix.pixelformat = palette;
+
+  if ( (extras & 0xff) != 0 )
+  {
+    v4l2_data.fmt.fmt.pix.field = (v4l2_field)(extras & 0xff);
+    
+    if ( vidioctl( vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt ) < 0 )
     {
-        struct v4l2_capability vid_cap;
+      Warning( "Failed to set V4L2 field to %d, falling back to auto", (extras & 0xff) );
+      v4l2_data.fmt.fmt.pix.field = V4L2_FIELD_ANY;
+      if ( vidioctl( vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt ) < 0 ) {
+        Fatal( "Failed to set video format: %s", strerror(errno) );
+      }
+    }
+  } else {    
+    if ( vidioctl( vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt ) < 0 ) {
+      Fatal( "Failed to set video format: %s", strerror(errno) );
+    }
+  }
 
-        Debug( 3, "Checking video device capabilities" );
-        if ( vidioctl( vid_fd, VIDIOC_QUERYCAP, &vid_cap ) < 0 )
-            Fatal( "Failed to query video device: %s", strerror(errno) );
+    /* Note VIDIOC_S_FMT may change width and height. */
+    Debug( 4, " v4l2_data.fmt.type = %08x",  v4l2_data.fmt.type );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.width = %08x",  v4l2_data.fmt.fmt.pix.width );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.height = %08x",  v4l2_data.fmt.fmt.pix.height );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.pixelformat = %08x",  v4l2_data.fmt.fmt.pix.pixelformat );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.field = %08x",  v4l2_data.fmt.fmt.pix.field );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.bytesperline = %08x",  v4l2_data.fmt.fmt.pix.bytesperline );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.sizeimage = %08x",  v4l2_data.fmt.fmt.pix.sizeimage );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.colorspace = %08x",  v4l2_data.fmt.fmt.pix.colorspace );
+    Debug( 4, " v4l2_data.fmt.fmt.pix.priv = %08x",  v4l2_data.fmt.fmt.pix.priv );
 
-        if ( !(vid_cap.capabilities & V4L2_CAP_VIDEO_CAPTURE) )
-            Fatal( "Video device is not video capture device" );
+    /* Buggy driver paranoia. */
+    unsigned int min;
+    min = v4l2_data.fmt.fmt.pix.width * 2;
+    if (v4l2_data.fmt.fmt.pix.bytesperline < min)
+      v4l2_data.fmt.fmt.pix.bytesperline = min;
+    min = v4l2_data.fmt.fmt.pix.bytesperline * v4l2_data.fmt.fmt.pix.height;
+    if (v4l2_data.fmt.fmt.pix.sizeimage < min)
+      v4l2_data.fmt.fmt.pix.sizeimage = min;
 
-        if ( !(vid_cap.capabilities & V4L2_CAP_STREAMING) )
-            Fatal( "Video device does not support streaming i/o" );
-
-        Debug( 3, "Setting up video format" );
-
-        memset( &v4l2_data.fmt, 0, sizeof(v4l2_data.fmt) );
-        v4l2_data.fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-
-        if ( vidioctl( vid_fd, VIDIOC_G_FMT, &v4l2_data.fmt ) < 0 )
-            Fatal( "Failed to get video format: %s", strerror(errno) );
-
-        Debug( 4, " v4l2_data.fmt.type = %08x",  v4l2_data.fmt.type );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.width = %08x",  v4l2_data.fmt.fmt.pix.width );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.height = %08x",  v4l2_data.fmt.fmt.pix.height );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.pixelformat = %08x",  v4l2_data.fmt.fmt.pix.pixelformat );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.field = %08x",  v4l2_data.fmt.fmt.pix.field );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.bytesperline = %08x",  v4l2_data.fmt.fmt.pix.bytesperline );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.sizeimage = %08x",  v4l2_data.fmt.fmt.pix.sizeimage );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.colorspace = %08x",  v4l2_data.fmt.fmt.pix.colorspace );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.priv = %08x",  v4l2_data.fmt.fmt.pix.priv );
-
-        v4l2_data.fmt.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        v4l2_data.fmt.fmt.pix.width = width; 
-        v4l2_data.fmt.fmt.pix.height = height;
-        v4l2_data.fmt.fmt.pix.pixelformat = palette;
-
-	if ( (extras & 0xff) != 0 )
-	{
-		v4l2_data.fmt.fmt.pix.field = (v4l2_field)(extras & 0xff);
-		
-		if ( vidioctl( vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt ) < 0 )
-		{
-			Warning( "Failed to set V4L2 field to %d, falling back to auto", (extras & 0xff) );
-			v4l2_data.fmt.fmt.pix.field = V4L2_FIELD_ANY;
-			if ( vidioctl( vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt ) < 0 ) {
-				Fatal( "Failed to set video format: %s", strerror(errno) );
-			}
-		}
-	} else {        
-		if ( vidioctl( vid_fd, VIDIOC_S_FMT, &v4l2_data.fmt ) < 0 ) {
-			Fatal( "Failed to set video format: %s", strerror(errno) );
-		}
-	}
-
-        /* Note VIDIOC_S_FMT may change width and height. */
-        Debug( 4, " v4l2_data.fmt.type = %08x",  v4l2_data.fmt.type );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.width = %08x",  v4l2_data.fmt.fmt.pix.width );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.height = %08x",  v4l2_data.fmt.fmt.pix.height );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.pixelformat = %08x",  v4l2_data.fmt.fmt.pix.pixelformat );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.field = %08x",  v4l2_data.fmt.fmt.pix.field );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.bytesperline = %08x",  v4l2_data.fmt.fmt.pix.bytesperline );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.sizeimage = %08x",  v4l2_data.fmt.fmt.pix.sizeimage );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.colorspace = %08x",  v4l2_data.fmt.fmt.pix.colorspace );
-        Debug( 4, " v4l2_data.fmt.fmt.pix.priv = %08x",  v4l2_data.fmt.fmt.pix.priv );
-
-        /* Buggy driver paranoia. */
-        unsigned int min;
-        min = v4l2_data.fmt.fmt.pix.width * 2;
-        if (v4l2_data.fmt.fmt.pix.bytesperline < min)
-            v4l2_data.fmt.fmt.pix.bytesperline = min;
-        min = v4l2_data.fmt.fmt.pix.bytesperline * v4l2_data.fmt.fmt.pix.height;
-        if (v4l2_data.fmt.fmt.pix.sizeimage < min)
-            v4l2_data.fmt.fmt.pix.sizeimage = min;
-
-	v4l2_jpegcompression jpeg_comp;
-	if(palette == V4L2_PIX_FMT_JPEG || palette == V4L2_PIX_FMT_MJPEG) {
-		if( vidioctl( vid_fd, VIDIOC_G_JPEGCOMP, &jpeg_comp ) < 0 ) {
-			if(errno == EINVAL) {
-				Debug(2, "JPEG compression options are not available");
-			} else {
-				Warning("Failed to get JPEG compression options: %s", strerror(errno) );
-			}
-		} else {
-			/* Set flags and quality. MJPEG should not have the huffman tables defined */
-			if(palette == V4L2_PIX_FMT_MJPEG) {
-				jpeg_comp.jpeg_markers |= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI;
-			} else {
-				jpeg_comp.jpeg_markers |= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI | V4L2_JPEG_MARKER_DHT;
-			}
-			jpeg_comp.quality = 85;
-			
-			/* Update the JPEG options */
-			if( vidioctl( vid_fd, VIDIOC_S_JPEGCOMP, &jpeg_comp ) < 0 ) {
-				Warning("Failed to set JPEG compression options: %s", strerror(errno) );
-			} else {
-				if(vidioctl( vid_fd, VIDIOC_G_JPEGCOMP, &jpeg_comp ) < 0) {
-					Debug(3,"Failed to get updated JPEG compression options: %s", strerror(errno) );
-				} else {
-					Debug(4, "JPEG quality: %d",jpeg_comp.quality);
-					Debug(4, "JPEG markers: %#x",jpeg_comp.jpeg_markers);
-				}
-			}
-		}
-	}
-
-        Debug( 3, "Setting up request buffers" );
-       
-        memset( &v4l2_data.reqbufs, 0, sizeof(v4l2_data.reqbufs) );
-        if ( channel_count > 1 ) {
-			Debug( 3, "Channel count is %d", channel_count );
-            if ( v4l_multi_buffer ){
-                v4l2_data.reqbufs.count = 2*channel_count;
-            } else {
-                v4l2_data.reqbufs.count = 1;
-			}
+  v4l2_jpegcompression jpeg_comp;
+  if(palette == V4L2_PIX_FMT_JPEG || palette == V4L2_PIX_FMT_MJPEG) {
+    if( vidioctl( vid_fd, VIDIOC_G_JPEGCOMP, &jpeg_comp ) < 0 ) {
+      if(errno == EINVAL) {
+        Debug(2, "JPEG compression options are not available");
+      } else {
+        Warning("Failed to get JPEG compression options: %s", strerror(errno) );
+      }
+    } else {
+      /* Set flags and quality. MJPEG should not have the huffman tables defined */
+      if(palette == V4L2_PIX_FMT_MJPEG) {
+        jpeg_comp.jpeg_markers |= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI;
+      } else {
+        jpeg_comp.jpeg_markers |= V4L2_JPEG_MARKER_DQT | V4L2_JPEG_MARKER_DRI | V4L2_JPEG_MARKER_DHT;
+      }
+      jpeg_comp.quality = 85;
+      
+      /* Update the JPEG options */
+      if( vidioctl( vid_fd, VIDIOC_S_JPEGCOMP, &jpeg_comp ) < 0 ) {
+        Warning("Failed to set JPEG compression options: %s", strerror(errno) );
+      } else {
+        if(vidioctl( vid_fd, VIDIOC_G_JPEGCOMP, &jpeg_comp ) < 0) {
+          Debug(3,"Failed to get updated JPEG compression options: %s", strerror(errno) );
         } else {
-            v4l2_data.reqbufs.count = 8;
-		}
-		Debug( 3, "Request buffers count is %d", v4l2_data.reqbufs.count );
-
-        v4l2_data.reqbufs.type = v4l2_data.fmt.type;
-        v4l2_data.reqbufs.memory = V4L2_MEMORY_MMAP;
-
-        if ( vidioctl( vid_fd, VIDIOC_REQBUFS, &v4l2_data.reqbufs ) < 0 )
-        {
-            if ( errno == EINVAL )
-            {
-                Fatal( "Unable to initialise memory mapping, unsupported in device" );
-            }
-            else
-            {
-                Fatal( "Unable to initialise memory mapping: %s", strerror(errno) );
-            }
+          Debug(4, "JPEG quality: %d",jpeg_comp.quality);
+          Debug(4, "JPEG markers: %#x",jpeg_comp.jpeg_markers);
         }
+      }
+    }
+  }
 
-        if ( v4l2_data.reqbufs.count < (v4l_multi_buffer?2:1) )
-            Fatal( "Insufficient buffer memory %d on video device", v4l2_data.reqbufs.count );
+    Debug( 3, "Setting up request buffers" );
+     
+    memset( &v4l2_data.reqbufs, 0, sizeof(v4l2_data.reqbufs) );
+    if ( channel_count > 1 ) {
+      Debug( 3, "Channel count is %d", channel_count );
+      if ( v4l_multi_buffer ){
+        v4l2_data.reqbufs.count = 2*channel_count;
+      } else {
+        v4l2_data.reqbufs.count = 1;
+      }
+    } else {
+      v4l2_data.reqbufs.count = 8;
+    }
+    Debug( 3, "Request buffers count is %d", v4l2_data.reqbufs.count );
 
-		Debug( 3, "Setting up data buffers: Channels %d MultiBuffer %d Buffers: %d", channel_count, v4l_multi_buffer, v4l2_data.reqbufs.count );
+    v4l2_data.reqbufs.type = v4l2_data.fmt.type;
+    v4l2_data.reqbufs.memory = V4L2_MEMORY_MMAP;
 
-        v4l2_data.buffers = new V4L2MappedBuffer[v4l2_data.reqbufs.count];
+    if ( vidioctl( vid_fd, VIDIOC_REQBUFS, &v4l2_data.reqbufs ) < 0 )
+    {
+      if ( errno == EINVAL )
+      {
+        Fatal( "Unable to initialise memory mapping, unsupported in device" );
+      }
+      else
+      {
+        Fatal( "Unable to initialise memory mapping: %s", strerror(errno) );
+      }
+    }
+
+    if ( v4l2_data.reqbufs.count < (v4l_multi_buffer?2:1) )
+      Fatal( "Insufficient buffer memory %d on video device", v4l2_data.reqbufs.count );
+
+    Debug( 3, "Setting up data buffers: Channels %d MultiBuffer %d Buffers: %d", channel_count, v4l_multi_buffer, v4l2_data.reqbufs.count );
+
+    v4l2_data.buffers = new V4L2MappedBuffer[v4l2_data.reqbufs.count];
 #if HAVE_LIBSWSCALE
-        capturePictures = new AVFrame *[v4l2_data.reqbufs.count];
+    capturePictures = new AVFrame *[v4l2_data.reqbufs.count];
 #endif // HAVE_LIBSWSCALE
-        for ( unsigned int i = 0; i < v4l2_data.reqbufs.count; i++ )
-        {
-            struct v4l2_buffer vid_buf;
+    for ( unsigned int i = 0; i < v4l2_data.reqbufs.count; i++ )
+    {
+      struct v4l2_buffer vid_buf;
 
-            memset( &vid_buf, 0, sizeof(vid_buf) );
+      memset( &vid_buf, 0, sizeof(vid_buf) );
 
-            //vid_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-            vid_buf.type = v4l2_data.fmt.type;
-            //vid_buf.memory = V4L2_MEMORY_MMAP;
-            vid_buf.memory = v4l2_data.reqbufs.memory;
-            vid_buf.index = i;
+      //vid_buf.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+      vid_buf.type = v4l2_data.fmt.type;
+      //vid_buf.memory = V4L2_MEMORY_MMAP;
+      vid_buf.memory = v4l2_data.reqbufs.memory;
+      vid_buf.index = i;
 
-            if ( vidioctl( vid_fd, VIDIOC_QUERYBUF, &vid_buf ) < 0 )
-                Fatal( "Unable to query video buffer: %s", strerror(errno) );
+      if ( vidioctl( vid_fd, VIDIOC_QUERYBUF, &vid_buf ) < 0 )
+        Fatal( "Unable to query video buffer: %s", strerror(errno) );
 
-            v4l2_data.buffers[i].length = vid_buf.length;
-            v4l2_data.buffers[i].start = mmap( NULL, vid_buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, vid_fd, vid_buf.m.offset );
+      v4l2_data.buffers[i].length = vid_buf.length;
+      v4l2_data.buffers[i].start = mmap( NULL, vid_buf.length, PROT_READ|PROT_WRITE, MAP_SHARED, vid_fd, vid_buf.m.offset );
 
-            if ( v4l2_data.buffers[i].start == MAP_FAILED )
-                Fatal( "Can't map video buffer %d (%d bytes) to memory: %s(%d)", i, vid_buf.length, strerror(errno), errno );
+      if ( v4l2_data.buffers[i].start == MAP_FAILED )
+        Fatal( "Can't map video buffer %d (%d bytes) to memory: %s(%d)", i, vid_buf.length, strerror(errno), errno );
 
 #if HAVE_LIBSWSCALE
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-		capturePictures[i] = av_frame_alloc();
+    capturePictures[i] = av_frame_alloc();
 #else
-		capturePictures[i] = avcodec_alloc_frame();
+    capturePictures[i] = avcodec_alloc_frame();
 #endif
-		if ( !capturePictures[i] )
-			Fatal( "Could not allocate picture" );
-		avpicture_fill( (AVPicture *)capturePictures[i], (uint8_t*)v4l2_data.buffers[i].start, capturePixFormat, v4l2_data.fmt.fmt.pix.width, v4l2_data.fmt.fmt.pix.height );
+    if ( !capturePictures[i] )
+      Fatal( "Could not allocate picture" );
+    avpicture_fill( (AVPicture *)capturePictures[i], (uint8_t*)v4l2_data.buffers[i].start, capturePixFormat, v4l2_data.fmt.fmt.pix.width, v4l2_data.fmt.fmt.pix.height );
 #endif // HAVE_LIBSWSCALE
-        }
-
-        Debug( 3, "Configuring video source" );
-
-        if ( vidioctl( vid_fd, VIDIOC_S_INPUT, &channel ) < 0 )
-        {
-            Fatal( "Failed to set camera source %d: %s", channel, strerror(errno) );
-        }
-
-        struct v4l2_input input;
-        v4l2_std_id stdId;
-
-        memset( &input, 0, sizeof(input) );
-
-        if ( vidioctl( vid_fd, VIDIOC_ENUMINPUT, &input ) < 0 )
-        {
-            Fatal( "Failed to enumerate input %d: %s", channel, strerror(errno) );
-        }
-
-        if ( (input.std != V4L2_STD_UNKNOWN) && ((input.std & standard) == V4L2_STD_UNKNOWN) )
-        {
-            Fatal( "Device does not support video standard %d", standard );
-        }
-
-        stdId = standard;
-        if ( (input.std != V4L2_STD_UNKNOWN) && vidioctl( vid_fd, VIDIOC_S_STD, &stdId ) < 0 )   
-        {
-            Fatal( "Failed to set video standard %d: %s", standard, strerror(errno) );
-        }
-
-        Contrast(contrast);
-        Brightness(brightness);
-        Hue(hue);
-        Colour(colour);
     }
+
+    Debug( 3, "Configuring video source" );
+
+    if ( vidioctl( vid_fd, VIDIOC_S_INPUT, &channel ) < 0 )
+    {
+      Fatal( "Failed to set camera source %d: %s", channel, strerror(errno) );
+    }
+
+    struct v4l2_input input;
+    v4l2_std_id stdId;
+
+    memset( &input, 0, sizeof(input) );
+
+    if ( vidioctl( vid_fd, VIDIOC_ENUMINPUT, &input ) < 0 )
+    {
+      Fatal( "Failed to enumerate input %d: %s", channel, strerror(errno) );
+    }
+
+    if ( (input.std != V4L2_STD_UNKNOWN) && ((input.std & standard) == V4L2_STD_UNKNOWN) )
+    {
+      Fatal( "Device does not support video standard %d", standard );
+    }
+
+    stdId = standard;
+    if ( (input.std != V4L2_STD_UNKNOWN) && vidioctl( vid_fd, VIDIOC_S_STD, &stdId ) < 0 )   
+    {
+      Fatal( "Failed to set video standard %d: %s", standard, strerror(errno) );
+    }
+
+    Contrast(contrast);
+    Brightness(brightness);
+    Hue(hue);
+    Colour(colour);
+  }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
+  if ( v4l_version == 1 )
+  {
+    Debug( 3, "Configuring picture attributes" );
+
+    struct video_picture vid_pic;
+    memset( &vid_pic, 0, sizeof(vid_pic) );
+    if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
+      Fatal( "Failed to get picture attributes: %s", strerror(errno) );
+
+    Debug( 4, "Old P:%d", vid_pic.palette );
+    Debug( 4, "Old D:%d", vid_pic.depth );
+    Debug( 4, "Old B:%d", vid_pic.brightness );
+    Debug( 4, "Old h:%d", vid_pic.hue );
+    Debug( 4, "Old Cl:%d", vid_pic.colour );
+    Debug( 4, "Old Cn:%d", vid_pic.contrast );
+
+    switch (vid_pic.palette = palette)
     {
-        Debug( 3, "Configuring picture attributes" );
+      case VIDEO_PALETTE_RGB32 :
+      {
+        vid_pic.depth = 32;
+        break;
+      }  
+      case VIDEO_PALETTE_RGB24 :
+      {
+        vid_pic.depth = 24;
+        break;
+      }
+      case VIDEO_PALETTE_GREY :
+      {
+        vid_pic.depth = 8;
+        break;
+      }   
+      case VIDEO_PALETTE_RGB565 :
+      case VIDEO_PALETTE_YUYV :
+      case VIDEO_PALETTE_YUV422 :
+      case VIDEO_PALETTE_YUV420P :
+      case VIDEO_PALETTE_YUV422P :
+      default:
+      {
+        vid_pic.depth = 16;
+        break;
+      }
+    }
 
-        struct video_picture vid_pic;
-        memset( &vid_pic, 0, sizeof(vid_pic) );
-        if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
-            Fatal( "Failed to get picture attributes: %s", strerror(errno) );
+    if ( brightness >= 0 ) vid_pic.brightness = brightness;
+    if ( hue >= 0 ) vid_pic.hue = hue;
+    if ( colour >= 0 ) vid_pic.colour = colour;
+    if ( contrast >= 0 ) vid_pic.contrast = contrast;
 
-        Debug( 4, "Old P:%d", vid_pic.palette );
-        Debug( 4, "Old D:%d", vid_pic.depth );
-        Debug( 4, "Old B:%d", vid_pic.brightness );
-        Debug( 4, "Old h:%d", vid_pic.hue );
-        Debug( 4, "Old Cl:%d", vid_pic.colour );
-        Debug( 4, "Old Cn:%d", vid_pic.contrast );
+    if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
+    {
+      Error( "Failed to set picture attributes: %s", strerror(errno) );
+      if ( config.strict_video_config )
+        exit(-1);
+    }
 
-        switch (vid_pic.palette = palette)
-        {
-            case VIDEO_PALETTE_RGB32 :
-            {
-                vid_pic.depth = 32;
-                break;
-            }  
-            case VIDEO_PALETTE_RGB24 :
-            {
-                vid_pic.depth = 24;
-                break;
-            }
-            case VIDEO_PALETTE_GREY :
-            {
-                vid_pic.depth = 8;
-                break;
-            }   
-            case VIDEO_PALETTE_RGB565 :
-            case VIDEO_PALETTE_YUYV :
-            case VIDEO_PALETTE_YUV422 :
-            case VIDEO_PALETTE_YUV420P :
-            case VIDEO_PALETTE_YUV422P :
-            default:
-            {
-                vid_pic.depth = 16;
-                break;
-            }
-        }
+    Debug( 3, "Configuring window attributes" );
 
-        if ( brightness >= 0 ) vid_pic.brightness = brightness;
-        if ( hue >= 0 ) vid_pic.hue = hue;
-        if ( colour >= 0 ) vid_pic.colour = colour;
-        if ( contrast >= 0 ) vid_pic.contrast = contrast;
+    struct video_window vid_win;
+    memset( &vid_win, 0, sizeof(vid_win) );
+    if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win) < 0 )
+    {
+      Error( "Failed to get window attributes: %s", strerror(errno) );
+      exit(-1);
+    }
+    Debug( 4, "Old X:%d", vid_win.x );
+    Debug( 4, "Old Y:%d", vid_win.y );
+    Debug( 4, "Old W:%d", vid_win.width );
+    Debug( 4, "Old H:%d", vid_win.height );
+    
+    vid_win.x = 0;
+    vid_win.y = 0;
+    vid_win.width = width;
+    vid_win.height = height;
+    vid_win.flags &= ~VIDEO_WINDOW_INTERLACE;
 
-        if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
-        {
-            Error( "Failed to set picture attributes: %s", strerror(errno) );
-            if ( config.strict_video_config )
-                exit(-1);
-        }
+    if ( ioctl( vid_fd, VIDIOCSWIN, &vid_win ) < 0 )
+    {
+      Error( "Failed to set window attributes: %s", strerror(errno) );
+      if ( config.strict_video_config )
+        exit(-1);
+    }
 
-        Debug( 3, "Configuring window attributes" );
+    Info( "vid_win.width = %08x", vid_win.width );
+    Info( "vid_win.height = %08x", vid_win.height );
+    Info( "vid_win.flags = %08x", vid_win.flags );
 
-        struct video_window vid_win;
-        memset( &vid_win, 0, sizeof(vid_win) );
-        if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win) < 0 )
-        {
-            Error( "Failed to get window attributes: %s", strerror(errno) );
-            exit(-1);
-        }
-        Debug( 4, "Old X:%d", vid_win.x );
-        Debug( 4, "Old Y:%d", vid_win.y );
-        Debug( 4, "Old W:%d", vid_win.width );
-        Debug( 4, "Old H:%d", vid_win.height );
-        
-        vid_win.x = 0;
-        vid_win.y = 0;
-        vid_win.width = width;
-        vid_win.height = height;
-        vid_win.flags &= ~VIDEO_WINDOW_INTERLACE;
+    Debug( 3, "Setting up request buffers" );
+    if ( ioctl( vid_fd, VIDIOCGMBUF, &v4l1_data.frames ) < 0 )
+      Fatal( "Failed to setup memory: %s", strerror(errno) );
+    if ( channel_count > 1 && !v4l_multi_buffer )
+      v4l1_data.frames.frames = 1;
+    v4l1_data.buffers = new video_mmap[v4l1_data.frames.frames];
+    Debug( 4, "vmb.frames = %d", v4l1_data.frames.frames );
+    Debug( 4, "vmb.size = %d", v4l1_data.frames.size );
 
-        if ( ioctl( vid_fd, VIDIOCSWIN, &vid_win ) < 0 )
-        {
-            Error( "Failed to set window attributes: %s", strerror(errno) );
-            if ( config.strict_video_config )
-                exit(-1);
-        }
+    Debug( 3, "Setting up %d frame buffers", v4l1_data.frames.frames );
 
-        Info( "vid_win.width = %08x", vid_win.width );
-        Info( "vid_win.height = %08x", vid_win.height );
-        Info( "vid_win.flags = %08x", vid_win.flags );
-
-        Debug( 3, "Setting up request buffers" );
-        if ( ioctl( vid_fd, VIDIOCGMBUF, &v4l1_data.frames ) < 0 )
-            Fatal( "Failed to setup memory: %s", strerror(errno) );
-        if ( channel_count > 1 && !v4l_multi_buffer )
-            v4l1_data.frames.frames = 1;
-        v4l1_data.buffers = new video_mmap[v4l1_data.frames.frames];
-        Debug( 4, "vmb.frames = %d", v4l1_data.frames.frames );
-        Debug( 4, "vmb.size = %d", v4l1_data.frames.size );
-
-        Debug( 3, "Setting up %d frame buffers", v4l1_data.frames.frames );
-
-        v4l1_data.bufptr = (unsigned char *)mmap( 0, v4l1_data.frames.size, PROT_READ|PROT_WRITE, MAP_SHARED, vid_fd, 0 );
-        if ( v4l1_data.bufptr == MAP_FAILED )
-            Fatal( "Could not mmap video: %s", strerror(errno) );
+    v4l1_data.bufptr = (unsigned char *)mmap( 0, v4l1_data.frames.size, PROT_READ|PROT_WRITE, MAP_SHARED, vid_fd, 0 );
+    if ( v4l1_data.bufptr == MAP_FAILED )
+      Fatal( "Could not mmap video: %s", strerror(errno) );
 
 #if HAVE_LIBSWSCALE
-        capturePictures = new AVFrame *[v4l1_data.frames.frames];
-        for ( int i = 0; i < v4l1_data.frames.frames; i++ )
-        {
-            v4l1_data.buffers[i].frame = i;
-            v4l1_data.buffers[i].width = width;
-            v4l1_data.buffers[i].height = height;
-            v4l1_data.buffers[i].format = palette;
+    capturePictures = new AVFrame *[v4l1_data.frames.frames];
+    for ( int i = 0; i < v4l1_data.frames.frames; i++ )
+    {
+      v4l1_data.buffers[i].frame = i;
+      v4l1_data.buffers[i].width = width;
+      v4l1_data.buffers[i].height = height;
+      v4l1_data.buffers[i].format = palette;
 
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-            capturePictures[i] = av_frame_alloc();
+      capturePictures[i] = av_frame_alloc();
 #else
-            capturePictures[i] = avcodec_alloc_frame();
+      capturePictures[i] = avcodec_alloc_frame();
 #endif
-            if ( !capturePictures[i] )
-                Fatal( "Could not allocate picture" );
-            avpicture_fill( (AVPicture *)capturePictures[i], (unsigned char *)v4l1_data.bufptr+v4l1_data.frames.offsets[i], capturePixFormat, width, height );
-        }
+      if ( !capturePictures[i] )
+        Fatal( "Could not allocate picture" );
+      avpicture_fill( (AVPicture *)capturePictures[i], (unsigned char *)v4l1_data.bufptr+v4l1_data.frames.offsets[i], capturePixFormat, width, height );
+    }
 #endif // HAVE_LIBSWSCALE
 
-        Debug( 3, "Configuring video source" );
+    Debug( 3, "Configuring video source" );
 
-        struct video_channel vid_src;
-        memset( &vid_src, 0, sizeof(vid_src) );
-        vid_src.channel = channel;
-        if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src) < 0 )
-            Fatal( "Failed to get camera source: %s", strerror(errno) );
+    struct video_channel vid_src;
+    memset( &vid_src, 0, sizeof(vid_src) );
+    vid_src.channel = channel;
+    if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src) < 0 )
+      Fatal( "Failed to get camera source: %s", strerror(errno) );
 
-        Debug( 4, "Old C:%d", vid_src.channel );
-        Debug( 4, "Old F:%d", vid_src.norm );
-        Debug( 4, "Old Fl:%x", vid_src.flags );
-        Debug( 4, "Old T:%d", vid_src.type );
+    Debug( 4, "Old C:%d", vid_src.channel );
+    Debug( 4, "Old F:%d", vid_src.norm );
+    Debug( 4, "Old Fl:%x", vid_src.flags );
+    Debug( 4, "Old T:%d", vid_src.type );
 
-        vid_src.norm = standard;
-        vid_src.flags = 0;
-        vid_src.type = VIDEO_TYPE_CAMERA;
-        if ( ioctl( vid_fd, VIDIOCSCHAN, &vid_src ) < 0 )
-        {
-            Error( "Failed to set camera source %d: %s", channel, strerror(errno) );
-            if ( config.strict_video_config )
-                exit(-1);
-        }
-
-        if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win) < 0 )
-            Fatal( "Failed to get window data: %s", strerror(errno) );
-
-        Info( "vid_win.width = %08x", vid_win.width );
-        Info( "vid_win.height = %08x", vid_win.height );
-        Info( "vid_win.flags = %08x", vid_win.flags );
-
-        Debug( 4, "New X:%d", vid_win.x );
-        Debug( 4, "New Y:%d", vid_win.y );
-        Debug( 4, "New W:%d", vid_win.width );
-        Debug( 4, "New H:%d", vid_win.height );
-        
-        if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
-            Fatal( "Failed to get window data: %s", strerror(errno) );
-
-        Debug( 4, "New P:%d", vid_pic.palette );
-        Debug( 4, "New D:%d", vid_pic.depth );
-        Debug( 4, "New B:%d", vid_pic.brightness );
-        Debug( 4, "New h:%d", vid_pic.hue );
-        Debug( 4, "New Cl:%d", vid_pic.colour );
-        Debug( 4, "New Cn:%d", vid_pic.contrast );
+    vid_src.norm = standard;
+    vid_src.flags = 0;
+    vid_src.type = VIDEO_TYPE_CAMERA;
+    if ( ioctl( vid_fd, VIDIOCSCHAN, &vid_src ) < 0 )
+    {
+      Error( "Failed to set camera source %d: %s", channel, strerror(errno) );
+      if ( config.strict_video_config )
+        exit(-1);
     }
+
+    if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win) < 0 )
+      Fatal( "Failed to get window data: %s", strerror(errno) );
+
+    Info( "vid_win.width = %08x", vid_win.width );
+    Info( "vid_win.height = %08x", vid_win.height );
+    Info( "vid_win.flags = %08x", vid_win.flags );
+
+    Debug( 4, "New X:%d", vid_win.x );
+    Debug( 4, "New Y:%d", vid_win.y );
+    Debug( 4, "New W:%d", vid_win.width );
+    Debug( 4, "New H:%d", vid_win.height );
+    
+    if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
+      Fatal( "Failed to get window data: %s", strerror(errno) );
+
+    Debug( 4, "New P:%d", vid_pic.palette );
+    Debug( 4, "New D:%d", vid_pic.depth );
+    Debug( 4, "New B:%d", vid_pic.brightness );
+    Debug( 4, "New h:%d", vid_pic.hue );
+    Debug( 4, "New Cl:%d", vid_pic.colour );
+    Debug( 4, "New Cn:%d", vid_pic.contrast );
+  }
 #endif // ZM_HAS_V4L1
 }
 
 void LocalCamera::Terminate()
 {
 #if ZM_HAS_V4L2
-    if ( v4l_version == 2 )
-    {
-        Debug( 3, "Terminating video stream" );
-        //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-       // enum v4l2_buf_type type = v4l2_data.fmt.type;
-        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-        if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
-            Error( "Failed to stop capture stream: %s", strerror(errno) );
+  if ( v4l_version == 2 )
+  {
+    Debug( 3, "Terminating video stream" );
+    //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+     // enum v4l2_buf_type type = v4l2_data.fmt.type;
+    enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+    if ( vidioctl( vid_fd, VIDIOC_STREAMOFF, &type ) < 0 )
+      Error( "Failed to stop capture stream: %s", strerror(errno) );
 
-        Debug( 3, "Unmapping video buffers" );
-        for ( unsigned int i = 0; i < v4l2_data.reqbufs.count; i++ ) {
+    Debug( 3, "Unmapping video buffers" );
+    for ( unsigned int i = 0; i < v4l2_data.reqbufs.count; i++ ) {
 #if HAVE_LIBSWSCALE
-			/* Free capture pictures */
+      /* Free capture pictures */
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-                        av_frame_free( &capturePictures[i] );
+            av_frame_free( &capturePictures[i] );
 #else
-                        av_freep( &capturePictures[i] );
+            av_freep( &capturePictures[i] );
 #endif
 #endif
-            if ( munmap( v4l2_data.buffers[i].start, v4l2_data.buffers[i].length ) < 0 )
-                Error( "Failed to munmap buffer %d: %s", i, strerror(errno) );
-	}
-	    
-    }
-    else
+      if ( munmap( v4l2_data.buffers[i].start, v4l2_data.buffers[i].length ) < 0 )
+        Error( "Failed to munmap buffer %d: %s", i, strerror(errno) );
+  }
+    
+  }
+  else
 #endif // ZM_HAS_V4L2
 
 
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
-    {
+  if ( v4l_version == 1 )
+  {
 #if HAVE_LIBSWSCALE
-		for(int i=0; i < v4l1_data.frames.frames; i++) {    
-			/* Free capture pictures */
+    for(int i=0; i < v4l1_data.frames.frames; i++) {  
+      /* Free capture pictures */
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-                        av_frame_free( &capturePictures[i] );
+            av_frame_free( &capturePictures[i] );
 #else
-                        av_freep( &capturePictures[i] );
+            av_freep( &capturePictures[i] );
 #endif
-		}
-#endif
-	
-        Debug( 3, "Unmapping video buffers" );
-	    if ( munmap((char*)v4l1_data.bufptr, v4l1_data.frames.size) < 0 )
-		    Error( "Failed to munmap buffers: %s", strerror(errno) );
-
-	    delete[] v4l1_data.buffers;
     }
+#endif
+  
+    Debug( 3, "Unmapping video buffers" );
+    if ( munmap((char*)v4l1_data.bufptr, v4l1_data.frames.size) < 0 )
+      Error( "Failed to munmap buffers: %s", strerror(errno) );
+
+    delete[] v4l1_data.buffers;
+  }
 #endif // ZM_HAS_V4L1
 
-	close( vid_fd );
-	
+  close( vid_fd );
+  
 }
 
 uint32_t LocalCamera::AutoSelectFormat(int p_colours) {
-	/* Automatic format selection */
-	uint32_t selected_palette = 0;
+  /* Automatic format selection */
+  uint32_t selected_palette = 0;
 #if ZM_HAS_V4L2
-	char fmt_desc[64][32];
-	uint32_t fmt_fcc[64];
-	v4l2_fmtdesc fmtinfo;
-	unsigned int nIndex = 0;
-	//int nRet = 0; // compiler say it isn't used
-	int enum_fd;
-	
-	/* Open the device */
-	if ((enum_fd = open( device.c_str(), O_RDWR, 0 )) < 0) {
-		Error( "Automatic format selection failed to open video device %s: %s", device.c_str(), strerror(errno) );
-		return selected_palette;
-	}
-	
-	/* Enumerate available formats */
-	memset(&fmtinfo, 0, sizeof(fmtinfo));
-	fmtinfo.index = nIndex;
-	fmtinfo.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	// FIXME This will crash if there are more than 64 formats.
-	while(vidioctl( enum_fd, VIDIOC_ENUM_FMT, &fmtinfo ) >= 0) {
-		/* Got a format. Copy it to the array */
-		strcpy(fmt_desc[nIndex], (const char*)(fmtinfo.description));
-		fmt_fcc[nIndex] = fmtinfo.pixelformat;
-		
-		Debug(6, "Got format: %s (%c%c%c%c) at index %d",fmt_desc[nIndex],fmt_fcc[nIndex]&0xff, (fmt_fcc[nIndex]>>8)&0xff, (fmt_fcc[nIndex]>>16)&0xff, (fmt_fcc[nIndex]>>24)&0xff ,nIndex);
-		
-		/* Proceed to the next index */
-		memset(&fmtinfo, 0, sizeof(fmtinfo));
-		fmtinfo.index = ++nIndex;
-		fmtinfo.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	}
-	
-	/* Select format */
-	int nIndexUsed = -1;
-	unsigned int n_preferedformats = 0;
-	const uint32_t* preferedformats;
-	if(p_colours == ZM_COLOUR_RGB32) {
-		/* 32bit */
-		preferedformats = prefered_rgb32_formats;
-		n_preferedformats = sizeof(prefered_rgb32_formats) / sizeof(uint32_t);
-	} else if(p_colours == ZM_COLOUR_GRAY8) {
-		/* Grayscale */
-		preferedformats = prefered_gray8_formats;
-		n_preferedformats = sizeof(prefered_gray8_formats) / sizeof(uint32_t);
-	} else {
-		/* Assume 24bit */
-		preferedformats = prefered_rgb24_formats;
-		n_preferedformats = sizeof(prefered_rgb24_formats) / sizeof(uint32_t);
-	}
-	for( unsigned int i=0; i < n_preferedformats && nIndexUsed < 0; i++ ) {
-		for( unsigned int j=0; j < nIndex; j++ ) {
-			if( preferedformats[i] == fmt_fcc[j] ) {
-				Debug(6, "Choosing format: %s (%c%c%c%c) at index %d",fmt_desc[j],fmt_fcc[j]&0xff, (fmt_fcc[j]>>8)&0xff, (fmt_fcc[j]>>16)&0xff, (fmt_fcc[j]>>24)&0xff ,j);
-				/* Found a format! */
-				nIndexUsed = j;
-				break;
-			} else {
-				Debug(6, "No match for format: %s (%c%c%c%c) at index %d",fmt_desc[j],fmt_fcc[j]&0xff, (fmt_fcc[j]>>8)&0xff, (fmt_fcc[j]>>16)&0xff, (fmt_fcc[j]>>24)&0xff ,j);
-			}
-		}
-	}
-	
-	/* Have we found a match? */
-	if(nIndexUsed >= 0) {
-		/* Found a match */
-		selected_palette = fmt_fcc[nIndexUsed];
-		strcpy(palette_desc,fmt_desc[nIndexUsed]);
-	}
-	
-	/* Close the device */
-	close(enum_fd);
-	
+  char fmt_desc[64][32];
+  uint32_t fmt_fcc[64];
+  v4l2_fmtdesc fmtinfo;
+  unsigned int nIndex = 0;
+  //int nRet = 0; // compiler say it isn't used
+  int enum_fd;
+  
+  /* Open the device */
+  if ((enum_fd = open( device.c_str(), O_RDWR, 0 )) < 0) {
+    Error( "Automatic format selection failed to open video device %s: %s", device.c_str(), strerror(errno) );
+    return selected_palette;
+  }
+  
+  /* Enumerate available formats */
+  memset(&fmtinfo, 0, sizeof(fmtinfo));
+  fmtinfo.index = nIndex;
+  fmtinfo.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  // FIXME This will crash if there are more than 64 formats.
+  while(vidioctl( enum_fd, VIDIOC_ENUM_FMT, &fmtinfo ) >= 0) {
+    /* Got a format. Copy it to the array */
+    strcpy(fmt_desc[nIndex], (const char*)(fmtinfo.description));
+    fmt_fcc[nIndex] = fmtinfo.pixelformat;
+    
+    Debug(6, "Got format: %s (%c%c%c%c) at index %d",fmt_desc[nIndex],fmt_fcc[nIndex]&0xff, (fmt_fcc[nIndex]>>8)&0xff, (fmt_fcc[nIndex]>>16)&0xff, (fmt_fcc[nIndex]>>24)&0xff ,nIndex);
+    
+    /* Proceed to the next index */
+    memset(&fmtinfo, 0, sizeof(fmtinfo));
+    fmtinfo.index = ++nIndex;
+    fmtinfo.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  }
+  
+  /* Select format */
+  int nIndexUsed = -1;
+  unsigned int n_preferedformats = 0;
+  const uint32_t* preferedformats;
+  if(p_colours == ZM_COLOUR_RGB32) {
+    /* 32bit */
+    preferedformats = prefered_rgb32_formats;
+    n_preferedformats = sizeof(prefered_rgb32_formats) / sizeof(uint32_t);
+  } else if(p_colours == ZM_COLOUR_GRAY8) {
+    /* Grayscale */
+    preferedformats = prefered_gray8_formats;
+    n_preferedformats = sizeof(prefered_gray8_formats) / sizeof(uint32_t);
+  } else {
+    /* Assume 24bit */
+    preferedformats = prefered_rgb24_formats;
+    n_preferedformats = sizeof(prefered_rgb24_formats) / sizeof(uint32_t);
+  }
+  for( unsigned int i=0; i < n_preferedformats && nIndexUsed < 0; i++ ) {
+    for( unsigned int j=0; j < nIndex; j++ ) {
+      if( preferedformats[i] == fmt_fcc[j] ) {
+        Debug(6, "Choosing format: %s (%c%c%c%c) at index %d",fmt_desc[j],fmt_fcc[j]&0xff, (fmt_fcc[j]>>8)&0xff, (fmt_fcc[j]>>16)&0xff, (fmt_fcc[j]>>24)&0xff ,j);
+        /* Found a format! */
+        nIndexUsed = j;
+        break;
+      } else {
+        Debug(6, "No match for format: %s (%c%c%c%c) at index %d",fmt_desc[j],fmt_fcc[j]&0xff, (fmt_fcc[j]>>8)&0xff, (fmt_fcc[j]>>16)&0xff, (fmt_fcc[j]>>24)&0xff ,j);
+      }
+    }
+  }
+  
+  /* Have we found a match? */
+  if(nIndexUsed >= 0) {
+    /* Found a match */
+    selected_palette = fmt_fcc[nIndexUsed];
+    strcpy(palette_desc,fmt_desc[nIndexUsed]);
+  }
+  
+  /* Close the device */
+  close(enum_fd);
+  
 #endif /* ZM_HAS_V4L2 */
-	return selected_palette;
+  return selected_palette;
 }
 
 
 #define capString(test,prefix,yesString,noString,capability) \
-    (test) ? (prefix yesString " " capability "\n") : (prefix noString " " capability "\n")
+  (test) ? (prefix yesString " " capability "\n") : (prefix noString " " capability "\n")
 
 bool LocalCamera::GetCurrentSettings( const char *device, char *output, int version, bool verbose )
 {
-	output[0] = 0;
+  output[0] = 0;
 
-    char queryDevice[PATH_MAX] = "";
-    int devIndex = 0;
-    do
+  char queryDevice[PATH_MAX] = "";
+  int devIndex = 0;
+  do
+  {
+    if ( device )
+      strcpy( queryDevice, device );
+    else
+      sprintf( queryDevice, "/dev/video%d", devIndex );
+    if ( (vid_fd = open(queryDevice, O_RDWR)) <= 0 )
     {
-        if ( device )
-            strcpy( queryDevice, device );
-        else
-            sprintf( queryDevice, "/dev/video%d", devIndex );
-        if ( (vid_fd = open(queryDevice, O_RDWR)) <= 0 )
-        {
-            if ( device )
-            {
-                Error( "Failed to open video device %s: %s", queryDevice, strerror(errno) );
-                if ( verbose )
-                    sprintf( output+strlen(output), "Error, failed to open video device %s: %s\n", queryDevice, strerror(errno) );
-                else
-                    sprintf( output+strlen(output), "error%d\n", errno );
-                return( false );
-            }
-            else
-            {
-                return( true );
-            }
-        }
+      if ( device )
+      {
+        Error( "Failed to open video device %s: %s", queryDevice, strerror(errno) );
         if ( verbose )
-            sprintf( output+strlen(output), "Video Device: %s\n", queryDevice );
+          sprintf( output+strlen(output), "Error, failed to open video device %s: %s\n", queryDevice, strerror(errno) );
         else
-            sprintf( output+strlen(output), "d:%s|", queryDevice );
+          sprintf( output+strlen(output), "error%d\n", errno );
+        return( false );
+      }
+      else
+      {
+        return( true );
+      }
+    }
+    if ( verbose )
+      sprintf( output+strlen(output), "Video Device: %s\n", queryDevice );
+    else
+      sprintf( output+strlen(output), "d:%s|", queryDevice );
 
 #if ZM_HAS_V4L2
-        if ( version == 2 )
-        {
-            struct v4l2_capability vid_cap;
-            if ( vidioctl( vid_fd, VIDIOC_QUERYCAP, &vid_cap ) < 0 )
-            {
-                Error( "Failed to query video device: %s", strerror(errno) );
-                if ( verbose )
-                    sprintf( output, "Error, failed to query video capabilities %s: %s\n", queryDevice, strerror(errno) );
-                else
-                    sprintf( output, "error%d\n", errno );
-                return( false );
-            }
+    if ( version == 2 )
+    {
+      struct v4l2_capability vid_cap;
+      if ( vidioctl( vid_fd, VIDIOC_QUERYCAP, &vid_cap ) < 0 )
+      {
+        Error( "Failed to query video device: %s", strerror(errno) );
+        if ( verbose )
+          sprintf( output, "Error, failed to query video capabilities %s: %s\n", queryDevice, strerror(errno) );
+        else
+          sprintf( output, "error%d\n", errno );
+        return( false );
+      }
 
-            if ( verbose )
-            {
-                sprintf( output+strlen(output), "General Capabilities\n" );
-                sprintf( output+strlen(output), "  Driver: %s\n", vid_cap.driver );
-                sprintf( output+strlen(output), "  Card: %s\n", vid_cap.card );
-                sprintf( output+strlen(output), "  Bus: %s\n", vid_cap.bus_info );
-                sprintf( output+strlen(output), "  Version: %u.%u.%u\n", (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff  );
-                sprintf( output+strlen(output), "  Type: 0x%x\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s", vid_cap.capabilities,
-                    capString( vid_cap.capabilities&V4L2_CAP_VIDEO_CAPTURE,         "    ", "Supports", "Does not support", "video capture (X)" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_VIDEO_OUTPUT,          "    ", "Supports", "Does not support", "video output" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_VIDEO_OVERLAY,         "    ", "Supports", "Does not support", "frame buffer overlay" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_VBI_CAPTURE,           "    ", "Supports", "Does not support", "VBI capture" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_VBI_OUTPUT,            "    ", "Supports", "Does not support", "VBI output" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_SLICED_VBI_CAPTURE,    "    ", "Supports", "Does not support", "sliced VBI capture" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_SLICED_VBI_OUTPUT,     "    ", "Supports", "Does not support", "sliced VBI output" ),
+      if ( verbose )
+      {
+        sprintf( output+strlen(output), "General Capabilities\n" );
+        sprintf( output+strlen(output), "  Driver: %s\n", vid_cap.driver );
+        sprintf( output+strlen(output), "  Card: %s\n", vid_cap.card );
+        sprintf( output+strlen(output), "  Bus: %s\n", vid_cap.bus_info );
+        sprintf( output+strlen(output), "  Version: %u.%u.%u\n", (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff  );
+        sprintf( output+strlen(output), "  Type: 0x%x\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s", vid_cap.capabilities,
+          capString( vid_cap.capabilities&V4L2_CAP_VIDEO_CAPTURE,     "  ", "Supports", "Does not support", "video capture (X)" ),
+          capString( vid_cap.capabilities&V4L2_CAP_VIDEO_OUTPUT,      "  ", "Supports", "Does not support", "video output" ),
+          capString( vid_cap.capabilities&V4L2_CAP_VIDEO_OVERLAY,     "  ", "Supports", "Does not support", "frame buffer overlay" ),
+          capString( vid_cap.capabilities&V4L2_CAP_VBI_CAPTURE,       "  ", "Supports", "Does not support", "VBI capture" ),
+          capString( vid_cap.capabilities&V4L2_CAP_VBI_OUTPUT,      "  ", "Supports", "Does not support", "VBI output" ),
+          capString( vid_cap.capabilities&V4L2_CAP_SLICED_VBI_CAPTURE,  "  ", "Supports", "Does not support", "sliced VBI capture" ),
+          capString( vid_cap.capabilities&V4L2_CAP_SLICED_VBI_OUTPUT,   "  ", "Supports", "Does not support", "sliced VBI output" ),
 #ifdef V4L2_CAP_VIDEO_OUTPUT_OVERLAY
-                    capString( vid_cap.capabilities&V4L2_CAP_VIDEO_OUTPUT_OVERLAY,  "    ", "Supports", "Does not support", "video output overlay" ),
+          capString( vid_cap.capabilities&V4L2_CAP_VIDEO_OUTPUT_OVERLAY,  "  ", "Supports", "Does not support", "video output overlay" ),
 #else // V4L2_CAP_VIDEO_OUTPUT_OVERLAY
-                    "",
+          "",
 #endif // V4L2_CAP_VIDEO_OUTPUT_OVERLAY
-                    capString( vid_cap.capabilities&V4L2_CAP_TUNER,                 "    ", "Has", "Does not have", "tuner" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_AUDIO,                 "    ", "Has", "Does not have", "audio in and/or out" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_RADIO,                 "    ", "Has", "Does not have", "radio" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_READWRITE,             "    ", "Supports", "Does not support", "read/write i/o (X)" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_ASYNCIO,               "    ", "Supports", "Does not support", "async i/o" ),
-                    capString( vid_cap.capabilities&V4L2_CAP_STREAMING,             "    ", "Supports", "Does not support", "streaming i/o (X)" )
-                );
-            }
-            else
-            {
-                sprintf( output+strlen(output), "D:%s|", vid_cap.driver );
-                sprintf( output+strlen(output), "C:%s|", vid_cap.card );
-                sprintf( output+strlen(output), "B:%s|", vid_cap.bus_info );
-                sprintf( output+strlen(output), "V:%u.%u.%u|", (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff  );
-                sprintf( output+strlen(output), "T:0x%x|", vid_cap.capabilities );
-            }
+          capString( vid_cap.capabilities&V4L2_CAP_TUNER,         "  ", "Has", "Does not have", "tuner" ),
+          capString( vid_cap.capabilities&V4L2_CAP_AUDIO,         "  ", "Has", "Does not have", "audio in and/or out" ),
+          capString( vid_cap.capabilities&V4L2_CAP_RADIO,         "  ", "Has", "Does not have", "radio" ),
+          capString( vid_cap.capabilities&V4L2_CAP_READWRITE,       "  ", "Supports", "Does not support", "read/write i/o (X)" ),
+          capString( vid_cap.capabilities&V4L2_CAP_ASYNCIO,         "  ", "Supports", "Does not support", "async i/o" ),
+          capString( vid_cap.capabilities&V4L2_CAP_STREAMING,       "  ", "Supports", "Does not support", "streaming i/o (X)" )
+        );
+      }
+      else
+      {
+        sprintf( output+strlen(output), "D:%s|", vid_cap.driver );
+        sprintf( output+strlen(output), "C:%s|", vid_cap.card );
+        sprintf( output+strlen(output), "B:%s|", vid_cap.bus_info );
+        sprintf( output+strlen(output), "V:%u.%u.%u|", (vid_cap.version>>16)&0xff, (vid_cap.version>>8)&0xff, vid_cap.version&0xff  );
+        sprintf( output+strlen(output), "T:0x%x|", vid_cap.capabilities );
+      }
 
+      if ( verbose )
+        sprintf( output+strlen(output), "  Standards:\n" );
+      else
+        sprintf( output+strlen(output), "S:" );
+      struct v4l2_standard standard;
+      int standardIndex = 0;
+      do
+      {
+        memset( &standard, 0, sizeof(standard) );
+        standard.index = standardIndex;
+
+        if ( vidioctl( vid_fd, VIDIOC_ENUMSTD, &standard ) < 0 )
+        {
+          if ( errno == EINVAL || errno == ENODATA || errno == ENOTTY )
+          {
+            Debug( 6, "Done enumerating standard %d: %d %s", standard.index, errno, strerror(errno) );
+            standardIndex = -1;
+            break;
+          }
+          else
+          {
+            Error( "Failed to enumerate standard %d: %d %s", standard.index, errno, strerror(errno) );
             if ( verbose )
-                sprintf( output+strlen(output), "    Standards:\n" );
+              sprintf( output, "Error, failed to enumerate standard %d: %d %s\n", standard.index, errno, strerror(errno) );
             else
-                sprintf( output+strlen(output), "S:" );
-            struct v4l2_standard standard;
-            int standardIndex = 0;
-            do
-            {
-                memset( &standard, 0, sizeof(standard) );
-                standard.index = standardIndex;
-
-                if ( vidioctl( vid_fd, VIDIOC_ENUMSTD, &standard ) < 0 )
-                {
-                    if ( errno == EINVAL || errno == ENODATA || errno == ENOTTY )
-                    {
-                        Debug( 6, "Done enumerating standard %d: %d %s", standard.index, errno, strerror(errno) );
-                        standardIndex = -1;
-                        break;
-                    }
-                    else
-                    {
-                        Error( "Failed to enumerate standard %d: %d %s", standard.index, errno, strerror(errno) );
-                        if ( verbose )
-                            sprintf( output, "Error, failed to enumerate standard %d: %d %s\n", standard.index, errno, strerror(errno) );
-                        else
-                            sprintf( output, "error%d\n", errno );
-                        return( false );
-                    }
-                }
-                if ( verbose )
-                    sprintf( output+strlen(output), "      %s\n", standard.name );
-                else
-                    sprintf( output+strlen(output), "%s/", standard.name );
-            }
-            while ( standardIndex++ >= 0 );
-            if ( !verbose && output[strlen(output)-1] == '/')
-                output[strlen(output)-1] = '|';
-      
-            if ( verbose )
-                sprintf( output+strlen(output), "  Formats:\n" );
-            else
-                sprintf( output+strlen(output), "F:" );
-            struct v4l2_fmtdesc format;
-            int formatIndex = 0;
-            do
-            {
-                memset( &format, 0, sizeof(format) );
-                format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-                format.index = formatIndex;
-
-                if ( vidioctl( vid_fd, VIDIOC_ENUM_FMT, &format ) < 0 )
-                {
-                    if ( errno == EINVAL )
-                    {
-                        formatIndex = -1;
-                        break;
-                    }
-                    else
-                    {
-                        Error( "Failed to enumerate format %d: %s", format.index, strerror(errno) );
-                        if ( verbose )
-                            sprintf( output, "Error, failed to enumerate format %d: %s\n", format.index, strerror(errno) );
-                        else
-                            sprintf( output, "error%d\n", errno );
-                        return( false );
-                    }
-                }
-                if ( verbose )
-                    sprintf( output+strlen(output), "    %s (%c%c%c%c)\n", format.description, format.pixelformat&0xff, (format.pixelformat>>8)&0xff, (format.pixelformat>>16)&0xff, (format.pixelformat>>24)&0xff );
-                else
-                    sprintf( output+strlen(output), "%c%c%c%c/", format.pixelformat&0xff, (format.pixelformat>>8)&0xff, (format.pixelformat>>16)&0xff, (format.pixelformat>>24)&0xff );
-            }
-            while ( formatIndex++ >= 0 );
-            if ( !verbose )
-                output[strlen(output)-1] = '|';
-
-	if(verbose)
-		sprintf( output+strlen(output), "Crop Capabilities\n" );
-	
-	struct v4l2_cropcap cropcap;
-	memset( &cropcap, 0, sizeof(cropcap) );
-	cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-	if ( vidioctl( vid_fd, VIDIOC_CROPCAP, &cropcap ) < 0 )
-	{
-		if(errno != EINVAL) {
-			/* Failed querying crop capability, write error to the log and continue as if crop is not supported */
-			Error( "Failed to query crop capabilities: %s", strerror(errno) );
-		}
-			
-		if(verbose) {
-			sprintf( output+strlen(output), "  Cropping is not supported\n");
-		} else {
-			/* Send fake crop bounds to not confuse things parsing this, such as monitor probe */
-			sprintf( output+strlen(output), "B:%dx%d|",0,0); 
-		}
-	} else {
-		struct v4l2_crop crop;
-		memset( &crop, 0, sizeof(crop) );
-		crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;  
-		
-		if ( vidioctl( vid_fd, VIDIOC_G_CROP, &crop ) < 0 )
-		{
-			if ( errno != EINVAL )
-			{
-				/* Failed querying crop sizes, write error to the log and continue as if crop is not supported */
-				Error( "Failed to query crop: %s", strerror(errno) );
-			}
-			
-			if ( verbose ) {
-				sprintf( output+strlen(output), "  Cropping is not supported\n");
-			} else {
-				/* Send fake crop bounds to not confuse things parsing this, such as monitor probe */
-				sprintf( output+strlen(output), "B:%dx%d|",0,0); 
-			}
-		} else {
-			/* Cropping supported */
-			if ( verbose ) {
-				sprintf( output+strlen(output), "  Bounds: %d x %d\n", cropcap.bounds.width, cropcap.bounds.height );
-				sprintf( output+strlen(output), "  Default: %d x %d\n", cropcap.defrect.width, cropcap.defrect.height );
-				sprintf( output+strlen(output), "  Current: %d x %d\n", crop.c.width, crop.c.height );
-			} else {
-				sprintf( output+strlen(output), "B:%dx%d|", cropcap.bounds.width, cropcap.bounds.height );
-			}
-		}
-	} /* Crop code */
-
-            struct v4l2_input input;
-            int inputIndex = 0;
-            do
-            {
-                memset( &input, 0, sizeof(input) );
-                input.index = inputIndex;
-
-                if ( vidioctl( vid_fd, VIDIOC_ENUMINPUT, &input ) < 0 )
-                {
-                    if ( errno == EINVAL )
-                    {
-                        break;
-                    }
-                    else
-                    {
-                        Error( "Failed to enumerate input %d: %s", input.index, strerror(errno) );
-                        if ( verbose )
-                            sprintf( output, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno) );
-                        else
-                            sprintf( output, "error%d\n", errno );
-                        return( false );
-                    }
-                }
-            }
-            while ( inputIndex++ >= 0 );
-
-            if ( verbose )
-                sprintf( output+strlen(output), "Inputs: %d\n", inputIndex );
-            else
-                sprintf( output+strlen(output), "I:%d|", inputIndex );
-
-            inputIndex = 0;
-            do
-            {
-                memset( &input, 0, sizeof(input) );
-                input.index = inputIndex;
-
-                if ( vidioctl( vid_fd, VIDIOC_ENUMINPUT, &input ) < 0 )
-                {
-                    if ( errno == EINVAL )
-                    {
-                        inputIndex = -1;
-                        break;
-                    }
-                    else
-                    {
-                        Error( "Failed to enumerate input %d: %s", input.index, strerror(errno) );
-                        if ( verbose )
-                            sprintf( output, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno) );
-                        else
-                            sprintf( output, "error%d\n", errno );
-                        return( false );
-                    }
-                }
-
-                if ( vidioctl( vid_fd, VIDIOC_S_INPUT, &input.index ) < 0 )
-                {
-                    Error( "Failed to set video input %d: %s", input.index, strerror(errno) );
-                    if ( verbose )
-                        sprintf( output, "Error, failed to switch to input %d: %s\n", input.index, strerror(errno) );
-                    else
-                        sprintf( output, "error%d\n", errno );
-                        return( false );
-                }
-
-                if ( verbose )
-                {
-                    sprintf( output+strlen(output), "  Input %d\n", input.index );
-                    sprintf( output+strlen(output), "    Name: %s\n", input.name );
-                    sprintf( output+strlen(output), "    Type: %s\n", input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
-                    sprintf( output+strlen(output), "    Audioset: %08x\n", input.audioset );
-                    sprintf( output+strlen(output), "    Standards: 0x%llx\n", input.std );
-                }
-                else
-                {
-                    sprintf( output+strlen(output), "i%d:%s|", input.index, input.name );
-                    sprintf( output+strlen(output), "i%dT:%s|", input.index, input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
-                    sprintf( output+strlen(output), "i%dS:%llx|", input.index, input.std );
-                }
-
-                if ( verbose )
-                {
-                    sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_POWER, "Power ", "off", "on", " (X)" ) );
-                    sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_SIGNAL, "Signal ", "not detected", "detected", " (X)" ) );
-                    sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_COLOR, "Colour Signal ", "not detected", "detected", "" ) );
-                    sprintf( output+strlen(output), "    %s", capString( input.status&V4L2_IN_ST_NO_H_LOCK, "Horizontal Lock ", "not detected", "detected", "" ) );
-                }
-                else
-                {
-                    sprintf( output+strlen(output), "i%dSP:%d|", input.index, input.status&V4L2_IN_ST_NO_POWER?0:1 );
-                    sprintf( output+strlen(output), "i%dSS:%d|", input.index, input.status&V4L2_IN_ST_NO_SIGNAL?0:1 );
-                    sprintf( output+strlen(output), "i%dSC:%d|", input.index, input.status&V4L2_IN_ST_NO_COLOR?0:1 );
-                    sprintf( output+strlen(output), "i%dHP:%d|", input.index, input.status&V4L2_IN_ST_NO_H_LOCK?0:1 );
-                }
-            }
-            while ( inputIndex++ >= 0 );
-            if ( !verbose )
-                output[strlen(output)-1] = '\n';
+              sprintf( output, "error%d\n", errno );
+            return( false );
+          }
         }
+        if ( verbose )
+          sprintf( output+strlen(output), "    %s\n", standard.name );
+        else
+          sprintf( output+strlen(output), "%s/", standard.name );
+      }
+      while ( standardIndex++ >= 0 );
+      if ( !verbose && output[strlen(output)-1] == '/')
+        output[strlen(output)-1] = '|';
+    
+      if ( verbose )
+        sprintf( output+strlen(output), "  Formats:\n" );
+      else
+        sprintf( output+strlen(output), "F:" );
+      struct v4l2_fmtdesc format;
+      int formatIndex = 0;
+      do
+      {
+        memset( &format, 0, sizeof(format) );
+        format.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+        format.index = formatIndex;
+
+        if ( vidioctl( vid_fd, VIDIOC_ENUM_FMT, &format ) < 0 )
+        {
+          if ( errno == EINVAL )
+          {
+            formatIndex = -1;
+            break;
+          }
+          else
+          {
+            Error( "Failed to enumerate format %d: %s", format.index, strerror(errno) );
+            if ( verbose )
+              sprintf( output, "Error, failed to enumerate format %d: %s\n", format.index, strerror(errno) );
+            else
+              sprintf( output, "error%d\n", errno );
+            return( false );
+          }
+        }
+        if ( verbose )
+          sprintf( output+strlen(output), "  %s (%c%c%c%c)\n", format.description, format.pixelformat&0xff, (format.pixelformat>>8)&0xff, (format.pixelformat>>16)&0xff, (format.pixelformat>>24)&0xff );
+        else
+          sprintf( output+strlen(output), "%c%c%c%c/", format.pixelformat&0xff, (format.pixelformat>>8)&0xff, (format.pixelformat>>16)&0xff, (format.pixelformat>>24)&0xff );
+      }
+      while ( formatIndex++ >= 0 );
+      if ( !verbose )
+        output[strlen(output)-1] = '|';
+
+  if(verbose)
+    sprintf( output+strlen(output), "Crop Capabilities\n" );
+  
+  struct v4l2_cropcap cropcap;
+  memset( &cropcap, 0, sizeof(cropcap) );
+  cropcap.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+  if ( vidioctl( vid_fd, VIDIOC_CROPCAP, &cropcap ) < 0 )
+  {
+    if(errno != EINVAL) {
+      /* Failed querying crop capability, write error to the log and continue as if crop is not supported */
+      Error( "Failed to query crop capabilities: %s", strerror(errno) );
+    }
+      
+    if(verbose) {
+      sprintf( output+strlen(output), "  Cropping is not supported\n");
+    } else {
+      /* Send fake crop bounds to not confuse things parsing this, such as monitor probe */
+      sprintf( output+strlen(output), "B:%dx%d|",0,0); 
+    }
+  } else {
+    struct v4l2_crop crop;
+    memset( &crop, 0, sizeof(crop) );
+    crop.type = V4L2_BUF_TYPE_VIDEO_CAPTURE;  
+    
+    if ( vidioctl( vid_fd, VIDIOC_G_CROP, &crop ) < 0 )
+    {
+      if ( errno != EINVAL )
+      {
+        /* Failed querying crop sizes, write error to the log and continue as if crop is not supported */
+        Error( "Failed to query crop: %s", strerror(errno) );
+      }
+      
+      if ( verbose ) {
+        sprintf( output+strlen(output), "  Cropping is not supported\n");
+      } else {
+        /* Send fake crop bounds to not confuse things parsing this, such as monitor probe */
+        sprintf( output+strlen(output), "B:%dx%d|",0,0); 
+      }
+    } else {
+      /* Cropping supported */
+      if ( verbose ) {
+        sprintf( output+strlen(output), "  Bounds: %d x %d\n", cropcap.bounds.width, cropcap.bounds.height );
+        sprintf( output+strlen(output), "  Default: %d x %d\n", cropcap.defrect.width, cropcap.defrect.height );
+        sprintf( output+strlen(output), "  Current: %d x %d\n", crop.c.width, crop.c.height );
+      } else {
+        sprintf( output+strlen(output), "B:%dx%d|", cropcap.bounds.width, cropcap.bounds.height );
+      }
+    }
+  } /* Crop code */
+
+      struct v4l2_input input;
+      int inputIndex = 0;
+      do
+      {
+        memset( &input, 0, sizeof(input) );
+        input.index = inputIndex;
+
+        if ( vidioctl( vid_fd, VIDIOC_ENUMINPUT, &input ) < 0 )
+        {
+          if ( errno == EINVAL )
+          {
+            break;
+          }
+          else
+          {
+            Error( "Failed to enumerate input %d: %s", input.index, strerror(errno) );
+            if ( verbose )
+              sprintf( output, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno) );
+            else
+              sprintf( output, "error%d\n", errno );
+            return( false );
+          }
+        }
+      }
+      while ( inputIndex++ >= 0 );
+
+      if ( verbose )
+        sprintf( output+strlen(output), "Inputs: %d\n", inputIndex );
+      else
+        sprintf( output+strlen(output), "I:%d|", inputIndex );
+
+      inputIndex = 0;
+      do
+      {
+        memset( &input, 0, sizeof(input) );
+        input.index = inputIndex;
+
+        if ( vidioctl( vid_fd, VIDIOC_ENUMINPUT, &input ) < 0 )
+        {
+          if ( errno == EINVAL )
+          {
+            inputIndex = -1;
+            break;
+          }
+          else
+          {
+            Error( "Failed to enumerate input %d: %s", input.index, strerror(errno) );
+            if ( verbose )
+              sprintf( output, "Error, failed to enumerate input %d: %s\n", input.index, strerror(errno) );
+            else
+              sprintf( output, "error%d\n", errno );
+            return( false );
+          }
+        }
+
+        if ( vidioctl( vid_fd, VIDIOC_S_INPUT, &input.index ) < 0 )
+        {
+          Error( "Failed to set video input %d: %s", input.index, strerror(errno) );
+          if ( verbose )
+            sprintf( output, "Error, failed to switch to input %d: %s\n", input.index, strerror(errno) );
+          else
+            sprintf( output, "error%d\n", errno );
+            return( false );
+        }
+
+        if ( verbose )
+        {
+          sprintf( output+strlen(output), "  Input %d\n", input.index );
+          sprintf( output+strlen(output), "  Name: %s\n", input.name );
+          sprintf( output+strlen(output), "  Type: %s\n", input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
+          sprintf( output+strlen(output), "  Audioset: %08x\n", input.audioset );
+          sprintf( output+strlen(output), "  Standards: 0x%llx\n", input.std );
+        }
+        else
+        {
+          sprintf( output+strlen(output), "i%d:%s|", input.index, input.name );
+          sprintf( output+strlen(output), "i%dT:%s|", input.index, input.type==V4L2_INPUT_TYPE_TUNER?"Tuner":(input.type==V4L2_INPUT_TYPE_CAMERA?"Camera":"Unknown") );
+          sprintf( output+strlen(output), "i%dS:%llx|", input.index, input.std );
+        }
+
+        if ( verbose )
+        {
+          sprintf( output+strlen(output), "  %s", capString( input.status&V4L2_IN_ST_NO_POWER, "Power ", "off", "on", " (X)" ) );
+          sprintf( output+strlen(output), "  %s", capString( input.status&V4L2_IN_ST_NO_SIGNAL, "Signal ", "not detected", "detected", " (X)" ) );
+          sprintf( output+strlen(output), "  %s", capString( input.status&V4L2_IN_ST_NO_COLOR, "Colour Signal ", "not detected", "detected", "" ) );
+          sprintf( output+strlen(output), "  %s", capString( input.status&V4L2_IN_ST_NO_H_LOCK, "Horizontal Lock ", "not detected", "detected", "" ) );
+        }
+        else
+        {
+          sprintf( output+strlen(output), "i%dSP:%d|", input.index, input.status&V4L2_IN_ST_NO_POWER?0:1 );
+          sprintf( output+strlen(output), "i%dSS:%d|", input.index, input.status&V4L2_IN_ST_NO_SIGNAL?0:1 );
+          sprintf( output+strlen(output), "i%dSC:%d|", input.index, input.status&V4L2_IN_ST_NO_COLOR?0:1 );
+          sprintf( output+strlen(output), "i%dHP:%d|", input.index, input.status&V4L2_IN_ST_NO_H_LOCK?0:1 );
+        }
+      }
+      while ( inputIndex++ >= 0 );
+      if ( !verbose )
+        output[strlen(output)-1] = '\n';
+    }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-        if ( version == 1 )
+    if ( version == 1 )
+    {
+      struct video_capability vid_cap;
+      memset( &vid_cap, 0, sizeof(video_capability) );
+      if ( ioctl( vid_fd, VIDIOCGCAP, &vid_cap ) < 0 )
+      {
+        Error( "Failed to get video capabilities: %s", strerror(errno) );
+        if ( verbose )
+          sprintf( output, "Error, failed to get video capabilities %s: %s\n", queryDevice, strerror(errno) );
+        else
+          sprintf( output, "error%d\n", errno );
+        return( false );
+      }
+      if ( verbose )
+      {
+        sprintf( output+strlen(output), "Video Capabilities\n" );
+        sprintf( output+strlen(output), "  Name: %s\n", vid_cap.name );
+        sprintf( output+strlen(output), "  Type: %d\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s", vid_cap.type,
+          vid_cap.type&VID_TYPE_CAPTURE?"  Can capture\n":"",
+          vid_cap.type&VID_TYPE_TUNER?"  Can tune\n":"",
+          vid_cap.type&VID_TYPE_TELETEXT?"  Does teletext\n":"",
+          vid_cap.type&VID_TYPE_OVERLAY?"  Overlay onto frame buffer\n":"",
+          vid_cap.type&VID_TYPE_CHROMAKEY?"  Overlay by chromakey\n":"",
+          vid_cap.type&VID_TYPE_CLIPPING?"  Can clip\n":"",
+          vid_cap.type&VID_TYPE_FRAMERAM?"  Uses the frame buffer memory\n":"",
+          vid_cap.type&VID_TYPE_SCALES?"  Scalable\n":"",
+          vid_cap.type&VID_TYPE_MONOCHROME?"  Monochrome only\n":"",
+          vid_cap.type&VID_TYPE_SUBCAPTURE?"  Can capture subareas of the image\n":"",
+          vid_cap.type&VID_TYPE_MPEG_DECODER?"  Can decode MPEG streams\n":"",
+          vid_cap.type&VID_TYPE_MPEG_ENCODER?"  Can encode MPEG streams\n":"",
+          vid_cap.type&VID_TYPE_MJPEG_DECODER?"  Can decode MJPEG streams\n":"",
+          vid_cap.type&VID_TYPE_MJPEG_ENCODER?"  Can encode MJPEG streams\n":""
+        );
+        sprintf( output+strlen(output), "  Video Channels: %d\n", vid_cap.channels );
+        sprintf( output+strlen(output), "  Audio Channels: %d\n", vid_cap.audios );
+        sprintf( output+strlen(output), "  Maximum Width: %d\n", vid_cap.maxwidth );
+        sprintf( output+strlen(output), "  Maximum Height: %d\n", vid_cap.maxheight );
+        sprintf( output+strlen(output), "  Minimum Width: %d\n", vid_cap.minwidth );
+        sprintf( output+strlen(output), "  Minimum Height: %d\n", vid_cap.minheight );
+      }
+      else
+      {
+        sprintf( output+strlen(output), "N:%s|", vid_cap.name );
+        sprintf( output+strlen(output), "T:%d|", vid_cap.type );
+        sprintf( output+strlen(output), "nC:%d|", vid_cap.channels );
+        sprintf( output+strlen(output), "nA:%d|", vid_cap.audios );
+        sprintf( output+strlen(output), "mxW:%d|", vid_cap.maxwidth );
+        sprintf( output+strlen(output), "mxH:%d|", vid_cap.maxheight );
+        sprintf( output+strlen(output), "mnW:%d|", vid_cap.minwidth );
+        sprintf( output+strlen(output), "mnH:%d|", vid_cap.minheight );
+      }
+
+      struct video_window vid_win;
+      memset( &vid_win, 0, sizeof(video_window) );
+      if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win ) < 0 )
+      {
+        Error( "Failed to get window attributes: %s", strerror(errno) );
+        if ( verbose )
+          sprintf( output, "Error, failed to get window attributes: %s\n", strerror(errno) );
+        else
+          sprintf( output, "error%d\n", errno );
+        return( false );
+      }
+      if ( verbose )
+      {
+        sprintf( output+strlen(output), "Window Attributes\n" );
+        sprintf( output+strlen(output), "  X Offset: %d\n", vid_win.x );
+        sprintf( output+strlen(output), "  Y Offset: %d\n", vid_win.y );
+        sprintf( output+strlen(output), "  Width: %d\n", vid_win.width );
+        sprintf( output+strlen(output), "  Height: %d\n", vid_win.height );
+      }
+      else
+      {
+        sprintf( output+strlen(output), "X:%d|", vid_win.x );
+        sprintf( output+strlen(output), "Y:%d|", vid_win.y );
+        sprintf( output+strlen(output), "W:%d|", vid_win.width );
+        sprintf( output+strlen(output), "H:%d|", vid_win.height );
+      }
+
+      struct video_picture vid_pic;
+      memset( &vid_cap, 0, sizeof(video_picture) );
+      if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic ) < 0 )
+      {
+        Error( "Failed to get picture attributes: %s", strerror(errno) );
+        if ( verbose )
+          sprintf( output, "Error, failed to get picture attributes: %s\n", strerror(errno) );
+        else
+          sprintf( output, "error%d\n", errno );
+        return( false );
+      }
+      if ( verbose )
+      {
+        sprintf( output+strlen(output), "Picture Attributes\n" );
+        sprintf( output+strlen(output), "  Palette: %d - %s\n", vid_pic.palette, 
+          vid_pic.palette==VIDEO_PALETTE_GREY?"Linear greyscale":(
+          vid_pic.palette==VIDEO_PALETTE_HI240?"High 240 cube (BT848)":(
+          vid_pic.palette==VIDEO_PALETTE_RGB565?"565 16 bit RGB":(
+          vid_pic.palette==VIDEO_PALETTE_RGB24?"24bit RGB":(
+          vid_pic.palette==VIDEO_PALETTE_RGB32?"32bit RGB":(
+          vid_pic.palette==VIDEO_PALETTE_RGB555?"555 15bit RGB":(
+          vid_pic.palette==VIDEO_PALETTE_YUV422?"YUV422 capture":(
+          vid_pic.palette==VIDEO_PALETTE_YUYV?"YUYV":(
+          vid_pic.palette==VIDEO_PALETTE_UYVY?"UVYV":(
+          vid_pic.palette==VIDEO_PALETTE_YUV420?"YUV420":(
+          vid_pic.palette==VIDEO_PALETTE_YUV411?"YUV411 capture":(
+          vid_pic.palette==VIDEO_PALETTE_RAW?"RAW capture (BT848)":(
+          vid_pic.palette==VIDEO_PALETTE_YUYV?"YUYV":(
+          vid_pic.palette==VIDEO_PALETTE_YUV422?"YUV422":(
+          vid_pic.palette==VIDEO_PALETTE_YUV422P?"YUV 4:2:2 Planar":(
+          vid_pic.palette==VIDEO_PALETTE_YUV411P?"YUV 4:1:1 Planar":(
+          vid_pic.palette==VIDEO_PALETTE_YUV420P?"YUV 4:2:0 Planar":(
+          vid_pic.palette==VIDEO_PALETTE_YUV410P?"YUV 4:1:0 Planar":"Unknown"
+        ))))))))))))))))));
+        sprintf( output+strlen(output), "  Colour Depth: %d\n", vid_pic.depth );
+        sprintf( output+strlen(output), "  Brightness: %d\n", vid_pic.brightness );
+        sprintf( output+strlen(output), "  Hue: %d\n", vid_pic.hue );
+        sprintf( output+strlen(output), "  Colour :%d\n", vid_pic.colour );
+        sprintf( output+strlen(output), "  Contrast: %d\n", vid_pic.contrast );
+        sprintf( output+strlen(output), "  Whiteness: %d\n", vid_pic.whiteness );
+      }
+      else
+      {
+        sprintf( output+strlen(output), "P:%d|", vid_pic.palette );
+        sprintf( output+strlen(output), "D:%d|", vid_pic.depth );
+        sprintf( output+strlen(output), "B:%d|", vid_pic.brightness );
+        sprintf( output+strlen(output), "h:%d|", vid_pic.hue );
+        sprintf( output+strlen(output), "Cl:%d|", vid_pic.colour );
+        sprintf( output+strlen(output), "Cn:%d|", vid_pic.contrast );
+        sprintf( output+strlen(output), "w:%d|", vid_pic.whiteness );
+      }
+
+      for ( int chan = 0; chan < vid_cap.channels; chan++ )
+      {
+        struct video_channel vid_src;
+        memset( &vid_src, 0, sizeof(video_channel) );
+        vid_src.channel = chan;
+        if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src ) < 0 )
         {
-            struct video_capability vid_cap;
-            memset( &vid_cap, 0, sizeof(video_capability) );
-            if ( ioctl( vid_fd, VIDIOCGCAP, &vid_cap ) < 0 )
-            {
-                Error( "Failed to get video capabilities: %s", strerror(errno) );
-                if ( verbose )
-                    sprintf( output, "Error, failed to get video capabilities %s: %s\n", queryDevice, strerror(errno) );
-                else
-                    sprintf( output, "error%d\n", errno );
-                return( false );
-            }
-            if ( verbose )
-            {
-                sprintf( output+strlen(output), "Video Capabilities\n" );
-                sprintf( output+strlen(output), "  Name: %s\n", vid_cap.name );
-                sprintf( output+strlen(output), "  Type: %d\n%s%s%s%s%s%s%s%s%s%s%s%s%s%s", vid_cap.type,
-                    vid_cap.type&VID_TYPE_CAPTURE?"    Can capture\n":"",
-                    vid_cap.type&VID_TYPE_TUNER?"    Can tune\n":"",
-                    vid_cap.type&VID_TYPE_TELETEXT?"    Does teletext\n":"",
-                    vid_cap.type&VID_TYPE_OVERLAY?"    Overlay onto frame buffer\n":"",
-                    vid_cap.type&VID_TYPE_CHROMAKEY?"    Overlay by chromakey\n":"",
-                    vid_cap.type&VID_TYPE_CLIPPING?"    Can clip\n":"",
-                    vid_cap.type&VID_TYPE_FRAMERAM?"    Uses the frame buffer memory\n":"",
-                    vid_cap.type&VID_TYPE_SCALES?"    Scalable\n":"",
-                    vid_cap.type&VID_TYPE_MONOCHROME?"    Monochrome only\n":"",
-                    vid_cap.type&VID_TYPE_SUBCAPTURE?"    Can capture subareas of the image\n":"",
-                    vid_cap.type&VID_TYPE_MPEG_DECODER?"    Can decode MPEG streams\n":"",
-                    vid_cap.type&VID_TYPE_MPEG_ENCODER?"    Can encode MPEG streams\n":"",
-                    vid_cap.type&VID_TYPE_MJPEG_DECODER?"    Can decode MJPEG streams\n":"",
-                    vid_cap.type&VID_TYPE_MJPEG_ENCODER?"    Can encode MJPEG streams\n":""
-                );
-                sprintf( output+strlen(output), "  Video Channels: %d\n", vid_cap.channels );
-                sprintf( output+strlen(output), "  Audio Channels: %d\n", vid_cap.audios );
-                sprintf( output+strlen(output), "  Maximum Width: %d\n", vid_cap.maxwidth );
-                sprintf( output+strlen(output), "  Maximum Height: %d\n", vid_cap.maxheight );
-                sprintf( output+strlen(output), "  Minimum Width: %d\n", vid_cap.minwidth );
-                sprintf( output+strlen(output), "  Minimum Height: %d\n", vid_cap.minheight );
-            }
-            else
-            {
-                sprintf( output+strlen(output), "N:%s|", vid_cap.name );
-                sprintf( output+strlen(output), "T:%d|", vid_cap.type );
-                sprintf( output+strlen(output), "nC:%d|", vid_cap.channels );
-                sprintf( output+strlen(output), "nA:%d|", vid_cap.audios );
-                sprintf( output+strlen(output), "mxW:%d|", vid_cap.maxwidth );
-                sprintf( output+strlen(output), "mxH:%d|", vid_cap.maxheight );
-                sprintf( output+strlen(output), "mnW:%d|", vid_cap.minwidth );
-                sprintf( output+strlen(output), "mnH:%d|", vid_cap.minheight );
-            }
-
-            struct video_window vid_win;
-            memset( &vid_win, 0, sizeof(video_window) );
-            if ( ioctl( vid_fd, VIDIOCGWIN, &vid_win ) < 0 )
-            {
-                Error( "Failed to get window attributes: %s", strerror(errno) );
-                if ( verbose )
-                    sprintf( output, "Error, failed to get window attributes: %s\n", strerror(errno) );
-                else
-                    sprintf( output, "error%d\n", errno );
-                return( false );
-            }
-            if ( verbose )
-            {
-                sprintf( output+strlen(output), "Window Attributes\n" );
-                sprintf( output+strlen(output), "  X Offset: %d\n", vid_win.x );
-                sprintf( output+strlen(output), "  Y Offset: %d\n", vid_win.y );
-                sprintf( output+strlen(output), "  Width: %d\n", vid_win.width );
-                sprintf( output+strlen(output), "  Height: %d\n", vid_win.height );
-            }
-            else
-            {
-                sprintf( output+strlen(output), "X:%d|", vid_win.x );
-                sprintf( output+strlen(output), "Y:%d|", vid_win.y );
-                sprintf( output+strlen(output), "W:%d|", vid_win.width );
-                sprintf( output+strlen(output), "H:%d|", vid_win.height );
-            }
-
-            struct video_picture vid_pic;
-            memset( &vid_cap, 0, sizeof(video_picture) );
-            if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic ) < 0 )
-            {
-                Error( "Failed to get picture attributes: %s", strerror(errno) );
-                if ( verbose )
-                    sprintf( output, "Error, failed to get picture attributes: %s\n", strerror(errno) );
-                else
-                    sprintf( output, "error%d\n", errno );
-                return( false );
-            }
-            if ( verbose )
-            {
-                sprintf( output+strlen(output), "Picture Attributes\n" );
-                sprintf( output+strlen(output), "  Palette: %d - %s\n", vid_pic.palette, 
-                    vid_pic.palette==VIDEO_PALETTE_GREY?"Linear greyscale":(
-                    vid_pic.palette==VIDEO_PALETTE_HI240?"High 240 cube (BT848)":(
-                    vid_pic.palette==VIDEO_PALETTE_RGB565?"565 16 bit RGB":(
-                    vid_pic.palette==VIDEO_PALETTE_RGB24?"24bit RGB":(
-                    vid_pic.palette==VIDEO_PALETTE_RGB32?"32bit RGB":(
-                    vid_pic.palette==VIDEO_PALETTE_RGB555?"555 15bit RGB":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV422?"YUV422 capture":(
-                    vid_pic.palette==VIDEO_PALETTE_YUYV?"YUYV":(
-                    vid_pic.palette==VIDEO_PALETTE_UYVY?"UVYV":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV420?"YUV420":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV411?"YUV411 capture":(
-                    vid_pic.palette==VIDEO_PALETTE_RAW?"RAW capture (BT848)":(
-                    vid_pic.palette==VIDEO_PALETTE_YUYV?"YUYV":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV422?"YUV422":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV422P?"YUV 4:2:2 Planar":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV411P?"YUV 4:1:1 Planar":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV420P?"YUV 4:2:0 Planar":(
-                    vid_pic.palette==VIDEO_PALETTE_YUV410P?"YUV 4:1:0 Planar":"Unknown"
-                ))))))))))))))))));
-                sprintf( output+strlen(output), "  Colour Depth: %d\n", vid_pic.depth );
-                sprintf( output+strlen(output), "  Brightness: %d\n", vid_pic.brightness );
-                sprintf( output+strlen(output), "  Hue: %d\n", vid_pic.hue );
-                sprintf( output+strlen(output), "  Colour :%d\n", vid_pic.colour );
-                sprintf( output+strlen(output), "  Contrast: %d\n", vid_pic.contrast );
-                sprintf( output+strlen(output), "  Whiteness: %d\n", vid_pic.whiteness );
-            }
-            else
-            {
-                sprintf( output+strlen(output), "P:%d|", vid_pic.palette );
-                sprintf( output+strlen(output), "D:%d|", vid_pic.depth );
-                sprintf( output+strlen(output), "B:%d|", vid_pic.brightness );
-                sprintf( output+strlen(output), "h:%d|", vid_pic.hue );
-                sprintf( output+strlen(output), "Cl:%d|", vid_pic.colour );
-                sprintf( output+strlen(output), "Cn:%d|", vid_pic.contrast );
-                sprintf( output+strlen(output), "w:%d|", vid_pic.whiteness );
-            }
-
-            for ( int chan = 0; chan < vid_cap.channels; chan++ )
-            {
-                struct video_channel vid_src;
-                memset( &vid_src, 0, sizeof(video_channel) );
-                vid_src.channel = chan;
-                if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src ) < 0 )
-                {
-                    Error( "Failed to get channel %d attributes: %s", chan, strerror(errno) );
-                    if ( verbose )
-                        sprintf( output, "Error, failed to get channel %d attributes: %s\n", chan, strerror(errno) );
-                    else
-                        sprintf( output, "error%d\n", errno );
-                    return( false );
-                }
-                if ( verbose )
-                {
-                    sprintf( output+strlen(output), "Channel %d Attributes\n", chan );
-                    sprintf( output+strlen(output), "  Name: %s\n", vid_src.name );
-                    sprintf( output+strlen(output), "  Channel: %d\n", vid_src.channel );
-                    sprintf( output+strlen(output), "  Flags: %d\n%s%s", vid_src.flags,
-                        vid_src.flags&VIDEO_VC_TUNER?"    Channel has a tuner\n":"",
-                        vid_src.flags&VIDEO_VC_AUDIO?"    Channel has audio\n":""
-                    );
-                    sprintf( output+strlen(output), "  Type: %d - %s\n", vid_src.type,
-                        vid_src.type==VIDEO_TYPE_TV?"TV":(
-                        vid_src.type==VIDEO_TYPE_CAMERA?"Camera":"Unknown"
-                    ));
-                    sprintf( output+strlen(output), "  Format: %d - %s\n", vid_src.norm,
-                        vid_src.norm==VIDEO_MODE_PAL?"PAL":(
-                        vid_src.norm==VIDEO_MODE_NTSC?"NTSC":(
-                        vid_src.norm==VIDEO_MODE_SECAM?"SECAM":(
-                        vid_src.norm==VIDEO_MODE_AUTO?"AUTO":"Unknown"
-                    ))));
-                }
-                else
-                {
-                    sprintf( output+strlen(output), "n%d:%s|", chan, vid_src.name );
-                    sprintf( output+strlen(output), "C%d:%d|", chan, vid_src.channel );
-                    sprintf( output+strlen(output), "Fl%d:%x|", chan, vid_src.flags );
-                    sprintf( output+strlen(output), "T%d:%d|", chan, vid_src.type );
-                    sprintf( output+strlen(output), "F%d:%d%s|", chan, vid_src.norm, chan==(vid_cap.channels-1)?"":"," );
-                }
-            }
-            if ( !verbose )
-                output[strlen(output)-1] = '\n';
+          Error( "Failed to get channel %d attributes: %s", chan, strerror(errno) );
+          if ( verbose )
+            sprintf( output, "Error, failed to get channel %d attributes: %s\n", chan, strerror(errno) );
+          else
+            sprintf( output, "error%d\n", errno );
+          return( false );
         }
-#endif // ZM_HAS_V4L1
-        close( vid_fd );
-        if ( device )
-            break;
+        if ( verbose )
+        {
+          sprintf( output+strlen(output), "Channel %d Attributes\n", chan );
+          sprintf( output+strlen(output), "  Name: %s\n", vid_src.name );
+          sprintf( output+strlen(output), "  Channel: %d\n", vid_src.channel );
+          sprintf( output+strlen(output), "  Flags: %d\n%s%s", vid_src.flags,
+            vid_src.flags&VIDEO_VC_TUNER?"  Channel has a tuner\n":"",
+            vid_src.flags&VIDEO_VC_AUDIO?"  Channel has audio\n":""
+          );
+          sprintf( output+strlen(output), "  Type: %d - %s\n", vid_src.type,
+            vid_src.type==VIDEO_TYPE_TV?"TV":(
+            vid_src.type==VIDEO_TYPE_CAMERA?"Camera":"Unknown"
+          ));
+          sprintf( output+strlen(output), "  Format: %d - %s\n", vid_src.norm,
+            vid_src.norm==VIDEO_MODE_PAL?"PAL":(
+            vid_src.norm==VIDEO_MODE_NTSC?"NTSC":(
+            vid_src.norm==VIDEO_MODE_SECAM?"SECAM":(
+            vid_src.norm==VIDEO_MODE_AUTO?"AUTO":"Unknown"
+          ))));
+        }
+        else
+        {
+          sprintf( output+strlen(output), "n%d:%s|", chan, vid_src.name );
+          sprintf( output+strlen(output), "C%d:%d|", chan, vid_src.channel );
+          sprintf( output+strlen(output), "Fl%d:%x|", chan, vid_src.flags );
+          sprintf( output+strlen(output), "T%d:%d|", chan, vid_src.type );
+          sprintf( output+strlen(output), "F%d:%d%s|", chan, vid_src.norm, chan==(vid_cap.channels-1)?"":"," );
+        }
+      }
+      if ( !verbose )
+        output[strlen(output)-1] = '\n';
     }
-    while ( ++devIndex < 32 );
-	return( true );
+#endif // ZM_HAS_V4L1
+    close( vid_fd );
+    if ( device )
+      break;
+  }
+  while ( ++devIndex < 32 );
+  return( true );
 }
 
 int LocalCamera::Brightness( int p_brightness )
 {
 #if ZM_HAS_V4L2
-    if ( v4l_version == 2 )
+  if ( v4l_version == 2 )
+  {
+    struct v4l2_control vid_control;
+
+    memset( &vid_control, 0, sizeof(vid_control) );
+    vid_control.id = V4L2_CID_BRIGHTNESS;
+
+    if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
     {
-        struct v4l2_control vid_control;
-
-        memset( &vid_control, 0, sizeof(vid_control) );
-        vid_control.id = V4L2_CID_BRIGHTNESS;
-
-        if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
-        {
-            if ( errno != EINVAL )
-                Error( "Unable to query brightness: %s", strerror(errno) )
-            else
-                Warning( "Brightness control is not supported" )
-            //Info( "Brightness 1 %d", vid_control.value );
-        }
-        else if ( p_brightness >= 0 )
-        {
-            vid_control.value = p_brightness;
-
-            //Info( "Brightness 2 %d", vid_control.value );
-            /* The driver may clamp the value or return ERANGE, ignored here */
-            if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) )
-            {
-                if ( errno != ERANGE )
-                    Error( "Unable to set brightness: %s", strerror(errno) )
-                else
-                    Warning( "Given brightness value (%d) may be out-of-range", p_brightness )
-            }
-            //Info( "Brightness 3 %d", vid_control.value );
-        }
-        return( vid_control.value );
+      if ( errno != EINVAL )
+        Error( "Unable to query brightness: %s", strerror(errno) )
+      else
+        Warning( "Brightness control is not supported" )
+      //Info( "Brightness 1 %d", vid_control.value );
     }
+    else if ( p_brightness >= 0 )
+    {
+      vid_control.value = p_brightness;
+
+      //Info( "Brightness 2 %d", vid_control.value );
+      /* The driver may clamp the value or return ERANGE, ignored here */
+      if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) )
+      {
+        if ( errno != ERANGE )
+          Error( "Unable to set brightness: %s", strerror(errno) )
+        else
+          Warning( "Given brightness value (%d) may be out-of-range", p_brightness )
+      }
+      //Info( "Brightness 3 %d", vid_control.value );
+    }
+    return( vid_control.value );
+  }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
+  if ( v4l_version == 1 )
+  {
+    struct video_picture vid_pic;
+    memset( &vid_pic, 0, sizeof(video_picture) );
+    if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
     {
-        struct video_picture vid_pic;
-        memset( &vid_pic, 0, sizeof(video_picture) );
-        if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
-        {
-            Error( "Failed to get picture attributes: %s", strerror(errno) );
-            return( -1 );
-        }
-
-        if ( p_brightness >= 0 )
-        {
-            vid_pic.brightness = p_brightness;
-            if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
-            {
-                Error( "Failed to set picture attributes: %s", strerror(errno) );
-                return( -1 );
-            }
-        }
-        return( vid_pic.brightness );
+      Error( "Failed to get picture attributes: %s", strerror(errno) );
+      return( -1 );
     }
+
+    if ( p_brightness >= 0 )
+    {
+      vid_pic.brightness = p_brightness;
+      if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
+      {
+        Error( "Failed to set picture attributes: %s", strerror(errno) );
+        return( -1 );
+      }
+    }
+    return( vid_pic.brightness );
+  }
 #endif // ZM_HAS_V4L1
-    return( -1 );
+  return( -1 );
 }
 
 int LocalCamera::Hue( int p_hue )
 {
 #if ZM_HAS_V4L2
-    if ( v4l_version == 2 )
+  if ( v4l_version == 2 )
+  {
+    struct v4l2_control vid_control;
+
+    memset( &vid_control, 0, sizeof(vid_control) );
+    vid_control.id = V4L2_CID_HUE;
+
+    if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
     {
-        struct v4l2_control vid_control;
-
-        memset( &vid_control, 0, sizeof(vid_control) );
-        vid_control.id = V4L2_CID_HUE;
-
-        if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
-        {
-            if ( errno != EINVAL )
-                Error( "Unable to query hue: %s", strerror(errno) )
-            else
-                Warning( "Hue control is not supported" )
-        }
-        else if ( p_hue >= 0 )
-        {
-            vid_control.value = p_hue;
-
-            /* The driver may clamp the value or return ERANGE, ignored here */
-            if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) < 0 )
-            {
-                if ( errno != ERANGE )
-                    Error( "Unable to set hue: %s", strerror(errno) )
-                else
-                    Warning( "Given hue value (%d) may be out-of-range", p_hue )
-            }
-        }
-        return( vid_control.value );
+      if ( errno != EINVAL )
+        Error( "Unable to query hue: %s", strerror(errno) )
+      else
+        Warning( "Hue control is not supported" )
     }
+    else if ( p_hue >= 0 )
+    {
+      vid_control.value = p_hue;
+
+      /* The driver may clamp the value or return ERANGE, ignored here */
+      if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) < 0 )
+      {
+        if ( errno != ERANGE )
+          Error( "Unable to set hue: %s", strerror(errno) )
+        else
+          Warning( "Given hue value (%d) may be out-of-range", p_hue )
+      }
+    }
+    return( vid_control.value );
+  }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
+  if ( v4l_version == 1 )
+  {
+    struct video_picture vid_pic;
+    memset( &vid_pic, 0, sizeof(video_picture) );
+    if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
     {
-        struct video_picture vid_pic;
-        memset( &vid_pic, 0, sizeof(video_picture) );
-        if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
-        {
-            Error( "Failed to get picture attributes: %s", strerror(errno) );
-            return( -1 );
-        }
-
-        if ( p_hue >= 0 )
-        {
-            vid_pic.hue = p_hue;
-            if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
-            {
-                Error( "Failed to set picture attributes: %s", strerror(errno) );
-                return( -1 );
-            }
-        }
-        return( vid_pic.hue );
+      Error( "Failed to get picture attributes: %s", strerror(errno) );
+      return( -1 );
     }
+
+    if ( p_hue >= 0 )
+    {
+      vid_pic.hue = p_hue;
+      if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
+      {
+        Error( "Failed to set picture attributes: %s", strerror(errno) );
+        return( -1 );
+      }
+    }
+    return( vid_pic.hue );
+  }
 #endif // ZM_HAS_V4L1
-    return( -1 );
+  return( -1 );
 }
 
 int LocalCamera::Colour( int p_colour )
 {
 #if ZM_HAS_V4L2
-    if ( v4l_version == 2 )
+  if ( v4l_version == 2 )
+  {
+    struct v4l2_control vid_control;
+
+    memset( &vid_control, 0, sizeof(vid_control) );
+    vid_control.id = V4L2_CID_SATURATION;
+
+    if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
     {
-        struct v4l2_control vid_control;
-
-        memset( &vid_control, 0, sizeof(vid_control) );
-        vid_control.id = V4L2_CID_SATURATION;
-
-        if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
-        {
-            if ( errno != EINVAL )
-                Error( "Unable to query saturation: %s", strerror(errno) )
-            else
-                Warning( "Saturation control is not supported" )
-        }
-        else if ( p_colour >= 0 )
-        {
-            vid_control.value = p_colour;
-
-            /* The driver may clamp the value or return ERANGE, ignored here */
-            if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) < 0 )
-            {
-                if ( errno != ERANGE )
-                    Error( "Unable to set saturation: %s", strerror(errno) )
-                else
-                    Warning( "Given saturation value (%d) may be out-of-range", p_colour )
-            }
-        }
-        return( vid_control.value );
+      if ( errno != EINVAL )
+        Error( "Unable to query saturation: %s", strerror(errno) )
+      else
+        Warning( "Saturation control is not supported" )
     }
+    else if ( p_colour >= 0 )
+    {
+      vid_control.value = p_colour;
+
+      /* The driver may clamp the value or return ERANGE, ignored here */
+      if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) < 0 )
+      {
+        if ( errno != ERANGE )
+          Error( "Unable to set saturation: %s", strerror(errno) )
+        else
+          Warning( "Given saturation value (%d) may be out-of-range", p_colour )
+      }
+    }
+    return( vid_control.value );
+  }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
+  if ( v4l_version == 1 )
+  {
+    struct video_picture vid_pic;
+    memset( &vid_pic, 0, sizeof(video_picture) );
+    if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
     {
-        struct video_picture vid_pic;
-        memset( &vid_pic, 0, sizeof(video_picture) );
-        if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
-        {
-            Error( "Failed to get picture attributes: %s", strerror(errno) );
-            return( -1 );
-        }
-
-        if ( p_colour >= 0 )
-        {
-            vid_pic.colour = p_colour;
-            if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
-            {
-                Error( "Failed to set picture attributes: %s", strerror(errno) );
-                return( -1 );
-            }
-        }
-        return( vid_pic.colour );
+      Error( "Failed to get picture attributes: %s", strerror(errno) );
+      return( -1 );
     }
+
+    if ( p_colour >= 0 )
+    {
+      vid_pic.colour = p_colour;
+      if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
+      {
+        Error( "Failed to set picture attributes: %s", strerror(errno) );
+        return( -1 );
+      }
+    }
+    return( vid_pic.colour );
+  }
 #endif // ZM_HAS_V4L1
-    return( -1 );
+  return( -1 );
 }
 
 int LocalCamera::Contrast( int p_contrast )
 {
 #if ZM_HAS_V4L2
-    if ( v4l_version == 2 )
+  if ( v4l_version == 2 )
+  {
+    struct v4l2_control vid_control;
+
+    memset( &vid_control, 0, sizeof(vid_control) );
+    vid_control.id = V4L2_CID_CONTRAST;
+
+    if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
     {
-        struct v4l2_control vid_control;
-
-        memset( &vid_control, 0, sizeof(vid_control) );
-        vid_control.id = V4L2_CID_CONTRAST;
-
-        if ( vidioctl( vid_fd, VIDIOC_G_CTRL, &vid_control ) < 0 )
-        {
-            if ( errno != EINVAL )
-                Error( "Unable to query contrast: %s", strerror(errno) )
-            else
-                Warning( "Contrast control is not supported" )
-        }
-        else if ( p_contrast >= 0 )
-        {
-            vid_control.value = p_contrast;
-
-            /* The driver may clamp the value or return ERANGE, ignored here */
-            if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) )
-            {
-                if ( errno != ERANGE )
-                    Error( "Unable to set contrast: %s", strerror(errno) )
-                else
-                    Warning( "Given contrast value (%d) may be out-of-range", p_contrast )
-            }
-        }
-        return( vid_control.value );
+      if ( errno != EINVAL )
+        Error( "Unable to query contrast: %s", strerror(errno) )
+      else
+        Warning( "Contrast control is not supported" )
     }
+    else if ( p_contrast >= 0 )
+    {
+      vid_control.value = p_contrast;
+
+      /* The driver may clamp the value or return ERANGE, ignored here */
+      if ( vidioctl ( vid_fd, VIDIOC_S_CTRL, &vid_control ) )
+      {
+        if ( errno != ERANGE )
+          Error( "Unable to set contrast: %s", strerror(errno) )
+        else
+          Warning( "Given contrast value (%d) may be out-of-range", p_contrast )
+      }
+    }
+    return( vid_control.value );
+  }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-    if ( v4l_version == 1 )
+  if ( v4l_version == 1 )
+  {
+    struct video_picture vid_pic;
+    memset( &vid_pic, 0, sizeof(video_picture) );
+    if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
     {
-        struct video_picture vid_pic;
-        memset( &vid_pic, 0, sizeof(video_picture) );
-        if ( ioctl( vid_fd, VIDIOCGPICT, &vid_pic) < 0 )
-        {
-            Error( "Failed to get picture attributes: %s", strerror(errno) );
-            return( -1 );
-        }
-
-        if ( p_contrast >= 0 )
-        {
-            vid_pic.contrast = p_contrast;
-            if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
-            {
-                Error( "Failed to set picture attributes: %s", strerror(errno) );
-                return( -1 );
-            }
-        }
-        return( vid_pic.contrast );
+      Error( "Failed to get picture attributes: %s", strerror(errno) );
+      return( -1 );
     }
+
+    if ( p_contrast >= 0 )
+    {
+      vid_pic.contrast = p_contrast;
+      if ( ioctl( vid_fd, VIDIOCSPICT, &vid_pic ) < 0 )
+      {
+        Error( "Failed to set picture attributes: %s", strerror(errno) );
+        return( -1 );
+      }
+    }
+    return( vid_pic.contrast );
+  }
 #endif // ZM_HAS_V4L1
-    return( -1 );
+  return( -1 );
 }
 
 int LocalCamera::PrimeCapture()
 {
-    Initialise();
+  Initialise();
 
-    Debug( 2, "Priming capture" );
+  Debug( 2, "Priming capture" );
+#if ZM_HAS_V4L2
+  if ( v4l_version == 2 )
+  {
+    Debug( 3, "Queueing buffers" );
+    for ( unsigned int frame = 0; frame < v4l2_data.reqbufs.count; frame++ )
+    {
+      struct v4l2_buffer vid_buf;
+
+      memset( &vid_buf, 0, sizeof(vid_buf) );
+
+      vid_buf.type = v4l2_data.fmt.type;
+      vid_buf.memory = v4l2_data.reqbufs.memory;
+      vid_buf.index = frame;
+
+      if ( vidioctl( vid_fd, VIDIOC_QBUF, &vid_buf ) < 0 )
+        Fatal( "Failed to queue buffer %d: %s", frame, strerror(errno) );
+    }
+    v4l2_data.bufptr = NULL;
+
+    Debug( 3, "Starting video stream" );
+    //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
+    //enum v4l2_buf_type type = v4l2_data.fmt.type;
+    enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
+    if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
+      Fatal( "Failed to start capture stream: %s", strerror(errno) );
+  }
+#endif // ZM_HAS_V4L2
+#if ZM_HAS_V4L1
+  if ( v4l_version == 1 )
+  {
+    for ( int frame = 0; frame < v4l1_data.frames.frames; frame++ )
+    {
+      Debug( 3, "Queueing frame %d", frame );
+      if ( ioctl( vid_fd, VIDIOCMCAPTURE, &v4l1_data.buffers[frame] ) < 0 )
+      {
+        Error( "Capture failure for frame %d: %s", frame, strerror(errno) );
+        return( -1 );
+      }
+    }
+  }
+#endif // ZM_HAS_V4L1
+
+  return( 0 );
+}
+
+int LocalCamera::PreCapture()
+{
+  Debug( 2, "Pre-capturing" );
+  return( 0 );
+}
+
+int LocalCamera::Capture( Image &image )
+{
+  Debug( 3, "Capturing" );
+  static uint8_t* buffer = NULL;
+  static uint8_t* directbuffer = NULL;
+  static int capture_frame = -1;
+  int buffer_bytesused = 0;
+  
+  int captures_per_frame = 1;
+  if ( channel_count > 1 )
+    captures_per_frame = v4l_captures_per_frame;
+  if ( captures_per_frame <= 0 ) {
+    captures_per_frame = 1;
+    Warning( "Invalid Captures Per Frame setting: %d", captures_per_frame );
+  } 
+  
+  
+  // Do the capture, unless we are the second or subsequent camera on a channel, in which case just reuse the buffer
+  if ( channel_prime )
+  {
 #if ZM_HAS_V4L2
     if ( v4l_version == 2 )
     {
-        Debug( 3, "Queueing buffers" );
-        for ( unsigned int frame = 0; frame < v4l2_data.reqbufs.count; frame++ )
+      static struct v4l2_buffer vid_buf;
+
+      memset( &vid_buf, 0, sizeof(vid_buf) );
+
+      vid_buf.type = v4l2_data.fmt.type;
+      //vid_buf.memory = V4L2_MEMORY_MMAP;
+      vid_buf.memory = v4l2_data.reqbufs.memory;
+
+      Debug( 3, "Capturing %d frames", captures_per_frame );
+      while ( captures_per_frame )
+      {
+        if ( vidioctl( vid_fd, VIDIOC_DQBUF, &vid_buf ) < 0 )
         {
-            struct v4l2_buffer vid_buf;
-
-            memset( &vid_buf, 0, sizeof(vid_buf) );
-
-            vid_buf.type = v4l2_data.fmt.type;
-            vid_buf.memory = v4l2_data.reqbufs.memory;
-            vid_buf.index = frame;
-
-            if ( vidioctl( vid_fd, VIDIOC_QBUF, &vid_buf ) < 0 )
-                Fatal( "Failed to queue buffer %d: %s", frame, strerror(errno) );
+          if ( errno == EIO )
+            Warning( "Capture failure, possible signal loss?: %s", strerror(errno) )
+          else
+            Error( "Unable to capture frame %d: %s", vid_buf.index, strerror(errno) )
+          return( -1 );
         }
-        v4l2_data.bufptr = NULL;
 
-        Debug( 3, "Starting video stream" );
-        //enum v4l2_buf_type type = V4L2_BUF_TYPE_VIDEO_CAPTURE;
-        //enum v4l2_buf_type type = v4l2_data.fmt.type;
-        enum v4l2_buf_type type = (v4l2_buf_type)v4l2_data.fmt.type;
-        if ( vidioctl( vid_fd, VIDIOC_STREAMON, &type ) < 0 )
-            Fatal( "Failed to start capture stream: %s", strerror(errno) );
+        v4l2_data.bufptr = &vid_buf;
+        capture_frame = v4l2_data.bufptr->index;
+        if ( --captures_per_frame )
+        {
+          if ( vidioctl( vid_fd, VIDIOC_QBUF, &vid_buf ) < 0 )
+          {
+            Error( "Unable to requeue buffer %d: %s", vid_buf.index, strerror(errno) );
+            return( -1 );
+          }
+        }
+      }
+
+      Debug( 3, "Captured frame %d/%d from channel %d", capture_frame, v4l2_data.bufptr->sequence, channel );
+
+      buffer = (unsigned char *)v4l2_data.buffers[v4l2_data.bufptr->index].start;
+      buffer_bytesused = v4l2_data.bufptr->bytesused;
+
+      if((v4l2_data.fmt.fmt.pix.width * v4l2_data.fmt.fmt.pix.height) !=  (width * height)) {
+          Fatal("Captured image dimensions differ: V4L2: %dx%d monitor: %dx%d",v4l2_data.fmt.fmt.pix.width,v4l2_data.fmt.fmt.pix.height,width,height);
+      }
+      
     }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
     if ( v4l_version == 1 )
     {
-        for ( int frame = 0; frame < v4l1_data.frames.frames; frame++ )
+      Debug( 3, "Capturing %d frames", captures_per_frame );
+      while ( captures_per_frame )
+      {
+        Debug( 3, "Syncing frame %d", v4l1_data.active_frame );
+        if ( ioctl( vid_fd, VIDIOCSYNC, &v4l1_data.active_frame ) < 0 )
         {
-            Debug( 3, "Queueing frame %d", frame );
-            if ( ioctl( vid_fd, VIDIOCMCAPTURE, &v4l1_data.buffers[frame] ) < 0 )
-            {
-                Error( "Capture failure for frame %d: %s", frame, strerror(errno) );
-                return( -1 );
-            }
+          Error( "Sync failure for frame %d buffer %d: %s", v4l1_data.active_frame, captures_per_frame, strerror(errno) );
+          return( -1 );
         }
+        captures_per_frame--;
+        if ( captures_per_frame )
+        {
+          Debug( 3, "Capturing frame %d", v4l1_data.active_frame );
+          if ( ioctl( vid_fd, VIDIOCMCAPTURE, &v4l1_data.buffers[v4l1_data.active_frame] ) < 0 )
+          {
+            Error( "Capture failure for buffer %d (%d): %s", v4l1_data.active_frame, captures_per_frame, strerror(errno) );
+            return( -1 );
+          }
+        }
+      }
+      capture_frame = v4l1_data.active_frame;
+      Debug( 3, "Captured %d for channel %d", capture_frame, channel );
+
+      buffer = v4l1_data.bufptr+v4l1_data.frames.offsets[capture_frame];
     }
 #endif // ZM_HAS_V4L1
-
-    return( 0 );
-}
-
-int LocalCamera::PreCapture()
-{
-    Debug( 2, "Pre-capturing" );
-	return( 0 );
-}
-
-int LocalCamera::Capture( Image &image )
-{
-	Debug( 3, "Capturing" );
-	static uint8_t* buffer = NULL;
-	static uint8_t* directbuffer = NULL;
-	static int capture_frame = -1;
-	int buffer_bytesused = 0;
-	
-	int captures_per_frame = 1;
-	if ( channel_count > 1 )
-		captures_per_frame = v4l_captures_per_frame;
-	if ( captures_per_frame <= 0 ) {
-		captures_per_frame = 1;
-		Warning( "Invalid Captures Per Frame setting: %d", captures_per_frame );
-	} 
-	
-	
-    // Do the capture, unless we are the second or subsequent camera on a channel, in which case just reuse the buffer
-    if ( channel_prime )
-    {
-#if ZM_HAS_V4L2
-        if ( v4l_version == 2 )
-        {
-            static struct v4l2_buffer vid_buf;
-
-            memset( &vid_buf, 0, sizeof(vid_buf) );
-
-            vid_buf.type = v4l2_data.fmt.type;
-            //vid_buf.memory = V4L2_MEMORY_MMAP;
-            vid_buf.memory = v4l2_data.reqbufs.memory;
-
-            Debug( 3, "Capturing %d frames", captures_per_frame );
-            while ( captures_per_frame )
-            {
-                if ( vidioctl( vid_fd, VIDIOC_DQBUF, &vid_buf ) < 0 )
-                {
-                    if ( errno == EIO )
-                        Warning( "Capture failure, possible signal loss?: %s", strerror(errno) )
-                    else
-                        Error( "Unable to capture frame %d: %s", vid_buf.index, strerror(errno) )
-                    return( -1 );
-                }
-
-                v4l2_data.bufptr = &vid_buf;
-                capture_frame = v4l2_data.bufptr->index;
-                if ( --captures_per_frame )
-                {
-                    if ( vidioctl( vid_fd, VIDIOC_QBUF, &vid_buf ) < 0 )
-                    {
-                        Error( "Unable to requeue buffer %d: %s", vid_buf.index, strerror(errno) );
-                        return( -1 );
-                    }
-                }
-            }
-
-            Debug( 3, "Captured frame %d/%d from channel %d", capture_frame, v4l2_data.bufptr->sequence, channel );
-
-            buffer = (unsigned char *)v4l2_data.buffers[v4l2_data.bufptr->index].start;
-            buffer_bytesused = v4l2_data.bufptr->bytesused;
-
-            if((v4l2_data.fmt.fmt.pix.width * v4l2_data.fmt.fmt.pix.height) !=  (width * height)) {
-                    Fatal("Captured image dimensions differ: V4L2: %dx%d monitor: %dx%d",v4l2_data.fmt.fmt.pix.width,v4l2_data.fmt.fmt.pix.height,width,height);
-            }
-            
-        }
-#endif // ZM_HAS_V4L2
-#if ZM_HAS_V4L1
-        if ( v4l_version == 1 )
-        {
-            Debug( 3, "Capturing %d frames", captures_per_frame );
-            while ( captures_per_frame )
-            {
-                Debug( 3, "Syncing frame %d", v4l1_data.active_frame );
-                if ( ioctl( vid_fd, VIDIOCSYNC, &v4l1_data.active_frame ) < 0 )
-                {
-                    Error( "Sync failure for frame %d buffer %d: %s", v4l1_data.active_frame, captures_per_frame, strerror(errno) );
-                    return( -1 );
-                }
-                captures_per_frame--;
-                if ( captures_per_frame )
-                {
-                    Debug( 3, "Capturing frame %d", v4l1_data.active_frame );
-                    if ( ioctl( vid_fd, VIDIOCMCAPTURE, &v4l1_data.buffers[v4l1_data.active_frame] ) < 0 )
-                    {
-                        Error( "Capture failure for buffer %d (%d): %s", v4l1_data.active_frame, captures_per_frame, strerror(errno) );
-                        return( -1 );
-                    }
-                }
-            }
-            capture_frame = v4l1_data.active_frame;
-            Debug( 3, "Captured %d for channel %d", capture_frame, channel );
-
-            buffer = v4l1_data.bufptr+v4l1_data.frames.offsets[capture_frame];
-        }
-#endif // ZM_HAS_V4L1
-    } /* prime capture */    
+  } /* prime capture */  
+  
+  if(conversion_type != 0) {
     
-	if(conversion_type != 0) {
-		
-		Debug( 3, "Performing format conversion" );
-		
-		/* Request a writeable buffer of the target image */
-		directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-		if(directbuffer == NULL) {
-			Error("Failed requesting writeable buffer for the captured image.");
-			return (-1);
-		}
+    Debug( 3, "Performing format conversion" );
+    
+    /* Request a writeable buffer of the target image */
+    directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
+    if(directbuffer == NULL) {
+      Error("Failed requesting writeable buffer for the captured image.");
+      return (-1);
+    }
 #if HAVE_LIBSWSCALE
-		if(conversion_type == 1) {
-			
-			Debug( 9, "Calling sws_scale to perform the conversion" );
-			/* Use swscale to convert the image directly into the shared memory */
-			avpicture_fill( (AVPicture *)tmpPicture, directbuffer, imagePixFormat, width, height );
-			sws_scale( imgConversionContext, capturePictures[capture_frame]->data, capturePictures[capture_frame]->linesize, 0, height, tmpPicture->data, tmpPicture->linesize );
-		}
-#endif	
-		if(conversion_type == 2) {
-			
-			Debug( 9, "Calling the conversion function" );
-			/* Call the image conversion function and convert directly into the shared memory */
-			(*conversion_fptr)(buffer, directbuffer, pixels);
-		}
-		else if(conversion_type == 3) {
-			
-			Debug( 9, "Decoding the JPEG image" );
-			/* JPEG decoding */
-			image.DecodeJpeg(buffer, buffer_bytesused, colours, subpixelorder);
-		}
-		
-	} else {
-		Debug( 3, "No format conversion performed. Assigning the image" );
-		
-		/* No conversion was performed, the image is in the V4L buffers and needs to be copied into the shared memory */
-		image.Assign( width, height, colours, subpixelorder, buffer, imagesize);
-		
-	}
-	
-	return( 0 );
+    if(conversion_type == 1) {
+      
+      Debug( 9, "Calling sws_scale to perform the conversion" );
+      /* Use swscale to convert the image directly into the shared memory */
+      avpicture_fill( (AVPicture *)tmpPicture, directbuffer, imagePixFormat, width, height );
+      sws_scale( imgConversionContext, capturePictures[capture_frame]->data, capturePictures[capture_frame]->linesize, 0, height, tmpPicture->data, tmpPicture->linesize );
+    }
+#endif  
+    if(conversion_type == 2) {
+      
+      Debug( 9, "Calling the conversion function" );
+      /* Call the image conversion function and convert directly into the shared memory */
+      (*conversion_fptr)(buffer, directbuffer, pixels);
+    }
+    else if(conversion_type == 3) {
+      
+      Debug( 9, "Decoding the JPEG image" );
+      /* JPEG decoding */
+      image.DecodeJpeg(buffer, buffer_bytesused, colours, subpixelorder);
+    }
+    
+  } else {
+    Debug( 3, "No format conversion performed. Assigning the image" );
+    
+    /* No conversion was performed, the image is in the V4L buffers and needs to be copied into the shared memory */
+    image.Assign( width, height, colours, subpixelorder, buffer, imagesize);
+    
+  }
+  
+  return( 0 );
 }
 
 int LocalCamera::PostCapture()
 {
-    Debug( 2, "Post-capturing" );
-    // Requeue the buffer unless we need to switch or are a duplicate camera on a channel
-    if ( channel_count > 1 || channel_prime )
-    {
+  Debug( 2, "Post-capturing" );
+  // Requeue the buffer unless we need to switch or are a duplicate camera on a channel
+  if ( channel_count > 1 || channel_prime )
+  {
 #if ZM_HAS_V4L2
-        if ( v4l_version == 2 )
+    if ( v4l_version == 2 )
+    {
+      if ( channel_count > 1 )
+      {
+        int next_channel = (channel_index+1)%channel_count;
+        Debug( 3, "Switching video source to %d", channels[next_channel] );
+        if ( vidioctl( vid_fd, VIDIOC_S_INPUT, &channels[next_channel] ) < 0 )
         {
-            if ( channel_count > 1 )
-            {
-                int next_channel = (channel_index+1)%channel_count;
-                Debug( 3, "Switching video source to %d", channels[next_channel] );
-                if ( vidioctl( vid_fd, VIDIOC_S_INPUT, &channels[next_channel] ) < 0 )
-                {
-                    Error( "Failed to set camera source %d: %s", channels[next_channel], strerror(errno) );
-                    return( -1 );
-                }
-
-                v4l2_std_id stdId = standards[next_channel];
-                if ( vidioctl( vid_fd, VIDIOC_S_STD, &stdId ) < 0 )
-                {
-                    Error( "Failed to set video format %d: %s", standards[next_channel], strerror(errno) );
-                    return( -1 );
-                }
-            }
-			if ( v4l2_data.bufptr ) {
-				Debug( 3, "Requeueing buffer %d", v4l2_data.bufptr->index );
-				if ( vidioctl( vid_fd, VIDIOC_QBUF, v4l2_data.bufptr ) < 0 )
-				{
-					Error( "Unable to requeue buffer %d: %s", v4l2_data.bufptr->index, strerror(errno) )
-						return( -1 );
-				}
-			} else {
-                Error( "Unable to requeue buffer due to not v4l2_data" )
-			}
+          Error( "Failed to set camera source %d: %s", channels[next_channel], strerror(errno) );
+          return( -1 );
         }
+
+        v4l2_std_id stdId = standards[next_channel];
+        if ( vidioctl( vid_fd, VIDIOC_S_STD, &stdId ) < 0 )
+        {
+          Error( "Failed to set video format %d: %s", standards[next_channel], strerror(errno) );
+          return( -1 );
+        }
+      }
+      if ( v4l2_data.bufptr ) {
+        Debug( 3, "Requeueing buffer %d", v4l2_data.bufptr->index );
+        if ( vidioctl( vid_fd, VIDIOC_QBUF, v4l2_data.bufptr ) < 0 )
+        {
+          Error( "Unable to requeue buffer %d: %s", v4l2_data.bufptr->index, strerror(errno) )
+            return( -1 );
+        }
+      } else {
+        Error( "Unable to requeue buffer due to not v4l2_data" )
+      }
+    }
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-        if ( v4l_version == 1 )
+    if ( v4l_version == 1 )
+    {
+      if ( channel_count > 1 )
+      {
+        Debug( 3, "Switching video source" );
+        int next_channel = (channel_index+1)%channel_count;
+        struct video_channel vid_src;
+        memset( &vid_src, 0, sizeof(vid_src) );
+        vid_src.channel = channel;
+        if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src) < 0 )
         {
-            if ( channel_count > 1 )
-            {
-                Debug( 3, "Switching video source" );
-                int next_channel = (channel_index+1)%channel_count;
-                struct video_channel vid_src;
-                memset( &vid_src, 0, sizeof(vid_src) );
-                vid_src.channel = channel;
-                if ( ioctl( vid_fd, VIDIOCGCHAN, &vid_src) < 0 )
-                {
-                    Error( "Failed to get camera source %d: %s", channel, strerror(errno) );
-                    return(-1);
-                }
-
-                vid_src.channel = channels[next_channel];
-                vid_src.norm = standards[next_channel];
-                vid_src.flags = 0;
-                vid_src.type = VIDEO_TYPE_CAMERA;
-                if ( ioctl( vid_fd, VIDIOCSCHAN, &vid_src ) < 0 )
-                {
-                    Error( "Failed to set camera source %d: %s", channel, strerror(errno) );
-                    return( -1 );
-                }
-            }
-            Debug( 3, "Requeueing frame %d", v4l1_data.active_frame );
-            if ( ioctl( vid_fd, VIDIOCMCAPTURE, &v4l1_data.buffers[v4l1_data.active_frame] ) < 0 )
-            {
-                Error( "Capture failure for frame %d: %s", v4l1_data.active_frame, strerror(errno) );
-                return( -1 );
-            }
-            v4l1_data.active_frame = (v4l1_data.active_frame+1)%v4l1_data.frames.frames;
+          Error( "Failed to get camera source %d: %s", channel, strerror(errno) );
+          return(-1);
         }
-#endif // ZM_HAS_V4L1
+
+        vid_src.channel = channels[next_channel];
+        vid_src.norm = standards[next_channel];
+        vid_src.flags = 0;
+        vid_src.type = VIDEO_TYPE_CAMERA;
+        if ( ioctl( vid_fd, VIDIOCSCHAN, &vid_src ) < 0 )
+        {
+          Error( "Failed to set camera source %d: %s", channel, strerror(errno) );
+          return( -1 );
+        }
+      }
+      Debug( 3, "Requeueing frame %d", v4l1_data.active_frame );
+      if ( ioctl( vid_fd, VIDIOCMCAPTURE, &v4l1_data.buffers[v4l1_data.active_frame] ) < 0 )
+      {
+        Error( "Capture failure for frame %d: %s", v4l1_data.active_frame, strerror(errno) );
+        return( -1 );
+      }
+      v4l1_data.active_frame = (v4l1_data.active_frame+1)%v4l1_data.frames.frames;
     }
-	return( 0 );
+#endif // ZM_HAS_V4L1
+  }
+  return( 0 );
 }
 
 #endif // ZM_HAS_V4L
diff --git a/src/zm_local_camera.h b/src/zm_local_camera.h
index f4b633a20..752943526 100644
--- a/src/zm_local_camera.h
+++ b/src/zm_local_camera.h
@@ -47,100 +47,118 @@ class LocalCamera : public Camera
 {
 protected:
 #if ZM_HAS_V4L2
-    struct V4L2MappedBuffer
-    {
-        void    *start;
-        size_t  length;
-    };
+  struct V4L2MappedBuffer
+  {
+    void  *start;
+    size_t  length;
+  };
 
-    struct V4L2Data
-    {
-        v4l2_cropcap        cropcap;
-        v4l2_crop           crop;
-        v4l2_format         fmt;
-        v4l2_requestbuffers reqbufs;
-        V4L2MappedBuffer    *buffers;
-        v4l2_buffer         *bufptr;
-    };
+  struct V4L2Data
+  {
+    v4l2_cropcap    cropcap;
+    v4l2_crop       crop;
+    v4l2_format     fmt;
+    v4l2_requestbuffers reqbufs;
+    V4L2MappedBuffer  *buffers;
+    v4l2_buffer     *bufptr;
+  };
 #endif // ZM_HAS_V4L2
 
 #if ZM_HAS_V4L1
-    struct V4L1Data
-    {
-        int active_frame;
-        video_mbuf frames;
-        video_mmap *buffers;
-        unsigned char *bufptr;
-    };
+  struct V4L1Data
+  {
+    int active_frame;
+    video_mbuf frames;
+    video_mmap *buffers;
+    unsigned char *bufptr;
+  };
 #endif // ZM_HAS_V4L1
 
 protected:
-	std::string device;
-	int channel;
-	int standard;
-	int palette;
-	bool device_prime;
-	bool channel_prime;
-	int channel_index;
-	unsigned int extras;
-	
-	unsigned int conversion_type; /* 0 = no conversion needed, 1 = use libswscale, 2 = zm internal conversion, 3 = jpeg decoding */
-	convert_fptr_t conversion_fptr; /* Pointer to conversion function used */
-	
-	uint32_t AutoSelectFormat(int p_colours);
+  std::string device;
+  int channel;
+  int standard;
+  int palette;
+  bool device_prime;
+  bool channel_prime;
+  int channel_index;
+  unsigned int extras;
+  
+  unsigned int conversion_type; /* 0 = no conversion needed, 1 = use libswscale, 2 = zm internal conversion, 3 = jpeg decoding */
+  convert_fptr_t conversion_fptr; /* Pointer to conversion function used */
+  
+  uint32_t AutoSelectFormat(int p_colours);
 
-	static int camera_count;
-	static int channel_count;
-	static int channels[VIDEO_MAX_FRAME];
-	static int standards[VIDEO_MAX_FRAME];
-	static int vid_fd;
-	static int v4l_version;
-	bool	v4l_multi_buffer;
-	unsigned int v4l_captures_per_frame;
+  static int camera_count;
+  static int channel_count;
+  static int channels[VIDEO_MAX_FRAME];
+  static int standards[VIDEO_MAX_FRAME];
+  static int vid_fd;
+  static int v4l_version;
+  bool  v4l_multi_buffer;
+  unsigned int v4l_captures_per_frame;
 
 #if ZM_HAS_V4L2
-	static V4L2Data         v4l2_data;
+  static V4L2Data     v4l2_data;
 #endif // ZM_HAS_V4L2
 #if ZM_HAS_V4L1
-	static V4L1Data         v4l1_data;
+  static V4L1Data     v4l1_data;
 #endif // ZM_HAS_V4L1
 
 #if HAVE_LIBSWSCALE
-	static AVFrame    	**capturePictures;
-	_AVPIXELFORMAT       	imagePixFormat;
-	_AVPIXELFORMAT       	capturePixFormat;
-	struct SwsContext 	*imgConversionContext;
-	AVFrame           	*tmpPicture;    
+  static AVFrame    **capturePictures;
+  _AVPIXELFORMAT       imagePixFormat;
+  _AVPIXELFORMAT       capturePixFormat;
+  struct SwsContext   *imgConversionContext;
+  AVFrame         *tmpPicture;  
 #endif // HAVE_LIBSWSCALE
 
-	static LocalCamera      *last_camera;
+  static LocalCamera    *last_camera;
 
 public:
-	LocalCamera( int p_id, const std::string &device, int p_channel, int p_format, bool v4lmultibuffer, unsigned int v4lcapturesperframe, const std::string &p_method, int p_width, int p_height, int p_colours, int p_palette, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, unsigned int p_extras = 0);
-	~LocalCamera();
+  LocalCamera(
+    int p_id,
+    const std::string &device,
+    int p_channel,
+    int p_format,
+    bool v4lmultibuffer,
+    unsigned int v4lcapturesperframe,
+    const std::string &p_method,
+    int p_width,
+    int p_height,
+    int p_colours,
+    int p_palette,
+    int p_brightness,
+    int p_contrast,
+    int p_hue,
+    int p_colour,
+    bool p_capture,
+    bool p_record_audio,
+    unsigned int p_extras = 0);
+  ~LocalCamera();
 
-	void Initialise();
-	void Terminate();
+  void Initialise();
+  void Terminate();
 
-	const std::string &Device() const { return( device ); }
+  const std::string &Device() const { return( device ); }
 
-	int Channel() const { return( channel ); }
-	int Standard() const { return( standard ); }
-	int Palette() const { return( palette ); }
-	int Extras() const { return( extras ); }
+  int Channel() const { return( channel ); }
+  int Standard() const { return( standard ); }
+  int Palette() const { return( palette ); }
+  int Extras() const { return( extras ); }
 
-	int Brightness( int p_brightness=-1 );
-	int Hue( int p_hue=-1 );
-	int Colour( int p_colour=-1 );
-	int Contrast( int p_contrast=-1 );
+  int Brightness( int p_brightness=-1 );
+  int Hue( int p_hue=-1 );
+  int Colour( int p_colour=-1 );
+  int Contrast( int p_contrast=-1 );
 
-	int PrimeCapture();
-	int PreCapture();
-	int Capture( Image &image );
-	int PostCapture();
-    	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
+  int PrimeCapture();
+  int PreCapture();
+  int Capture( Image &image );
+  int PostCapture();
+  int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
 
-	static bool GetCurrentSettings( const char *device, char *output, int version, bool verbose );
+  static bool GetCurrentSettings( const char *device, char *output, int version, bool verbose );
 };
 
 #endif // ZM_HAS_V4L
diff --git a/src/zm_logger.cpp b/src/zm_logger.cpp
index f9f62efb1..4d66deee2 100644
--- a/src/zm_logger.cpp
+++ b/src/zm_logger.cpp
@@ -45,599 +45,599 @@ Logger::IntMap Logger::smSyslogPriorities;
 #if 0
 static void subtractTime( struct timeval * const tp1, struct timeval * const tp2 )
 {
-    tp1->tv_sec -= tp2->tv_sec;
-    if ( tp1->tv_usec <= tp2->tv_usec )
-    {
-        tp1->tv_sec--;
-        tp1->tv_usec = 1000000 - (tp2->tv_usec - tp1->tv_usec);
-    }
-    else
-    {
-        tp1->tv_usec = tp1->tv_usec - tp2->tv_usec;
-    }
+  tp1->tv_sec -= tp2->tv_sec;
+  if ( tp1->tv_usec <= tp2->tv_usec )
+  {
+    tp1->tv_sec--;
+    tp1->tv_usec = 1000000 - (tp2->tv_usec - tp1->tv_usec);
+  }
+  else
+  {
+    tp1->tv_usec = tp1->tv_usec - tp2->tv_usec;
+  }
 }
 #endif
 
 void Logger::usrHandler( int sig )
 {
-    Logger *logger = fetch();
-    if ( sig == SIGUSR1 )
-        logger->level( logger->level()+1 );
-    else if ( sig == SIGUSR2 )
-        logger->level( logger->level()-1 );
-    Info( "Logger - Level changed to %d", logger->level() );
+  Logger *logger = fetch();
+  if ( sig == SIGUSR1 )
+    logger->level( logger->level()+1 );
+  else if ( sig == SIGUSR2 )
+    logger->level( logger->level()-1 );
+  Info( "Logger - Level changed to %d", logger->level() );
 }
 
 Logger::Logger() :
-    mLevel( INFO ),
-    mTermLevel( NOLOG ),
-    mDatabaseLevel( NOLOG ),
-    mFileLevel( NOLOG ),
-    mSyslogLevel( NOLOG ),
-    mEffectiveLevel( NOLOG ),
-    //mLogPath( config.path_logs ),
-    //mLogFile( mLogPath+"/"+mId+".log" ),
-    mDbConnected( false ),
-    mLogFileFP( NULL ),
-    mHasTerm( false ),
-    mFlush( false )
+  mLevel( INFO ),
+  mTermLevel( NOLOG ),
+  mDatabaseLevel( NOLOG ),
+  mFileLevel( NOLOG ),
+  mSyslogLevel( NOLOG ),
+  mEffectiveLevel( NOLOG ),
+  //mLogPath( config.path_logs ),
+  //mLogFile( mLogPath+"/"+mId+".log" ),
+  mDbConnected( false ),
+  mLogFileFP( NULL ),
+  mHasTerm( false ),
+  mFlush( false )
 {
-    if ( smInstance )
+  if ( smInstance )
+  {
+    Panic( "Attempt to create second instance of Logger class" );
+  }
+
+  if ( !smInitialised )
+  {
+    smCodes[INFO] = "INF";
+    smCodes[WARNING] = "WAR";
+    smCodes[ERROR] = "ERR";
+    smCodes[FATAL] = "FAT";
+    smCodes[PANIC] = "PNC";
+    smCodes[NOLOG] = "OFF";
+
+    smSyslogPriorities[INFO] = LOG_INFO;
+    smSyslogPriorities[WARNING] = LOG_WARNING;
+    smSyslogPriorities[ERROR] = LOG_ERR;
+    smSyslogPriorities[FATAL] = LOG_ERR;
+    smSyslogPriorities[PANIC] = LOG_ERR;
+
+    char code[4] = "";
+    for ( int i = DEBUG1; i <= DEBUG9; i++ )
     {
-        Panic( "Attempt to create second instance of Logger class" );
+      snprintf( code, sizeof(code), "DB%d", i );
+      smCodes[i] = code;
+      smSyslogPriorities[i] = LOG_DEBUG;
     }
 
-    if ( !smInitialised )
-    {
-        smCodes[INFO] = "INF";
-        smCodes[WARNING] = "WAR";
-        smCodes[ERROR] = "ERR";
-        smCodes[FATAL] = "FAT";
-        smCodes[PANIC] = "PNC";
-        smCodes[NOLOG] = "OFF";
+    smInitialised = true;
+  }
 
-        smSyslogPriorities[INFO] = LOG_INFO;
-        smSyslogPriorities[WARNING] = LOG_WARNING;
-        smSyslogPriorities[ERROR] = LOG_ERR;
-        smSyslogPriorities[FATAL] = LOG_ERR;
-        smSyslogPriorities[PANIC] = LOG_ERR;
-
-        char code[4] = "";
-        for ( int i = DEBUG1; i <= DEBUG9; i++ )
-        {
-            snprintf( code, sizeof(code), "DB%d", i );
-            smCodes[i] = code;
-            smSyslogPriorities[i] = LOG_DEBUG;
-        }
-
-        smInitialised = true;
-    }
-
-    if ( fileno(stderr) && isatty(fileno(stderr)) )
-        mHasTerm = true;
+  if ( fileno(stderr) && isatty(fileno(stderr)) )
+    mHasTerm = true;
 }
 
 Logger::~Logger()
 {
-    terminate();
+  terminate();
 }
 
 void Logger::initialise( const std::string &id, const Options &options )
 {
-    char *envPtr;
+  char *envPtr;
 
-    if ( !id.empty() )
-        this->id( id );
+  if ( !id.empty() )
+    this->id( id );
 
-    std::string tempLogFile;
-    if ( options.mLogPath.size() )
+  std::string tempLogFile;
+  if ( options.mLogPath.size() )
+  {
+    mLogPath = options.mLogPath;
+    tempLogFile = mLogPath+"/"+mId+".log";
+  }
+  if ( options.mLogFile.size() )
+    tempLogFile = options.mLogFile;
+  else
+    tempLogFile = mLogPath+"/"+mId+".log";
+  if ( (envPtr = getTargettedEnv( "LOG_FILE" )) )
+    tempLogFile = envPtr;
+
+  Level tempLevel = INFO;
+  Level tempTermLevel = mTermLevel;
+  Level tempDatabaseLevel = mDatabaseLevel;
+  Level tempFileLevel = mFileLevel;
+  Level tempSyslogLevel = mSyslogLevel;
+
+  if ( options.mTermLevel != NOOPT )
+    tempTermLevel = options.mTermLevel;
+  if ( options.mDatabaseLevel != NOOPT )
+    tempDatabaseLevel = options.mDatabaseLevel;
+  else
+    tempDatabaseLevel = config.log_level_database >= DEBUG1 ? DEBUG9 : config.log_level_database;
+  if ( options.mFileLevel != NOOPT )
+    tempFileLevel = options.mFileLevel;
+  else
+    tempFileLevel = config.log_level_file >= DEBUG1 ? DEBUG9 : config.log_level_file;
+  if ( options.mSyslogLevel != NOOPT )
+    tempSyslogLevel = options.mSyslogLevel;
+  else
+    tempSyslogLevel = config.log_level_syslog >= DEBUG1 ? DEBUG9 : config.log_level_syslog;
+
+  // Legacy
+  if ( (envPtr = getenv( "LOG_PRINT" )) )
+    tempTermLevel = atoi(envPtr) ? DEBUG9 : NOLOG;
+
+  if ( (envPtr = getTargettedEnv( "LOG_LEVEL" )) )
+    tempLevel = atoi(envPtr);
+
+  if ( (envPtr = getTargettedEnv( "LOG_LEVEL_TERM" )) )
+    tempTermLevel = atoi(envPtr);
+  if ( (envPtr = getTargettedEnv( "LOG_LEVEL_DATABASE" )) )
+    tempDatabaseLevel = atoi(envPtr);
+  if ( (envPtr = getTargettedEnv( "LOG_LEVEL_FILE" )) )
+    tempFileLevel = atoi(envPtr);
+  if ( (envPtr = getTargettedEnv( "LOG_LEVEL_SYSLOG" )) )
+    tempSyslogLevel = atoi(envPtr);
+
+  if ( config.log_debug )
+  {
+    StringVector targets = split( config.log_debug_target, "|" );
+    for ( unsigned int i = 0; i < targets.size(); i++ )
     {
-        mLogPath = options.mLogPath;
-        tempLogFile = mLogPath+"/"+mId+".log";
+      const std::string &target = targets[i];
+      if ( target == mId || target == "_"+mId || target == "_"+mIdRoot || target == "_"+mIdRoot || target == "" )
+      {
+        if ( config.log_debug_level > NOLOG )
+        {
+          tempLevel = config.log_debug_level;
+          if ( config.log_debug_file[0] )
+          {
+            tempLogFile = config.log_debug_file;
+            tempFileLevel = tempLevel;
+          }
+        }
+      }
     }
-    if ( options.mLogFile.size() )
-        tempLogFile = options.mLogFile;
-    else
-        tempLogFile = mLogPath+"/"+mId+".log";
-    if ( (envPtr = getTargettedEnv( "LOG_FILE" )) )
-        tempLogFile = envPtr;
+  }
 
-    Level tempLevel = INFO;
-    Level tempTermLevel = mTermLevel;
-    Level tempDatabaseLevel = mDatabaseLevel;
-    Level tempFileLevel = mFileLevel;
-    Level tempSyslogLevel = mSyslogLevel;
+  logFile( tempLogFile );
 
-    if ( options.mTermLevel != NOOPT )
-        tempTermLevel = options.mTermLevel;
-    if ( options.mDatabaseLevel != NOOPT )
-        tempDatabaseLevel = options.mDatabaseLevel;
-    else
-        tempDatabaseLevel = config.log_level_database >= DEBUG1 ? DEBUG9 : config.log_level_database;
-    if ( options.mFileLevel != NOOPT )
-        tempFileLevel = options.mFileLevel;
-    else
-        tempFileLevel = config.log_level_file >= DEBUG1 ? DEBUG9 : config.log_level_file;
-    if ( options.mSyslogLevel != NOOPT )
-        tempSyslogLevel = options.mSyslogLevel;
-    else
-        tempSyslogLevel = config.log_level_syslog >= DEBUG1 ? DEBUG9 : config.log_level_syslog;
+  termLevel( tempTermLevel );
+  databaseLevel( tempDatabaseLevel );
+  fileLevel( tempFileLevel );
+  syslogLevel( tempSyslogLevel );
 
-    // Legacy
-    if ( (envPtr = getenv( "LOG_PRINT" )) )
-        tempTermLevel = atoi(envPtr) ? DEBUG9 : NOLOG;
+  level( tempLevel );
 
-    if ( (envPtr = getTargettedEnv( "LOG_LEVEL" )) )
-        tempLevel = atoi(envPtr);
+  mFlush = (envPtr = getenv( "LOG_FLUSH")) ? atoi( envPtr ) : false;
 
-    if ( (envPtr = getTargettedEnv( "LOG_LEVEL_TERM" )) )
-        tempTermLevel = atoi(envPtr);
-    if ( (envPtr = getTargettedEnv( "LOG_LEVEL_DATABASE" )) )
-        tempDatabaseLevel = atoi(envPtr);
-    if ( (envPtr = getTargettedEnv( "LOG_LEVEL_FILE" )) )
-        tempFileLevel = atoi(envPtr);
-    if ( (envPtr = getTargettedEnv( "LOG_LEVEL_SYSLOG" )) )
-        tempSyslogLevel = atoi(envPtr);
+  //mRuntime = (envPtr = getenv( "LOG_RUNTIME")) ? atoi( envPtr ) : false;
 
-    if ( config.log_debug )
+  {
+    struct sigaction action;
+    memset( &action, 0, sizeof(action) );
+    action.sa_handler = usrHandler;
+    action.sa_flags = SA_RESTART;
+
+    if ( sigaction( SIGUSR1, &action, 0 ) < 0 )
     {
-        StringVector targets = split( config.log_debug_target, "|" );
-        for ( unsigned int i = 0; i < targets.size(); i++ )
-        {
-            const std::string &target = targets[i];
-            if ( target == mId || target == "_"+mId || target == "_"+mIdRoot || target == "_"+mIdRoot || target == "" )
-            {
-                if ( config.log_debug_level > NOLOG )
-                {
-                    tempLevel = config.log_debug_level;
-                    if ( config.log_debug_file[0] )
-                    {
-                        tempLogFile = config.log_debug_file;
-                        tempFileLevel = tempLevel;
-                    }
-                }
-            }
-        }
+      Fatal( "sigaction(), error = %s", strerror(errno) );
     }
-
-    logFile( tempLogFile );
-
-    termLevel( tempTermLevel );
-    databaseLevel( tempDatabaseLevel );
-    fileLevel( tempFileLevel );
-    syslogLevel( tempSyslogLevel );
-
-    level( tempLevel );
-
-    mFlush = (envPtr = getenv( "LOG_FLUSH")) ? atoi( envPtr ) : false;
-
-    //mRuntime = (envPtr = getenv( "LOG_RUNTIME")) ? atoi( envPtr ) : false;
-
+    if ( sigaction( SIGUSR2, &action, 0 ) < 0)
     {
-        struct sigaction action;
-        memset( &action, 0, sizeof(action) );
-        action.sa_handler = usrHandler;
-        action.sa_flags = SA_RESTART;
-
-        if ( sigaction( SIGUSR1, &action, 0 ) < 0 )
-        {
-            Fatal( "sigaction(), error = %s", strerror(errno) );
-        }
-        if ( sigaction( SIGUSR2, &action, 0 ) < 0)
-        {
-            Fatal( "sigaction(), error = %s", strerror(errno) );
-        }
+      Fatal( "sigaction(), error = %s", strerror(errno) );
     }
+  }
 
-    mInitialised = true;
+  mInitialised = true;
 
-    Debug( 1, "LogOpts: level=%s/%s, screen=%s, database=%s, logfile=%s->%s, syslog=%s", smCodes[mLevel].c_str(), smCodes[mEffectiveLevel].c_str(), smCodes[mTermLevel].c_str(), smCodes[mDatabaseLevel].c_str(), smCodes[mFileLevel].c_str(), mLogFile.c_str(), smCodes[mSyslogLevel].c_str() );
+  Debug( 1, "LogOpts: level=%s/%s, screen=%s, database=%s, logfile=%s->%s, syslog=%s", smCodes[mLevel].c_str(), smCodes[mEffectiveLevel].c_str(), smCodes[mTermLevel].c_str(), smCodes[mDatabaseLevel].c_str(), smCodes[mFileLevel].c_str(), mLogFile.c_str(), smCodes[mSyslogLevel].c_str() );
 }
 
 void Logger::terminate()
 {
-    Debug(1, "Terminating Logger" );
+  Debug(1, "Terminating Logger" );
 
-    if ( mFileLevel > NOLOG )
-        closeFile();
+  if ( mFileLevel > NOLOG )
+    closeFile();
 
-    if ( mSyslogLevel > NOLOG )
-        closeSyslog();
+  if ( mSyslogLevel > NOLOG )
+    closeSyslog();
 
-    if ( mDatabaseLevel > NOLOG )
-        closeDatabase();
+  if ( mDatabaseLevel > NOLOG )
+    closeDatabase();
 }
 
 bool Logger::boolEnv( const std::string &name, bool defaultValue )
 {
-    const char *envPtr = getenv( name.c_str() );
-    return( envPtr ? atoi( envPtr ) : defaultValue );
+  const char *envPtr = getenv( name.c_str() );
+  return( envPtr ? atoi( envPtr ) : defaultValue );
 }
 
 int Logger::intEnv( const std::string &name, bool defaultValue )
 {
-    const char *envPtr = getenv( name.c_str() );
-    return( envPtr ? atoi( envPtr ) : defaultValue );
+  const char *envPtr = getenv( name.c_str() );
+  return( envPtr ? atoi( envPtr ) : defaultValue );
 }
 
 std::string Logger::strEnv( const std::string &name, const std::string defaultValue )
 {
-    const char *envPtr = getenv( name.c_str() );
-    return( envPtr ? envPtr : defaultValue );
+  const char *envPtr = getenv( name.c_str() );
+  return( envPtr ? envPtr : defaultValue );
 }
 
 char *Logger::getTargettedEnv( const std::string &name )
 {
-    char *envPtr = NULL;
-    std::string envName;
+  char *envPtr = NULL;
+  std::string envName;
 
-    envName = name+"_"+mId;
+  envName = name+"_"+mId;
+  envPtr = getenv( envName.c_str() );
+  if ( !envPtr && mId != mIdRoot )
+  {
+    envName = name+"_"+mIdRoot;
     envPtr = getenv( envName.c_str() );
-    if ( !envPtr && mId != mIdRoot )
-    {
-        envName = name+"_"+mIdRoot;
-        envPtr = getenv( envName.c_str() );
-    }
-    if ( !envPtr )
-        envPtr = getenv( name.c_str() );
-    return( envPtr );
+  }
+  if ( !envPtr )
+    envPtr = getenv( name.c_str() );
+  return( envPtr );
 }
 
 const std::string &Logger::id( const std::string &id )
 {
-    std::string tempId = id;
+  std::string tempId = id;
 
-    size_t pos;
-    // Remove whitespace
-    while ( (pos = tempId.find_first_of( " \t" )) != std::string::npos )
+  size_t pos;
+  // Remove whitespace
+  while ( (pos = tempId.find_first_of( " \t" )) != std::string::npos )
+  {
+    tempId.replace( pos, 1, "" );
+  }
+  // Replace non-alphanum with underscore
+  while ( (pos = tempId.find_first_not_of( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_" )) != std::string::npos )
+  {
+    tempId.replace( pos, 1, "_" );
+  }
+  if ( mId != tempId )
+  {
+    mId = tempId;
+    pos = mId.find( '_' );
+    if ( pos != std::string::npos )
     {
-        tempId.replace( pos, 1, "" );
+      mIdRoot = mId.substr( 0, pos );
+      if ( ++pos < mId.size() )
+        mIdArgs = mId.substr( pos );
     }
-    // Replace non-alphanum with underscore
-    while ( (pos = tempId.find_first_not_of( "abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ0123456789_" )) != std::string::npos )
-    {
-        tempId.replace( pos, 1, "_" );
-    }
-    if ( mId != tempId )
-    {
-        mId = tempId;
-        pos = mId.find( '_' );
-        if ( pos != std::string::npos )
-        {
-            mIdRoot = mId.substr( 0, pos );
-            if ( ++pos < mId.size() )
-                mIdArgs = mId.substr( pos );
-        }
-    }
-    return( mId );
+  }
+  return( mId );
 }
 
 Logger::Level Logger::level( Logger::Level level )
 {
-    if ( level > NOOPT )
-    {
-        level = limit(level);
-        if ( mLevel != level )
-            mLevel = level;
+  if ( level > NOOPT )
+  {
+    level = limit(level);
+    if ( mLevel != level )
+      mLevel = level;
 
-        mEffectiveLevel = NOLOG;
-        if ( mTermLevel > mEffectiveLevel )
-            mEffectiveLevel = mTermLevel;
-        if ( mDatabaseLevel > mEffectiveLevel )
-            mEffectiveLevel = mDatabaseLevel;
-        if ( mFileLevel > mEffectiveLevel )
-            mEffectiveLevel = mFileLevel;
-        if ( mSyslogLevel > mEffectiveLevel )
-            mEffectiveLevel = mSyslogLevel;
-        if ( mEffectiveLevel > mLevel)
-            mEffectiveLevel = mLevel;
-    }
-    return( mLevel );
+    mEffectiveLevel = NOLOG;
+    if ( mTermLevel > mEffectiveLevel )
+      mEffectiveLevel = mTermLevel;
+    if ( mDatabaseLevel > mEffectiveLevel )
+      mEffectiveLevel = mDatabaseLevel;
+    if ( mFileLevel > mEffectiveLevel )
+      mEffectiveLevel = mFileLevel;
+    if ( mSyslogLevel > mEffectiveLevel )
+      mEffectiveLevel = mSyslogLevel;
+    if ( mEffectiveLevel > mLevel)
+      mEffectiveLevel = mLevel;
+  }
+  return( mLevel );
 }
 
 Logger::Level Logger::termLevel( Logger::Level termLevel )
 {
-    if ( termLevel > NOOPT )
-    {
-        if ( !mHasTerm )
-            termLevel = NOLOG;
-        termLevel = limit(termLevel);
-        if ( mTermLevel != termLevel )
-            mTermLevel = termLevel;
-    }
-    return( mTermLevel );
+  if ( termLevel > NOOPT )
+  {
+    if ( !mHasTerm )
+      termLevel = NOLOG;
+    termLevel = limit(termLevel);
+    if ( mTermLevel != termLevel )
+      mTermLevel = termLevel;
+  }
+  return( mTermLevel );
 }
 
 Logger::Level Logger::databaseLevel( Logger::Level databaseLevel )
 {
-    if ( databaseLevel > NOOPT )
+  if ( databaseLevel > NOOPT )
+  {
+    databaseLevel = limit(databaseLevel);
+    if ( mDatabaseLevel != databaseLevel )
     {
-        databaseLevel = limit(databaseLevel);
-        if ( mDatabaseLevel != databaseLevel )
+      if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG )
+      {
+        if ( !mDbConnected )
         {
-            if ( databaseLevel > NOLOG && mDatabaseLevel <= NOLOG )
+          if ( !mysql_init( &mDbConnection ) )
+          {
+            Fatal( "Can't initialise database connection: %s", mysql_error( &mDbConnection ) );
+            exit( mysql_errno( &mDbConnection ) );
+          }
+          my_bool reconnect = 1;
+          if ( mysql_options( &mDbConnection, MYSQL_OPT_RECONNECT, &reconnect ) )
+            Fatal( "Can't set database auto reconnect option: %s", mysql_error( &mDbConnection ) );
+          std::string::size_type colonIndex = staticConfig.DB_HOST.find( ":/" );
+          if ( colonIndex != std::string::npos )
+          {
+            std::string dbHost = staticConfig.DB_HOST.substr( 0, colonIndex );
+            std::string dbPort = staticConfig.DB_HOST.substr( colonIndex+1 );
+            if ( !mysql_real_connect( &mDbConnection, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, atoi(dbPort.c_str()), 0, 0 ) )
             {
-                if ( !mDbConnected )
-                {
-                    if ( !mysql_init( &mDbConnection ) )
-                    {
-                        Fatal( "Can't initialise database connection: %s", mysql_error( &mDbConnection ) );
-                        exit( mysql_errno( &mDbConnection ) );
-                    }
-                    my_bool reconnect = 1;
-                    if ( mysql_options( &mDbConnection, MYSQL_OPT_RECONNECT, &reconnect ) )
-                        Fatal( "Can't set database auto reconnect option: %s", mysql_error( &mDbConnection ) );
-                    std::string::size_type colonIndex = staticConfig.DB_HOST.find( ":/" );
-                    if ( colonIndex != std::string::npos )
-                    {
-                        std::string dbHost = staticConfig.DB_HOST.substr( 0, colonIndex );
-                        std::string dbPort = staticConfig.DB_HOST.substr( colonIndex+1 );
-                        if ( !mysql_real_connect( &mDbConnection, dbHost.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, atoi(dbPort.c_str()), 0, 0 ) )
-                        {
-                            Fatal( "Can't connect to database: %s", mysql_error( &mDbConnection ) );
-                            exit( mysql_errno( &mDbConnection ) );
-                        }
-                    }
-                    else
-                    {
-                        if ( !mysql_real_connect( &mDbConnection, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, 0, 0, 0 ) )
-                        {
-                            Fatal( "Can't connect to database: %s", mysql_error( &mDbConnection ) );
-                            exit( mysql_errno( &mDbConnection ) );
-                        }
-                    }
-                    unsigned long mysqlVersion = mysql_get_server_version( &mDbConnection );
-                    if ( mysqlVersion < 50019 )
-                        if ( mysql_options( &mDbConnection, MYSQL_OPT_RECONNECT, &reconnect ) )
-                            Fatal( "Can't set database auto reconnect option: %s", mysql_error( &mDbConnection ) );
-                    if ( mysql_select_db( &mDbConnection, staticConfig.DB_NAME.c_str() ) )
-                    {
-                        Fatal( "Can't select database: %s", mysql_error( &mDbConnection ) );
-                        exit( mysql_errno( &mDbConnection ) );
-                    }
-                    mDbConnected = true;
-                }
+              Fatal( "Can't connect to database: %s", mysql_error( &mDbConnection ) );
+              exit( mysql_errno( &mDbConnection ) );
             }
-            mDatabaseLevel = databaseLevel;
+          }
+          else
+          {
+            if ( !mysql_real_connect( &mDbConnection, staticConfig.DB_HOST.c_str(), staticConfig.DB_USER.c_str(), staticConfig.DB_PASS.c_str(), 0, 0, 0, 0 ) )
+            {
+              Fatal( "Can't connect to database: %s", mysql_error( &mDbConnection ) );
+              exit( mysql_errno( &mDbConnection ) );
+            }
+          }
+          unsigned long mysqlVersion = mysql_get_server_version( &mDbConnection );
+          if ( mysqlVersion < 50019 )
+            if ( mysql_options( &mDbConnection, MYSQL_OPT_RECONNECT, &reconnect ) )
+              Fatal( "Can't set database auto reconnect option: %s", mysql_error( &mDbConnection ) );
+          if ( mysql_select_db( &mDbConnection, staticConfig.DB_NAME.c_str() ) )
+          {
+            Fatal( "Can't select database: %s", mysql_error( &mDbConnection ) );
+            exit( mysql_errno( &mDbConnection ) );
+          }
+          mDbConnected = true;
         }
+      }
+      mDatabaseLevel = databaseLevel;
     }
-    return( mDatabaseLevel );
+  }
+  return( mDatabaseLevel );
 }
 
 Logger::Level Logger::fileLevel( Logger::Level fileLevel )
 {
-    if ( fileLevel > NOOPT )
+  if ( fileLevel > NOOPT )
+  {
+    fileLevel = limit(fileLevel);
+    if ( mFileLevel != fileLevel )
     {
-        fileLevel = limit(fileLevel);
-        if ( mFileLevel != fileLevel )
-        {
-            if ( mFileLevel > NOLOG )
-                closeFile();
-            mFileLevel = fileLevel;
-            if ( mFileLevel > NOLOG )
-                openFile();
-        }
+      if ( mFileLevel > NOLOG )
+        closeFile();
+      mFileLevel = fileLevel;
+      if ( mFileLevel > NOLOG )
+        openFile();
     }
-    return( mFileLevel );
+  }
+  return( mFileLevel );
 }
 
 Logger::Level Logger::syslogLevel( Logger::Level syslogLevel )
 {
-    if ( syslogLevel > NOOPT )
+  if ( syslogLevel > NOOPT )
+  {
+    syslogLevel = limit(syslogLevel);
+    if ( mSyslogLevel != syslogLevel )
     {
-        syslogLevel = limit(syslogLevel);
-        if ( mSyslogLevel != syslogLevel )
-        {
-            if ( mSyslogLevel > NOLOG )
-                closeSyslog();
-            mSyslogLevel = syslogLevel;
-            if ( mSyslogLevel > NOLOG )
-                openSyslog();
-        }
+      if ( mSyslogLevel > NOLOG )
+        closeSyslog();
+      mSyslogLevel = syslogLevel;
+      if ( mSyslogLevel > NOLOG )
+        openSyslog();
     }
-    return( mSyslogLevel );
+  }
+  return( mSyslogLevel );
 }
 
 void Logger::logFile( const std::string &logFile )
 {
-    bool addLogPid = false;
-    std::string tempLogFile = logFile;
-    if ( tempLogFile[tempLogFile.length()-1] == '+' )
-    {
-        tempLogFile.resize(tempLogFile.length()-1);
-        addLogPid = true;
-    }
-    if ( addLogPid )
-        mLogFile = stringtf( "%s.%05d", tempLogFile.c_str(), getpid() );
-    else
-        mLogFile = tempLogFile;
+  bool addLogPid = false;
+  std::string tempLogFile = logFile;
+  if ( tempLogFile[tempLogFile.length()-1] == '+' )
+  {
+    tempLogFile.resize(tempLogFile.length()-1);
+    addLogPid = true;
+  }
+  if ( addLogPid )
+    mLogFile = stringtf( "%s.%05d", tempLogFile.c_str(), getpid() );
+  else
+    mLogFile = tempLogFile;
 }
 
 void Logger::openFile()
 {
-    if ( mLogFile.size() && (mLogFileFP = fopen( mLogFile.c_str() ,"w" )) == (FILE *)NULL )
-    {
-        mFileLevel = NOLOG;
-        Fatal( "fopen() for %s, error = %s", mLogFile.c_str(), strerror(errno) );
-    }
+  if ( mLogFile.size() && (mLogFileFP = fopen( mLogFile.c_str() ,"w" )) == (FILE *)NULL )
+  {
+    mFileLevel = NOLOG;
+    Fatal( "fopen() for %s, error = %s", mLogFile.c_str(), strerror(errno) );
+  }
 }
 
 void Logger::closeFile()
 {
-    if ( mLogFileFP )
+  if ( mLogFileFP )
+  {
+    fflush( mLogFileFP );
+    if ( fclose( mLogFileFP ) < 0 )
     {
-        fflush( mLogFileFP );
-        if ( fclose( mLogFileFP ) < 0 )
-        {
-            Fatal( "fclose(), error = %s",strerror(errno) );
-        }
-        mLogFileFP = (FILE *)NULL;
+      Fatal( "fclose(), error = %s",strerror(errno) );
     }
+    mLogFileFP = (FILE *)NULL;
+  }
 }
 
 void Logger::closeDatabase()
 {
-    if ( mDbConnected )
-    {
-        mysql_close( &mDbConnection );
-        mDbConnected = false;
-    }
+  if ( mDbConnected )
+  {
+    mysql_close( &mDbConnection );
+    mDbConnected = false;
+  }
 }
 
 void Logger::openSyslog()
 {
-    (void) openlog( mId.c_str(), LOG_PID|LOG_NDELAY, LOG_LOCAL1 );
+  (void) openlog( mId.c_str(), LOG_PID|LOG_NDELAY, LOG_LOCAL1 );
 }
 
 void Logger::closeSyslog()
 {
-    (void) closelog();
+  (void) closelog();
 }
 
 void Logger::logPrint( bool hex, const char * const filepath, const int line, const int level, const char *fstring, ... )
 {
-    if ( level <= mEffectiveLevel )
+  if ( level <= mEffectiveLevel )
+  {
+    char      classString[4];
+    char      timeString[64];
+    char      logString[8192];
+    va_list     argPtr;
+    struct timeval  timeVal;
+
+    const char * const file = basename(filepath);
+    
+    if ( level < PANIC || level > DEBUG9 )
+      Panic( "Invalid logger level %d", level );
+
+    strncpy( classString, smCodes[level].c_str(), sizeof(classString) );
+
+    gettimeofday( &timeVal, NULL );
+
+  #if 0
+    if ( logRuntime )
     {
-        char            classString[4];
-        char            timeString[64];
-        char            logString[8192];
-        va_list         argPtr;
-        struct timeval  timeVal;
+      static struct timeval logStart;
 
-        const char * const file = basename(filepath);
-        
-        if ( level < PANIC || level > DEBUG9 )
-            Panic( "Invalid logger level %d", level );
+      subtractTime( &timeVal, &logStart );
 
-        strncpy( classString, smCodes[level].c_str(), sizeof(classString) );
+      snprintf( timeString, sizeof(timeString), "%ld.%03ld", timeVal.tv_sec, timeVal.tv_usec/1000 );
+    }
+    else
+    {
+  #endif
+      char *timePtr = timeString;
+      timePtr += strftime( timePtr, sizeof(timeString), "%x %H:%M:%S", localtime(&timeVal.tv_sec) );
+      snprintf( timePtr, sizeof(timeString)-(timePtr-timeString), ".%06ld", timeVal.tv_usec );
+  #if 0
+    }
+  #endif
 
-        gettimeofday( &timeVal, NULL );
-
-    #if 0
-        if ( logRuntime )
-        {
-            static struct timeval logStart;
-
-            subtractTime( &timeVal, &logStart );
-
-            snprintf( timeString, sizeof(timeString), "%ld.%03ld", timeVal.tv_sec, timeVal.tv_usec/1000 );
-        }
-        else
-        {
-    #endif
-            char *timePtr = timeString;
-            timePtr += strftime( timePtr, sizeof(timeString), "%x %H:%M:%S", localtime(&timeVal.tv_sec) );
-            snprintf( timePtr, sizeof(timeString)-(timePtr-timeString), ".%06ld", timeVal.tv_usec );
-    #if 0
-        }
-    #endif
-
-        pid_t tid;
+    pid_t tid;
 #ifdef __FreeBSD__
-       long lwpid;
-       thr_self(&lwpid);
-       tid = lwpid;
+     long lwpid;
+     thr_self(&lwpid);
+     tid = lwpid;
 
-        if (tid < 0 ) // Thread/Process id
+    if (tid < 0 ) // Thread/Process id
 #else
 #ifdef HAVE_SYSCALL
-	#ifdef __FreeBSD_kernel__
-        if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+  #ifdef __FreeBSD_kernel__
+    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
 
-	# else
-	// SOLARIS doesn't have SYS_gettid; don't assume
-        #ifdef SYS_gettid
-        if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id
-        #endif // SYS_gettid
-	#endif
+  # else
+  // SOLARIS doesn't have SYS_gettid; don't assume
+    #ifdef SYS_gettid
+    if ( (tid = syscall(SYS_gettid)) < 0 ) // Thread/Process id
+    #endif // SYS_gettid
+  #endif
 #endif // HAVE_SYSCALL
 #endif
-        tid = getpid(); // Process id
+    tid = getpid(); // Process id
 
-        char *logPtr = logString;
-        logPtr += snprintf( logPtr, sizeof(logString), "%s %s[%d].%s-%s/%d [", 
-                    timeString,
-                    mId.c_str(),
-                    tid,
-                    classString,
-                    file,
-                    line
-                );
-        char *syslogStart = logPtr;
+    char *logPtr = logString;
+    logPtr += snprintf( logPtr, sizeof(logString), "%s %s[%d].%s-%s/%d [", 
+          timeString,
+          mId.c_str(),
+          tid,
+          classString,
+          file,
+          line
+        );
+    char *syslogStart = logPtr;
 
-        va_start( argPtr, fstring );
-        if ( hex )
-        {
-            unsigned char *data = va_arg( argPtr, unsigned char * );
-            int len = va_arg( argPtr, int );
-            int i;
-            logPtr += snprintf( logPtr, sizeof(logString)-(logPtr-logString), "%d:", len );
-            for ( i = 0; i < len; i++ )
-            {
-                logPtr += snprintf( logPtr, sizeof(logString)-(logPtr-logString), " %02x", data[i] );
-            }
-        }
-        else
-        {
-            logPtr += vsnprintf( logPtr, sizeof(logString)-(logPtr-logString), fstring, argPtr );
-        }
-        va_end(argPtr);
-        char *syslogEnd = logPtr;
-        strncpy( logPtr, "]\n", sizeof(logString)-(logPtr-logString) );   
-
-        if ( level <= mTermLevel )
-        {
-            printf( "%s", logString );
-            fflush( stdout );
-        }
-        if ( level <= mFileLevel )
-        {
-            fprintf( mLogFileFP, "%s", logString );
-            if ( mFlush )
-                fflush( mLogFileFP );
-        }
-        *syslogEnd = '\0';
-        if ( level <= mDatabaseLevel )
-        {
-            char sql[ZM_SQL_MED_BUFSIZ];
-            char escapedString[(strlen(syslogStart)*2)+1];
-
-            mysql_real_escape_string( &mDbConnection, escapedString, syslogStart, strlen(syslogStart) );
-			
-            snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line );
-            if ( mysql_query( &mDbConnection, sql ) )
-            {
-                databaseLevel( NOLOG );
-				Error( "Can't insert log entry: %s", mysql_error( &mDbConnection ) );
-            }
-        }
-        if ( level <= mSyslogLevel )
-        {
-            int priority = smSyslogPriorities[level];
-            //priority |= LOG_DAEMON;
-            syslog( priority, "%s [%s]", classString, syslogStart );
-        }
-
-        if ( level <= FATAL )
-        {
-            if ( level <= PANIC )
-                abort();
-            exit( -1 );
-        }
+    va_start( argPtr, fstring );
+    if ( hex )
+    {
+      unsigned char *data = va_arg( argPtr, unsigned char * );
+      int len = va_arg( argPtr, int );
+      int i;
+      logPtr += snprintf( logPtr, sizeof(logString)-(logPtr-logString), "%d:", len );
+      for ( i = 0; i < len; i++ )
+      {
+        logPtr += snprintf( logPtr, sizeof(logString)-(logPtr-logString), " %02x", data[i] );
+      }
     }
+    else
+    {
+      logPtr += vsnprintf( logPtr, sizeof(logString)-(logPtr-logString), fstring, argPtr );
+    }
+    va_end(argPtr);
+    char *syslogEnd = logPtr;
+    strncpy( logPtr, "]\n", sizeof(logString)-(logPtr-logString) );   
+
+    if ( level <= mTermLevel )
+    {
+      printf( "%s", logString );
+      fflush( stdout );
+    }
+    if ( level <= mFileLevel )
+    {
+      fprintf( mLogFileFP, "%s", logString );
+      if ( mFlush )
+        fflush( mLogFileFP );
+    }
+    *syslogEnd = '\0';
+    if ( level <= mDatabaseLevel )
+    {
+      char sql[ZM_SQL_MED_BUFSIZ];
+      char escapedString[(strlen(syslogStart)*2)+1];
+
+      mysql_real_escape_string( &mDbConnection, escapedString, syslogStart, strlen(syslogStart) );
+      
+      snprintf( sql, sizeof(sql), "insert into Logs ( TimeKey, Component, ServerId, Pid, Level, Code, Message, File, Line ) values ( %ld.%06ld, '%s', %d, %d, %d, '%s', '%s', '%s', %d )", timeVal.tv_sec, timeVal.tv_usec, mId.c_str(), staticConfig.SERVER_ID, tid, level, classString, escapedString, file, line );
+      if ( mysql_query( &mDbConnection, sql ) )
+      {
+        databaseLevel( NOLOG );
+        Error( "Can't insert log entry: %s", mysql_error( &mDbConnection ) );
+      }
+    }
+    if ( level <= mSyslogLevel )
+    {
+      int priority = smSyslogPriorities[level];
+      //priority |= LOG_DAEMON;
+      syslog( priority, "%s [%s]", classString, syslogStart );
+    }
+
+    if ( level <= FATAL )
+    {
+      if ( level <= PANIC )
+        abort();
+      exit( -1 );
+    }
+  }
 }
 
 void logInit( const char *name, const Logger::Options &options )
 {
-    if ( !Logger::smInstance )
-        Logger::smInstance = new Logger();
-    Logger::Options tempOptions = options;
-    tempOptions.mLogPath = config.path_logs;
-    Logger::smInstance->initialise( name, tempOptions );
+  if ( !Logger::smInstance )
+    Logger::smInstance = new Logger();
+  Logger::Options tempOptions = options;
+  tempOptions.mLogPath = config.path_logs;
+  Logger::smInstance->initialise( name, tempOptions );
 }
 
 void logTerm()
 {
-    if ( Logger::smInstance )
-        delete Logger::smInstance;
+  if ( Logger::smInstance )
+    delete Logger::smInstance;
 }
diff --git a/src/zm_logger.h b/src/zm_logger.h
index 8477d61ed..d30396056 100644
--- a/src/zm_logger.h
+++ b/src/zm_logger.h
@@ -33,190 +33,190 @@
 class Logger
 {
 public:
-    enum { 
-        NOOPT=-6,
-        NOLOG,
-        PANIC,
-        FATAL,
-        ERROR,
-        WARNING,
-        INFO,
-        DEBUG1,
-        DEBUG2,
-        DEBUG3,
-        DEBUG4,
-        DEBUG5,
-        DEBUG6,
-        DEBUG7,
-        DEBUG8,
-        DEBUG9
-    };
+  enum { 
+    NOOPT=-6,
+    NOLOG,
+    PANIC,
+    FATAL,
+    ERROR,
+    WARNING,
+    INFO,
+    DEBUG1,
+    DEBUG2,
+    DEBUG3,
+    DEBUG4,
+    DEBUG5,
+    DEBUG6,
+    DEBUG7,
+    DEBUG8,
+    DEBUG9
+  };
 
-    typedef int Level;
+  typedef int Level;
 
-    typedef std::map<Level,std::string> StringMap;
-    typedef std::map<Level,int> IntMap;
+  typedef std::map<Level,std::string> StringMap;
+  typedef std::map<Level,int> IntMap;
 
-    class Options
-    {
-    public:
-        int mTermLevel;
-        int mDatabaseLevel;
-        int mFileLevel;
-        int mSyslogLevel;
+  class Options
+  {
+  public:
+    int mTermLevel;
+    int mDatabaseLevel;
+    int mFileLevel;
+    int mSyslogLevel;
 
-        std::string mLogPath;
-        std::string mLogFile;
-
-    public:
-        Options( Level termLevel=NOOPT, Level databaseLevel=NOOPT, Level fileLevel=NOOPT, Level syslogLevel=NOOPT, const std::string &logPath=".", const std::string &logFile="" ) :
-            mTermLevel( termLevel ),
-            mDatabaseLevel( databaseLevel ),
-            mFileLevel( fileLevel ),
-            mSyslogLevel( syslogLevel ),
-            mLogPath( logPath ),
-            mLogFile( logFile )
-        {
-        }
-    };
-
-private:
-    static bool smInitialised;
-    static Logger *smInstance;
-
-    static StringMap smCodes;
-    static IntMap smSyslogPriorities;
-
-private:
-    bool mInitialised;
-
-    std::string mId;
-    std::string mIdRoot;
-    std::string mIdArgs;
-
-    Level mLevel;           // Level that is currently in operation
-    Level mTermLevel;       // Maximum level output via terminal
-    Level mDatabaseLevel;   // Maximum level output via database
-    Level mFileLevel;       // Maximum level output via file
-    Level mSyslogLevel;     // Maximum level output via syslog
-    Level mEffectiveLevel;  // Level optimised to take account of maxima
-
-    bool mDbConnected;
-    MYSQL mDbConnection;
     std::string mLogPath;
     std::string mLogFile;
-    FILE *mLogFileFP;
 
-    bool mHasTerm;
-    bool mFlush;
+  public:
+    Options( Level termLevel=NOOPT, Level databaseLevel=NOOPT, Level fileLevel=NOOPT, Level syslogLevel=NOOPT, const std::string &logPath=".", const std::string &logFile="" ) :
+      mTermLevel( termLevel ),
+      mDatabaseLevel( databaseLevel ),
+      mFileLevel( fileLevel ),
+      mSyslogLevel( syslogLevel ),
+      mLogPath( logPath ),
+      mLogFile( logFile )
+    {
+    }
+  };
 
 private:
-    static void usrHandler( int sig );
+  static bool smInitialised;
+  static Logger *smInstance;
 
-public:
-    friend void logInit( const char *name, const Options &options );
-    friend void logTerm();
-
-    static Logger *fetch()
-    {
-        if ( !smInstance )
-        {
-            smInstance = new Logger();
-            Options options;
-            smInstance->initialise( "undef", options );
-        }
-        return( smInstance );
-    }
+  static StringMap smCodes;
+  static IntMap smSyslogPriorities;
 
 private:
-    Logger();
-    ~Logger();
+  bool mInitialised;
 
-public:
-    void initialise( const std::string &id, const Options &options );
-    void terminate();
+  std::string mId;
+  std::string mIdRoot;
+  std::string mIdArgs;
+
+  Level mLevel;       // Level that is currently in operation
+  Level mTermLevel;     // Maximum level output via terminal
+  Level mDatabaseLevel;   // Maximum level output via database
+  Level mFileLevel;     // Maximum level output via file
+  Level mSyslogLevel;   // Maximum level output via syslog
+  Level mEffectiveLevel;  // Level optimised to take account of maxima
+
+  bool mDbConnected;
+  MYSQL mDbConnection;
+  std::string mLogPath;
+  std::string mLogFile;
+  FILE *mLogFileFP;
+
+  bool mHasTerm;
+  bool mFlush;
 
 private:
-    int limit( int level )
-    {
-        if ( level > DEBUG9 )
-            return( DEBUG9 );
-        if ( level < NOLOG )
-            return( NOLOG );
-        return( level );
-    }
-
-    bool boolEnv( const std::string &name, bool defaultValue=false );
-    int intEnv( const std::string &name, bool defaultValue=0 );
-    std::string strEnv( const std::string &name, const std::string defaultValue="" );
-    char *getTargettedEnv( const std::string &name );
-
-    void loadEnv();
+  static void usrHandler( int sig );
 
 public:
-    const std::string &id() const
+  friend void logInit( const char *name, const Options &options );
+  friend void logTerm();
+
+  static Logger *fetch()
+  {
+    if ( !smInstance )
     {
-        return( mId );
+      smInstance = new Logger();
+      Options options;
+      smInstance->initialise( "undef", options );
     }
-
-    const std::string &id( const std::string &id );
-
-    Level level() const
-    {
-        return( mLevel );
-    }
-    Level level( Level=NOOPT );
-
-    bool debugOn()
-    {
-        return( mEffectiveLevel >= DEBUG1 );
-    }
-
-    Level termLevel( Level=NOOPT );
-    Level databaseLevel( Level=NOOPT );
-    Level fileLevel( Level=NOOPT );
-    Level syslogLevel( Level=NOOPT );
+    return( smInstance );
+  }
 
 private:
-    void logFile( const std::string &logFile );
-    void openFile();
-    void closeFile();
-    void openSyslog();
-    void closeSyslog();
-    void closeDatabase();
+  Logger();
+  ~Logger();
 
 public:
-    void logPrint( bool hex, const char * const filepath, const int line, const int level, const char *fstring, ... );
+  void initialise( const std::string &id, const Options &options );
+  void terminate();
+
+private:
+  int limit( int level )
+  {
+    if ( level > DEBUG9 )
+      return( DEBUG9 );
+    if ( level < NOLOG )
+      return( NOLOG );
+    return( level );
+  }
+
+  bool boolEnv( const std::string &name, bool defaultValue=false );
+  int intEnv( const std::string &name, bool defaultValue=0 );
+  std::string strEnv( const std::string &name, const std::string defaultValue="" );
+  char *getTargettedEnv( const std::string &name );
+
+  void loadEnv();
+
+public:
+  const std::string &id() const
+  {
+    return( mId );
+  }
+
+  const std::string &id( const std::string &id );
+
+  Level level() const
+  {
+    return( mLevel );
+  }
+  Level level( Level=NOOPT );
+
+  bool debugOn()
+  {
+    return( mEffectiveLevel >= DEBUG1 );
+  }
+
+  Level termLevel( Level=NOOPT );
+  Level databaseLevel( Level=NOOPT );
+  Level fileLevel( Level=NOOPT );
+  Level syslogLevel( Level=NOOPT );
+
+private:
+  void logFile( const std::string &logFile );
+  void openFile();
+  void closeFile();
+  void openSyslog();
+  void closeSyslog();
+  void closeDatabase();
+
+public:
+  void logPrint( bool hex, const char * const filepath, const int line, const int level, const char *fstring, ... );
 };
 
 void logInit( const char *name, const Logger::Options &options=Logger::Options() );
 void logTerm();
 inline const std::string &logId()
 {
-    return( Logger::fetch()->id() );
+  return( Logger::fetch()->id() );
 }
 inline Logger::Level logLevel()
 {
-    return( Logger::fetch()->level() );
+  return( Logger::fetch()->level() );
 }
 inline void logCapLevel( Logger::Level level )
 {
-    Logger::fetch()->level( level );
+  Logger::fetch()->level( level );
 }
 inline Logger::Level logDebugging()
 {
-    return( Logger::fetch()->debugOn() );
+  return( Logger::fetch()->debugOn() );
 }
 
 #define logPrintf(logLevel,params...)  {\
-        if ( logLevel <= Logger::fetch()->level() )\
-            Logger::fetch()->logPrint( false, __FILE__, __LINE__, logLevel, ##params );\
-    }
+    if ( logLevel <= Logger::fetch()->level() )\
+      Logger::fetch()->logPrint( false, __FILE__, __LINE__, logLevel, ##params );\
+  }
 
 #define logHexdump(logLevel,data,len)  {\
-        if ( logLevel <= Logger::fetch()->level() )\
-            Logger::fetch()->logPrint( true, __FILE__, __LINE__, logLevel, "%p (%d)", data, len );\
-    }
+    if ( logLevel <= Logger::fetch()->level() )\
+      Logger::fetch()->logPrint( true, __FILE__, __LINE__, logLevel, "%p (%d)", data, len );\
+  }
 
 /* Debug compiled out */
 #ifndef DBG_OFF
@@ -228,19 +228,19 @@ inline Logger::Level logDebugging()
 #endif
 
 /* Standard debug calls */
-#define Info(params...)     logPrintf(Logger::INFO,##params)
+#define Info(params...)   logPrintf(Logger::INFO,##params)
 #define Warning(params...)  logPrintf(Logger::WARNING,##params)
-#define Error(params...)    logPrintf(Logger::ERROR,##params)
-#define Fatal(params...)    logPrintf(Logger::FATAL,##params)
-#define Panic(params...)    logPrintf(Logger::PANIC,##params)
-#define Mark()              Info("Mark/%s/%d",__FILE__,__LINE__)
-#define Log()               Info("Log")
+#define Error(params...)  logPrintf(Logger::ERROR,##params)
+#define Fatal(params...)  logPrintf(Logger::FATAL,##params)
+#define Panic(params...)  logPrintf(Logger::PANIC,##params)
+#define Mark()        Info("Mark/%s/%d",__FILE__,__LINE__)
+#define Log()         Info("Log")
 #ifdef __GNUC__
-#define Enter(level)        logPrintf(level,("Entering %s",__PRETTY_FUNCTION__))
-#define Exit(level)         logPrintf(level,("Exiting %s",__PRETTY_FUNCTION__))
+#define Enter(level)    logPrintf(level,("Entering %s",__PRETTY_FUNCTION__))
+#define Exit(level)     logPrintf(level,("Exiting %s",__PRETTY_FUNCTION__))
 #else
-#define Enter(level)        
-#define Exit(level)         
+#define Enter(level)    
+#define Exit(level)     
 #endif
 
 #endif // ZM_LOGGER_H
diff --git a/src/zm_mem_utils.h b/src/zm_mem_utils.h
index 8ce1ceea1..351fa3ac8 100644
--- a/src/zm_mem_utils.h
+++ b/src/zm_mem_utils.h
@@ -24,138 +24,138 @@
 #include "zm.h"
 
 inline void* zm_mallocaligned(unsigned int reqalignment, size_t reqsize) {
-	uint8_t* retptr;
+  uint8_t* retptr;
 #if HAVE_POSIX_MEMALIGN
-	if(posix_memalign((void**)&retptr,reqalignment,reqsize) != 0)
-		return NULL;
-	
-	return retptr;
+  if(posix_memalign((void**)&retptr,reqalignment,reqsize) != 0)
+    return NULL;
+  
+  return retptr;
 #else
-	uint8_t* alloc;
-	retptr = (uint8_t*)malloc(reqsize+reqalignment+sizeof(void*));
-	
-	if(retptr == NULL)
-		return NULL;
-	
-	alloc = retptr + sizeof(void*);
-	
-	if(((long)alloc % reqalignment) != 0)
-		alloc = alloc + (reqalignment - ((long)alloc % reqalignment));
-	
-	/* Store a pointer before to the start of the block, just before returned aligned memory */
-	*(void**)(alloc - sizeof(void*)) = retptr;
-	
-	return alloc;
+  uint8_t* alloc;
+  retptr = (uint8_t*)malloc(reqsize+reqalignment+sizeof(void*));
+  
+  if(retptr == NULL)
+    return NULL;
+  
+  alloc = retptr + sizeof(void*);
+  
+  if(((long)alloc % reqalignment) != 0)
+    alloc = alloc + (reqalignment - ((long)alloc % reqalignment));
+  
+  /* Store a pointer before to the start of the block, just before returned aligned memory */
+  *(void**)(alloc - sizeof(void*)) = retptr;
+  
+  return alloc;
 #endif
 }
 
 inline void zm_freealigned(void* ptr) {
 #if HAVE_POSIX_MEMALIGN
-	free(ptr);
+  free(ptr);
 #else
-	/* Start of block is stored before the block if it was allocated by zm_mallocaligned */
-	free(*(void**)((uint8_t*)ptr - sizeof(void*)));
+  /* Start of block is stored before the block if it was allocated by zm_mallocaligned */
+  free(*(void**)((uint8_t*)ptr - sizeof(void*)));
 #endif
 }
 
 inline char *mempbrk( register const char *s, const char *accept, size_t limit )
 {
-    if ( limit <= 0 || !s || !accept || !*accept )
-        return( 0 );
-
-    register unsigned int i,j;
-    size_t acc_len = strlen( accept );
-
-    for ( i = 0; i < limit; s++, i++ )
-    {
-        for ( j = 0; j < acc_len; j++ )
-        {
-            if ( *s == accept[j] )
-            {
-                return( (char *)s );
-            }
-        }
-    }
+  if ( limit <= 0 || !s || !accept || !*accept )
     return( 0 );
+
+  register unsigned int i,j;
+  size_t acc_len = strlen( accept );
+
+  for ( i = 0; i < limit; s++, i++ )
+  {
+    for ( j = 0; j < acc_len; j++ )
+    {
+      if ( *s == accept[j] )
+      {
+        return( (char *)s );
+      }
+    }
+  }
+  return( 0 );
 }
 
 inline char *memstr( register const char *s, const char *n, size_t limit )
 {
-    if ( limit <= 0 || !s || !n )
-        return( 0 );
-
-    if ( !*n )
-        return( (char *)s );
-
-    register unsigned int i,j,k;
-    size_t n_len = strlen( n );
-
-    for ( i = 0; i < limit; i++, s++ )
-    {
-        if ( *s != *n )
-            continue;
-        j = 1;
-        k = 1;
-        while ( true )
-        {
-            if ( k >= n_len )
-                return( (char *)s );
-            if ( s[j++] != n[k++] )
-                break;
-        }
-    }
+  if ( limit <= 0 || !s || !n )
     return( 0 );
+
+  if ( !*n )
+    return( (char *)s );
+
+  register unsigned int i,j,k;
+  size_t n_len = strlen( n );
+
+  for ( i = 0; i < limit; i++, s++ )
+  {
+    if ( *s != *n )
+      continue;
+    j = 1;
+    k = 1;
+    while ( true )
+    {
+      if ( k >= n_len )
+        return( (char *)s );
+      if ( s[j++] != n[k++] )
+        break;
+    }
+  }
+  return( 0 );
 }
 
 inline size_t memspn( register const char *s, const char *accept, size_t limit )
 {
-    if ( limit <= 0 || !s || !accept || !*accept )
-        return( 0 );
+  if ( limit <= 0 || !s || !accept || !*accept )
+    return( 0 );
 
-    register unsigned int i,j;
-    size_t acc_len = strlen( accept );
+  register unsigned int i,j;
+  size_t acc_len = strlen( accept );
 
-    for ( i = 0; i < limit; s++, i++ )
+  for ( i = 0; i < limit; s++, i++ )
+  {
+    register bool found = false;
+    for ( j = 0; j < acc_len; j++ )
     {
-        register bool found = false;
-        for ( j = 0; j < acc_len; j++ )
-        {
-            if ( *s == accept[j] )
-            {
-                found = true;
-                break;
-            }
-        }
-        if ( !found )
-        {
-            return( i );
-        }
+      if ( *s == accept[j] )
+      {
+        found = true;
+        break;
+      }
     }
-    return( limit );
+    if ( !found )
+    {
+      return( i );
+    }
+  }
+  return( limit );
 }
 
 inline size_t memcspn( register const char *s, const char *reject, size_t limit )
 {
-    if ( limit <= 0 || !s || !reject )
-        return( 0 );
+  if ( limit <= 0 || !s || !reject )
+    return( 0 );
 
-    if ( !*reject )
-        return( limit );
-
-    register unsigned int i,j;
-    size_t rej_len = strlen( reject );
-
-    for ( i = 0; i < limit; s++, i++ )
-    {
-        for ( j = 0; j < rej_len; j++ )
-        {
-            if ( *s == reject[j] )
-            {
-                return( i );
-            }
-        }
-    }
+  if ( !*reject )
     return( limit );
+
+  register unsigned int i,j;
+  size_t rej_len = strlen( reject );
+
+  for ( i = 0; i < limit; s++, i++ )
+  {
+    for ( j = 0; j < rej_len; j++ )
+    {
+      if ( *s == reject[j] )
+      {
+        return( i );
+      }
+    }
+  }
+  return( limit );
 }
 
 #endif // ZM_MEM_UTILS_H
diff --git a/src/zm_monitor.cpp b/src/zm_monitor.cpp
old mode 100755
new mode 100644
index 2d596746f..7cbac5d15
--- a/src/zm_monitor.cpp
+++ b/src/zm_monitor.cpp
@@ -63,13 +63,13 @@
 
 //=============================================================================
 std::vector<std::string> split(const std::string &s, char delim) {
-    std::vector<std::string> elems;
-    std::stringstream ss(s);
-    std::string item;
-    while(std::getline(ss, item, delim)) {
-        elems.push_back(trimSpaces(item));
-    }
-    return elems;
+  std::vector<std::string> elems;
+  std::stringstream ss(s);
+  std::string item;
+  while(std::getline(ss, item, delim)) {
+    elems.push_back(trimSpaces(item));
+  }
+  return elems;
 }
 //=============================================================================
 
@@ -77,2742 +77,2072 @@ std::vector<std::string> split(const std::string &s, char delim) {
 
 Monitor::MonitorLink::MonitorLink( int p_id, const char *p_name ) : id( p_id )
 {
-    strncpy( name, p_name, sizeof(name) );
+  strncpy( name, p_name, sizeof(name) );
 
 #if ZM_MEM_MAPPED
-    map_fd = -1;
-    snprintf( mem_file, sizeof(mem_file), "%s/zm.mmap.%d", config.path_map, id );
+  map_fd = -1;
+  snprintf( mem_file, sizeof(mem_file), "%s/zm.mmap.%d", config.path_map, id );
 #else // ZM_MEM_MAPPED
-    shm_id = 0;
+  shm_id = 0;
 #endif // ZM_MEM_MAPPED
-    mem_size = 0;
-    mem_ptr = 0;
+  mem_size = 0;
+  mem_ptr = 0;
 
-    last_event = 0;
-    last_state = IDLE;
+  last_event = 0;
+  last_state = IDLE;
 
-    last_connect_time = 0;
-    connected = false;
+  last_connect_time = 0;
+  connected = false;
 }
 
 Monitor::MonitorLink::~MonitorLink()
 {
-    disconnect();
+  disconnect();
 }
 
 bool Monitor::MonitorLink::connect()
 {
-    if ( !last_connect_time || (time( 0 ) - last_connect_time) > 60 )
-    {
-        last_connect_time = time( 0 );
+  if ( !last_connect_time || (time( 0 ) - last_connect_time) > 60 )
+  {
+    last_connect_time = time( 0 );
 
-        mem_size = sizeof(SharedData) + sizeof(TriggerData);
+    mem_size = sizeof(SharedData) + sizeof(TriggerData);
 
-        Debug( 1, "link.mem.size=%d", mem_size );
+    Debug( 1, "link.mem.size=%d", mem_size );
 #if ZM_MEM_MAPPED
-        map_fd = open( mem_file, O_RDWR, (mode_t)0600 );
-        if ( map_fd < 0 )
-        {
-            Debug( 3, "Can't open linked memory map file %s: %s", mem_file, strerror(errno) );
-            disconnect();
-            return( false );
-        }
-		while ( map_fd <= 2 ) {
-			int new_map_fd = dup(map_fd);
-			Warning( "Got one of the stdio fds for our mmap handle. map_fd was %d, new one is %d", map_fd, new_map_fd );
-			close(map_fd);
-			map_fd = new_map_fd;
-		}
-
-        struct stat map_stat;
-        if ( fstat( map_fd, &map_stat ) < 0 )
-        {
-            Error( "Can't stat linked memory map file %s: %s", mem_file, strerror(errno) );
-            disconnect();
-            return( false );
-        }
-
-        if ( map_stat.st_size == 0 )
-        {
-            Error( "Linked memory map file %s is empty: %s", mem_file, strerror(errno) );
-            disconnect();
-            return( false );
-        }
-        else if ( map_stat.st_size < mem_size )
-        {
-            Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
-            disconnect();
-            return( false );
-        }
-
-        mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
-        if ( mem_ptr == MAP_FAILED )
-        {
-            Error( "Can't map file %s (%d bytes) to memory: %s", mem_file, mem_size, strerror(errno) );
-            disconnect();
-            return( false );
-        }
-#else // ZM_MEM_MAPPED
-        shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, 0700 );
-        if ( shm_id < 0 )
-        {
-            Debug( 3, "Can't shmget link memory: %s", strerror(errno) );
-            connected = false;
-            return( false );
-        }
-        mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
-        if ( mem_ptr < 0 )
-        {
-            Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
-            connected = false;
-            return( false );
-        }
-#endif // ZM_MEM_MAPPED
-
-        shared_data = (SharedData *)mem_ptr;
-        trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
-
-        if ( !shared_data->valid )
-        {
-            Debug( 3, "Linked memory not initialised by capture daemon" );
-            disconnect();
-            return( false );
-        }
-
-        last_state = shared_data->state;
-        last_event = shared_data->last_event;
-        connected = true;
-
-        return( true );
-    }
-    return( false );
-}
-
-bool Monitor::MonitorLink::disconnect()
-{
-    if ( connected )
-    {
-        connected = false;
-
-#if ZM_MEM_MAPPED
-        if ( mem_ptr > 0 )
-        {
-            msync( mem_ptr, mem_size, MS_ASYNC );
-            munmap( mem_ptr, mem_size );
-        }
-        if ( map_fd >= 0 )
-            close( map_fd );
-
-        map_fd = -1;
-#else // ZM_MEM_MAPPED
-        struct shmid_ds shm_data;
-        if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 )
-        {
-            Debug( 3, "Can't shmctl: %s", strerror(errno) );
-            return( false );
-        }
-
-        shm_id = 0;
-
-        if ( shm_data.shm_nattch <= 1 )
-        {
-            if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 )
-            {
-                Debug( 3, "Can't shmctl: %s", strerror(errno) );
-                return( false );
-            }
-        }
-
-        if ( shmdt( mem_ptr ) < 0 )
-        {
-            Debug( 3, "Can't shmdt: %s", strerror(errno) );
-            return( false );
-        }
-
-#endif // ZM_MEM_MAPPED
-        mem_size = 0;
-        mem_ptr = 0;
-    }
-    return( true );
-}
-
-bool Monitor::MonitorLink::isAlarmed()
-{
-    if ( !connected )
-    {
-        return( false );
-    }
-    return( shared_data->state == ALARM );
-}
-
-bool Monitor::MonitorLink::inAlarm()
-{
-    if ( !connected )
-    {
-        return( false );
-    }
-    return( shared_data->state == ALARM || shared_data->state == ALERT );
-}
-
-bool Monitor::MonitorLink::hasAlarmed()
-{
-    if ( shared_data->state == ALARM )
-    {
-        return( true );
-    }
-    else if( shared_data->last_event != (unsigned int)last_event )
-    {
-        last_event = shared_data->last_event;
-    }
-    return( false );
-}
-
-Monitor::Monitor(
-    int p_id,
-    const char *p_name,
-    const unsigned int p_server_id,
-    int p_function,
-    bool p_enabled,
-    const char *p_linked_monitors,
-    Camera *p_camera,
-    int p_orientation,
-    unsigned int p_deinterlacing,
-    int p_savejpegs,
-    int p_videowriter,
-    std::string p_encoderparams,
-    const char *p_event_prefix,
-    const char *p_label_format,
-    const Coord &p_label_coord,
-    int p_label_size,
-    int p_image_buffer_count,
-    int p_warmup_count,
-    int p_pre_event_count,
-    int p_post_event_count,
-    int p_stream_replay_buffer,
-    int p_alarm_frame_count,
-    int p_section_length,
-    int p_frame_skip,
-    int p_motion_frame_skip,
-    double p_analysis_fps,
-    unsigned int p_analysis_update_delay,
-    int p_capture_delay,
-    int p_alarm_capture_delay,
-    int p_fps_report_interval,
-    int p_ref_blend_perc,
-    int p_alarm_ref_blend_perc,
-    bool p_track_motion,
-    Rgb p_signal_check_colour,
-    bool p_embed_exif,
-    Purpose p_purpose,
-    int p_n_zones,
-    Zone *p_zones[]
-) : id( p_id ),
-    server_id( p_server_id ),
-    function( (Function)p_function ),
-    enabled( p_enabled ),
-    width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ),
-    height( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Width():p_camera->Height() ),
-    orientation( (Orientation)p_orientation ),
-    deinterlacing( p_deinterlacing ),
-    savejpegspref( p_savejpegs ),
-    videowriterpref( p_videowriter ),
-    encoderparams( p_encoderparams ),
-    label_coord( p_label_coord ),
-    label_size( p_label_size ),
-    image_buffer_count( p_image_buffer_count ),
-    warmup_count( p_warmup_count ),
-    pre_event_count( p_pre_event_count ),
-    post_event_count( p_post_event_count ),
-    stream_replay_buffer( p_stream_replay_buffer ),
-    section_length( p_section_length ),
-    frame_skip( p_frame_skip ),
-    motion_frame_skip( p_motion_frame_skip ),
-    analysis_fps( p_analysis_fps ),
-    analysis_update_delay( p_analysis_update_delay ),
-    capture_delay( p_capture_delay ),
-    alarm_capture_delay( p_alarm_capture_delay ),
-    alarm_frame_count( p_alarm_frame_count ),
-    fps_report_interval( p_fps_report_interval ),
-    ref_blend_perc( p_ref_blend_perc ),
-    alarm_ref_blend_perc( p_alarm_ref_blend_perc ),
-    track_motion( p_track_motion ),
-    signal_check_colour( p_signal_check_colour ),
-    embed_exif( p_embed_exif ),
-    delta_image( width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE ),
-    ref_image( width, height, p_camera->Colours(), p_camera->SubpixelOrder() ),
-    purpose( p_purpose ),
-    last_motion_score(0),
-    camera( p_camera ),
-    n_zones( p_n_zones ),
-    zones( p_zones ),
-    timestamps( 0 ),
-    images( 0 ),
-    privacy_bitmask( NULL )
-{
-    strncpy( name, p_name, sizeof(name) );
-
-    strncpy( event_prefix, p_event_prefix, sizeof(event_prefix) );
-    strncpy( label_format, p_label_format, sizeof(label_format) );
-
-    // Change \n to actual line feeds
-    char *token_ptr = label_format;
-    const char *token_string = "\n";
-    while( ( token_ptr = strstr( token_ptr, token_string ) ) )
-    {
-        if ( *(token_ptr+1) )
-        {
-            *token_ptr = '\n';
-            token_ptr++;
-            strcpy( token_ptr, token_ptr+1 );
-        }
-        else
-        {
-            *token_ptr = '\0';
-            break;
-        }
-    }
-
-    /* Parse encoder parameters */
-    ParseEncoderParameters(encoderparams.c_str(), &encoderparamsvec);
-
-    fps = 0.0;
-    event_count = 0;
-    image_count = 0;
-    ready_count = warmup_count;
-    first_alarm_count = 0;
-    last_alarm_count = 0;
-    state = IDLE;
-
-    if ( alarm_frame_count < 1 )
-        alarm_frame_count = 1;
-    else if ( alarm_frame_count > MAX_PRE_ALARM_FRAMES )
-        alarm_frame_count = MAX_PRE_ALARM_FRAMES;
-
-    auto_resume_time = 0;
-
-    if ( strcmp( config.event_close_mode, "time" ) == 0 )
-        event_close_mode = CLOSE_TIME;
-    else if ( strcmp( config.event_close_mode, "alarm" ) == 0 )
-        event_close_mode = CLOSE_ALARM;
-    else
-        event_close_mode = CLOSE_IDLE;
-
-    Debug( 1, "monitor purpose=%d", purpose );
-
-    mem_size = sizeof(SharedData)
-             + sizeof(TriggerData)
-             + sizeof(VideoStoreData) //Information to pass back to the capture process
-             + (image_buffer_count*sizeof(struct timeval))
-             + (image_buffer_count*camera->ImageSize())
-             + 64; /* Padding used to permit aligning the images buffer to 16 byte boundary */
-
-    Debug( 1, "mem.size=%d", mem_size );
-	mem_ptr = NULL;
-
-    if ( purpose == CAPTURE ) {
-		this->connect();
-		if ( ! mem_ptr ) exit(-1);
-        memset( mem_ptr, 0, mem_size );
-        shared_data->size = sizeof(SharedData);
-        shared_data->active = enabled;
-        shared_data->signal = false;
-        shared_data->state = IDLE;
-        shared_data->last_write_index = image_buffer_count;
-        shared_data->last_read_index = image_buffer_count;
-        shared_data->last_write_time = 0;
-        shared_data->last_event = 0;
-        shared_data->action = (Action)0;
-        shared_data->brightness = -1;
-        shared_data->hue = -1;
-        shared_data->colour = -1;
-        shared_data->contrast = -1;
-        shared_data->alarm_x = -1;
-        shared_data->alarm_y = -1;
-        shared_data->format = camera->SubpixelOrder();
-        shared_data->imagesize = camera->ImageSize();
-        trigger_data->size = sizeof(TriggerData);
-        trigger_data->trigger_state = TRIGGER_CANCEL;
-        trigger_data->trigger_score = 0;
-        trigger_data->trigger_cause[0] = 0;
-        trigger_data->trigger_text[0] = 0;
-        trigger_data->trigger_showtext[0] = 0;
-        shared_data->valid = true;
-        video_store_data->recording = false;
-        snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "nothing");
-        video_store_data->size = sizeof(VideoStoreData);
-        //video_store_data->frameNumber = 0;
-    } else if ( purpose == ANALYSIS ) {
-		this->connect();
-		if ( ! mem_ptr ) exit(-1);
-        shared_data->state = IDLE;
-        shared_data->last_read_time = 0;
-        shared_data->alarm_x = -1;
-        shared_data->alarm_y = -1;
-    }
-
-    if ( ( ! mem_ptr ) || ! shared_data->valid )
-    {
-        if ( purpose != QUERY )
-        {
-            Error( "Shared data not initialised by capture daemon for monitor %s", name );
-            exit( -1 );
-        }
-    }
-
-	// Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
-    if ( !n_zones ) {
-		Debug( 1, "Monitor %s has no zones, adding one.", name );
-        n_zones = 1;
-        zones = new Zone *[1];
-        Coord coords[4] = { Coord( 0, 0 ), Coord( width-1, 0 ), Coord( width-1, height-1 ), Coord( 0, height-1 ) };
-        zones[0] = new Zone( this, 0, "All", Zone::ACTIVE, Polygon( sizeof(coords)/sizeof(*coords), coords ), RGB_RED, Zone::BLOBS );
-    }
-    start_time = last_fps_time = time( 0 );
-
-    event = 0;
-
-    Debug( 1, "Monitor %s has function %d", name, function );
-    Debug( 1, "Monitor %s LBF = '%s', LBX = %d, LBY = %d, LBS = %d", name, label_format, label_coord.X(), label_coord.Y(), label_size );
-    Debug( 1, "Monitor %s IBC = %d, WUC = %d, pEC = %d, PEC = %d, EAF = %d, FRI = %d, RBP = %d, ARBP = %d, FM = %d", name, image_buffer_count, warmup_count, pre_event_count, post_event_count, alarm_frame_count, fps_report_interval, ref_blend_perc, alarm_ref_blend_perc, track_motion );
-
-    if ( purpose == ANALYSIS )
-    {
-        static char path[PATH_MAX];
-
-        strncpy( path, config.dir_events, sizeof(path) );
-
-        struct stat statbuf;
-        errno = 0;
-        stat( path, &statbuf );
-        if ( errno == ENOENT || errno == ENOTDIR )
-        {
-            if ( mkdir( path, 0755 ) )
-            {
-                Error( "Can't make %s: %s", path, strerror(errno));
-            }
-        }
-
-        snprintf( path, sizeof(path), "%s/%d", config.dir_events, id );
-
-        errno = 0;
-        stat( path, &statbuf );
-        if ( errno == ENOENT || errno == ENOTDIR )
-        {
-            if ( mkdir( path, 0755 ) )
-            {
-                Error( "Can't make %s: %s", path, strerror(errno));
-            }
-            char temp_path[PATH_MAX];
-            snprintf( temp_path, sizeof(temp_path), "%d", id );
-            if ( chdir( config.dir_events ) < 0 )
-                Fatal( "Can't change directory to '%s': %s", config.dir_events, strerror(errno) );
-            if ( symlink( temp_path, name ) < 0 )
-                Fatal( "Can't symlink '%s' to '%s': %s", temp_path, name, strerror(errno) );
-            if ( chdir( ".." ) < 0 )
-                Fatal( "Can't change to parent directory: %s", strerror(errno) );
-        }
-
-        while( shared_data->last_write_index == (unsigned int)image_buffer_count 
-               && shared_data->last_write_time == 0)
-        {
-            Warning( "Waiting for capture daemon" );
-            sleep( 1 );
-        }
-        ref_image.Assign( width, height, camera->Colours(), camera->SubpixelOrder(), image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize());
-
-        n_linked_monitors = 0;
-        linked_monitors = 0;
-
-        adaptive_skip = true;
-
-        ReloadLinkedMonitors( p_linked_monitors );
-    }
-}
-
-bool Monitor::connect() {
-#if ZM_MEM_MAPPED
-    snprintf( mem_file, sizeof(mem_file), "%s/zm.mmap.%d", config.path_map, id );
-    map_fd = open( mem_file, O_RDWR|O_CREAT, (mode_t)0600 );
+    map_fd = open( mem_file, O_RDWR, (mode_t)0600 );
     if ( map_fd < 0 )
-        Fatal( "Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno) );
+    {
+      Debug( 3, "Can't open linked memory map file %s: %s", mem_file, strerror(errno) );
+      disconnect();
+      return( false );
+    }
+    while ( map_fd <= 2 ) {
+      int new_map_fd = dup(map_fd);
+      Warning( "Got one of the stdio fds for our mmap handle. map_fd was %d, new one is %d", map_fd, new_map_fd );
+      close(map_fd);
+      map_fd = new_map_fd;
+    }
 
     struct stat map_stat;
     if ( fstat( map_fd, &map_stat ) < 0 )
-        Fatal( "Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno) );
-    if ( map_stat.st_size != mem_size && purpose == CAPTURE ) {
-        // Allocate the size
-        if ( ftruncate( map_fd, mem_size ) < 0 ) {
-            Fatal( "Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno) );
-		}
-    } else if ( map_stat.st_size == 0 ) {
-        Error( "Got empty memory map file size %ld, is the zmc process for this monitor running?", map_stat.st_size, mem_size );
-		return false;
-    } else if ( map_stat.st_size != mem_size ) {
-        Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
-		return false;
-	} else {
-#ifdef MAP_LOCKED
-		mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
-		if ( mem_ptr == MAP_FAILED ) {
-			if ( errno == EAGAIN ) {
-				Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
-#endif
-				mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
-				Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
-#ifdef MAP_LOCKED
-			}
-		}
-#endif
-		if ( mem_ptr == MAP_FAILED )
-			Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
+    {
+      Error( "Can't stat linked memory map file %s: %s", mem_file, strerror(errno) );
+      disconnect();
+      return( false );
+    }
+
+    if ( map_stat.st_size == 0 )
+    {
+      Error( "Linked memory map file %s is empty: %s", mem_file, strerror(errno) );
+      disconnect();
+      return( false );
+    }
+    else if ( map_stat.st_size < mem_size )
+    {
+      Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
+      disconnect();
+      return( false );
+    }
+
+    mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
+    if ( mem_ptr == MAP_FAILED )
+    {
+      Error( "Can't map file %s (%d bytes) to memory: %s", mem_file, mem_size, strerror(errno) );
+      disconnect();
+      return( false );
     }
 #else // ZM_MEM_MAPPED
-    shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700 );
-    if ( shm_id < 0 ) {
-        Error( "Can't shmget, probably not enough shared memory space free: %s", strerror(errno));
-        exit( -1 );
+    shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, 0700 );
+    if ( shm_id < 0 )
+    {
+      Debug( 3, "Can't shmget link memory: %s", strerror(errno) );
+      connected = false;
+      return( false );
     }
     mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
     if ( mem_ptr < 0 )
     {
-        Error( "Can't shmat: %s", strerror(errno));
-        exit( -1 );
+      Debug( 3, "Can't shmat link memory: %s", strerror(errno) );
+      connected = false;
+      return( false );
     }
 #endif // ZM_MEM_MAPPED
+
     shared_data = (SharedData *)mem_ptr;
     trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
-    video_store_data = (VideoStoreData *)((char *)trigger_data + sizeof(TriggerData));
-    struct timeval *shared_timestamps = (struct timeval *)((char *)video_store_data + sizeof(VideoStoreData));
-    unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
-    
-    if(((unsigned long)shared_images % 16) != 0) {
-		/* Align images buffer to nearest 16 byte boundary */
-		Debug(3,"Aligning shared memory images to the next 16 byte boundary");
-		shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
-    }
-    image_buffer = new Snapshot[image_buffer_count];
-    for ( int i = 0; i < image_buffer_count; i++ )
+
+    if ( !shared_data->valid )
     {
-        image_buffer[i].timestamp = &(shared_timestamps[i]);
-        image_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]) );
-        image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
-    }
-    if ( (deinterlacing & 0xff) == 4)
-    {
-        /* Four field motion adaptive deinterlacing in use */
-        /* Allocate a buffer for the next image */
-        next_buffer.image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
-        next_buffer.timestamp = new struct timeval;
+      Debug( 3, "Linked memory not initialised by capture daemon" );
+      disconnect();
+      return( false );
     }
 
-    if ( ( purpose == ANALYSIS ) && analysis_fps )
+    last_state = shared_data->state;
+    last_event = shared_data->last_event;
+    connected = true;
+
+    return( true );
+  }
+  return( false );
+}
+
+bool Monitor::MonitorLink::disconnect()
+{
+  if ( connected )
+  {
+    connected = false;
+
+#if ZM_MEM_MAPPED
+    if ( mem_ptr > 0 )
     {
-        // Size of pre event buffer must be greater than pre_event_count
-        // if alarm_frame_count > 1, because in this case the buffer contains
-        // alarmed images that must be discarded when event is created
-        pre_event_buffer_count = pre_event_count + alarm_frame_count - 1;
-        pre_event_buffer = new Snapshot[pre_event_buffer_count];
-        for ( int i = 0; i < pre_event_buffer_count; i++ )
-        {
-            pre_event_buffer[i].timestamp = new struct timeval;
-            pre_event_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
-        }
+      msync( mem_ptr, mem_size, MS_ASYNC );
+      munmap( mem_ptr, mem_size );
+    }
+    if ( map_fd >= 0 )
+      close( map_fd );
+
+    map_fd = -1;
+#else // ZM_MEM_MAPPED
+    struct shmid_ds shm_data;
+    if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 )
+    {
+      Debug( 3, "Can't shmctl: %s", strerror(errno) );
+      return( false );
     }
 
-	return true;
+    shm_id = 0;
+
+    if ( shm_data.shm_nattch <= 1 )
+    {
+      if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 )
+      {
+        Debug( 3, "Can't shmctl: %s", strerror(errno) );
+        return( false );
+      }
+    }
+
+    if ( shmdt( mem_ptr ) < 0 )
+    {
+      Debug( 3, "Can't shmdt: %s", strerror(errno) );
+      return( false );
+    }
+
+#endif // ZM_MEM_MAPPED
+    mem_size = 0;
+    mem_ptr = 0;
+  }
+  return( true );
+}
+
+bool Monitor::MonitorLink::isAlarmed()
+{
+  if ( !connected )
+  {
+    return( false );
+  }
+  return( shared_data->state == ALARM );
+}
+
+bool Monitor::MonitorLink::inAlarm()
+{
+  if ( !connected )
+  {
+    return( false );
+  }
+  return( shared_data->state == ALARM || shared_data->state == ALERT );
+}
+
+bool Monitor::MonitorLink::hasAlarmed()
+{
+  if ( shared_data->state == ALARM )
+  {
+    return( true );
+  }
+  else if( shared_data->last_event != (unsigned int)last_event )
+  {
+    last_event = shared_data->last_event;
+  }
+  return( false );
+}
+
+Monitor::Monitor(
+  int p_id,
+  const char *p_name,
+  const unsigned int p_server_id,
+  int p_function,
+  bool p_enabled,
+  const char *p_linked_monitors,
+  Camera *p_camera,
+  int p_orientation,
+  unsigned int p_deinterlacing,
+  int p_savejpegs,
+  int p_videowriter,
+  std::string p_encoderparams,
+  bool p_record_audio,
+  const char *p_event_prefix,
+  const char *p_label_format,
+  const Coord &p_label_coord,
+  int p_label_size,
+  int p_image_buffer_count,
+  int p_warmup_count,
+  int p_pre_event_count,
+  int p_post_event_count,
+  int p_stream_replay_buffer,
+  int p_alarm_frame_count,
+  int p_section_length,
+  int p_frame_skip,
+  int p_motion_frame_skip,
+  double p_analysis_fps,
+  unsigned int p_analysis_update_delay,
+  int p_capture_delay,
+  int p_alarm_capture_delay,
+  int p_fps_report_interval,
+  int p_ref_blend_perc,
+  int p_alarm_ref_blend_perc,
+  bool p_track_motion,
+  Rgb p_signal_check_colour,
+  bool p_embed_exif,
+  Purpose p_purpose,
+  int p_n_zones,
+  Zone *p_zones[]
+) : id( p_id ),
+  server_id( p_server_id ),
+  function( (Function)p_function ),
+  enabled( p_enabled ),
+  width( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Height():p_camera->Width() ),
+  height( (p_orientation==ROTATE_90||p_orientation==ROTATE_270)?p_camera->Width():p_camera->Height() ),
+  orientation( (Orientation)p_orientation ),
+  deinterlacing( p_deinterlacing ),
+  savejpegspref( p_savejpegs ),
+  videowriterpref( p_videowriter ),
+  encoderparams( p_encoderparams ),
+  record_audio( p_record_audio ),
+  label_coord( p_label_coord ),
+  label_size( p_label_size ),
+  image_buffer_count( p_image_buffer_count ),
+  warmup_count( p_warmup_count ),
+  pre_event_count( p_pre_event_count ),
+  post_event_count( p_post_event_count ),
+  stream_replay_buffer( p_stream_replay_buffer ),
+  section_length( p_section_length ),
+  frame_skip( p_frame_skip ),
+  motion_frame_skip( p_motion_frame_skip ),
+  analysis_fps( p_analysis_fps ),
+  analysis_update_delay( p_analysis_update_delay ),
+  capture_delay( p_capture_delay ),
+  alarm_capture_delay( p_alarm_capture_delay ),
+  alarm_frame_count( p_alarm_frame_count ),
+  fps_report_interval( p_fps_report_interval ),
+  ref_blend_perc( p_ref_blend_perc ),
+  alarm_ref_blend_perc( p_alarm_ref_blend_perc ),
+  track_motion( p_track_motion ),
+  signal_check_colour( p_signal_check_colour ),
+  embed_exif( p_embed_exif ),
+  delta_image( width, height, ZM_COLOUR_GRAY8, ZM_SUBPIX_ORDER_NONE ),
+  ref_image( width, height, p_camera->Colours(), p_camera->SubpixelOrder() ),
+  purpose( p_purpose ),
+  last_motion_score(0),
+  camera( p_camera ),
+  n_zones( p_n_zones ),
+  zones( p_zones ),
+  timestamps( 0 ),
+  images( 0 ),
+  privacy_bitmask( NULL )
+{
+  strncpy( name, p_name, sizeof(name)-1 );
+
+  strncpy( event_prefix, p_event_prefix, sizeof(event_prefix)-1 );
+  strncpy( label_format, p_label_format, sizeof(label_format)-1 );
+
+  // Change \n to actual line feeds
+  char *token_ptr = label_format;
+  const char *token_string = "\n";
+  while( ( token_ptr = strstr( token_ptr, token_string ) ) )
+  {
+    if ( *(token_ptr+1) )
+    {
+      *token_ptr = '\n';
+      token_ptr++;
+      strcpy( token_ptr, token_ptr+1 );
+    }
+    else
+    {
+      *token_ptr = '\0';
+      break;
+    }
+  }
+
+	/* Parse encoder parameters */
+	ParseEncoderParameters(encoderparams.c_str(), &encoderparamsvec);
+
+  fps = 0.0;
+  event_count = 0;
+  image_count = 0;
+  ready_count = warmup_count;
+  first_alarm_count = 0;
+  last_alarm_count = 0;
+  state = IDLE;
+
+  if ( alarm_frame_count < 1 )
+    alarm_frame_count = 1;
+  else if ( alarm_frame_count > MAX_PRE_ALARM_FRAMES )
+    alarm_frame_count = MAX_PRE_ALARM_FRAMES;
+
+  auto_resume_time = 0;
+
+  if ( strcmp( config.event_close_mode, "time" ) == 0 )
+    event_close_mode = CLOSE_TIME;
+  else if ( strcmp( config.event_close_mode, "alarm" ) == 0 )
+    event_close_mode = CLOSE_ALARM;
+  else
+    event_close_mode = CLOSE_IDLE;
+
+  Debug( 1, "monitor purpose=%d", purpose );
+
+  mem_size = sizeof(SharedData)
+       + sizeof(TriggerData)
+       + sizeof(VideoStoreData) //Information to pass back to the capture process
+       + (image_buffer_count*sizeof(struct timeval))
+       + (image_buffer_count*camera->ImageSize())
+       + 64; /* Padding used to permit aligning the images buffer to 16 byte boundary */
+
+  Debug( 1, "mem.size=%d", mem_size );
+  mem_ptr = NULL;
+
+  if ( purpose == CAPTURE ) {
+    this->connect();
+    if ( ! mem_ptr ) exit(-1);
+    memset( mem_ptr, 0, mem_size );
+    shared_data->size = sizeof(SharedData);
+    shared_data->active = enabled;
+    shared_data->signal = false;
+    shared_data->state = IDLE;
+    shared_data->last_write_index = image_buffer_count;
+    shared_data->last_read_index = image_buffer_count;
+    shared_data->last_write_time = 0;
+    shared_data->last_event = 0;
+    shared_data->action = (Action)0;
+    shared_data->brightness = -1;
+    shared_data->hue = -1;
+    shared_data->colour = -1;
+    shared_data->contrast = -1;
+    shared_data->alarm_x = -1;
+    shared_data->alarm_y = -1;
+    shared_data->format = camera->SubpixelOrder();
+    shared_data->imagesize = camera->ImageSize();
+    trigger_data->size = sizeof(TriggerData);
+    trigger_data->trigger_state = TRIGGER_CANCEL;
+    trigger_data->trigger_score = 0;
+    trigger_data->trigger_cause[0] = 0;
+    trigger_data->trigger_text[0] = 0;
+    trigger_data->trigger_showtext[0] = 0;
+    shared_data->valid = true;
+    video_store_data->recording = false;
+    snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "nothing");
+    video_store_data->size = sizeof(VideoStoreData);
+    //video_store_data->frameNumber = 0;
+  } else if ( purpose == ANALYSIS ) {
+    this->connect();
+    if ( ! mem_ptr ) exit(-1);
+    shared_data->state = IDLE;
+    shared_data->last_read_time = 0;
+    shared_data->alarm_x = -1;
+    shared_data->alarm_y = -1;
+  }
+
+  if ( ( ! mem_ptr ) || ! shared_data->valid )
+  {
+    if ( purpose != QUERY )
+    {
+      Error( "Shared data not initialised by capture daemon for monitor %s", name );
+      exit( -1 );
+    }
+  }
+
+  // Will this not happen every time a monitor is instantiated?  Seems like all the calls to the Monitor constructor pass a zero for n_zones, then load zones after..
+	// In my storage areas branch, I took this out.. and didn't notice any problems.
+  if ( !n_zones ) {
+    Debug( 1, "Monitor %s has no zones, adding one.", name );
+    n_zones = 1;
+    zones = new Zone *[1];
+    Coord coords[4] = { Coord( 0, 0 ), Coord( width-1, 0 ), Coord( width-1, height-1 ), Coord( 0, height-1 ) };
+    zones[0] = new Zone( this, 0, "All", Zone::ACTIVE, Polygon( sizeof(coords)/sizeof(*coords), coords ), RGB_RED, Zone::BLOBS );
+  }
+  start_time = last_fps_time = time( 0 );
+
+  event = 0;
+
+  Debug( 1, "Monitor %s has function %d", name, function );
+  Debug( 1, "Monitor %s LBF = '%s', LBX = %d, LBY = %d, LBS = %d", name, label_format, label_coord.X(), label_coord.Y(), label_size );
+  Debug( 1, "Monitor %s IBC = %d, WUC = %d, pEC = %d, PEC = %d, EAF = %d, FRI = %d, RBP = %d, ARBP = %d, FM = %d", name, image_buffer_count, warmup_count, pre_event_count, post_event_count, alarm_frame_count, fps_report_interval, ref_blend_perc, alarm_ref_blend_perc, track_motion );
+
+  if ( purpose == ANALYSIS )
+  {
+    static char path[PATH_MAX];
+
+    strncpy( path, config.dir_events, sizeof(path) );
+
+    struct stat statbuf;
+    errno = 0;
+    stat( path, &statbuf );
+    if ( errno == ENOENT || errno == ENOTDIR )
+    {
+      if ( mkdir( path, 0755 ) )
+      {
+        Error( "Can't make %s: %s", path, strerror(errno));
+      }
+    }
+
+    snprintf( path, sizeof(path), "%s/%d", config.dir_events, id );
+
+    errno = 0;
+    stat( path, &statbuf );
+    if ( errno == ENOENT || errno == ENOTDIR )
+    {
+      if ( mkdir( path, 0755 ) )
+      {
+        Error( "Can't make %s: %s", path, strerror(errno));
+      }
+      char temp_path[PATH_MAX];
+      snprintf( temp_path, sizeof(temp_path), "%d", id );
+      if ( chdir( config.dir_events ) < 0 )
+        Fatal( "Can't change directory to '%s': %s", config.dir_events, strerror(errno) );
+      if ( symlink( temp_path, name ) < 0 )
+        Fatal( "Can't symlink '%s' to '%s': %s", temp_path, name, strerror(errno) );
+      if ( chdir( ".." ) < 0 )
+        Fatal( "Can't change to parent directory: %s", strerror(errno) );
+    }
+
+    while( shared_data->last_write_index == (unsigned int)image_buffer_count 
+         && shared_data->last_write_time == 0)
+    {
+      Warning( "Waiting for capture daemon" );
+      sleep( 1 );
+    }
+    ref_image.Assign( width, height, camera->Colours(), camera->SubpixelOrder(), image_buffer[shared_data->last_write_index].image->Buffer(), camera->ImageSize());
+
+    n_linked_monitors = 0;
+    linked_monitors = 0;
+
+    adaptive_skip = true;
+
+    ReloadLinkedMonitors( p_linked_monitors );
+  }
+}
+
+bool Monitor::connect() {
+#if ZM_MEM_MAPPED
+  snprintf( mem_file, sizeof(mem_file), "%s/zm.mmap.%d", config.path_map, id );
+  map_fd = open( mem_file, O_RDWR|O_CREAT, (mode_t)0600 );
+  if ( map_fd < 0 )
+    Fatal( "Can't open memory map file %s, probably not enough space free: %s", mem_file, strerror(errno) );
+
+  struct stat map_stat;
+  if ( fstat( map_fd, &map_stat ) < 0 )
+    Fatal( "Can't stat memory map file %s: %s, is the zmc process for this monitor running?", mem_file, strerror(errno) );
+  if ( map_stat.st_size != mem_size && purpose == CAPTURE ) {
+    // Allocate the size
+    if ( ftruncate( map_fd, mem_size ) < 0 ) {
+      Fatal( "Can't extend memory map file %s to %d bytes: %s", mem_file, mem_size, strerror(errno) );
+    }
+  } else if ( map_stat.st_size == 0 ) {
+    Error( "Got empty memory map file size %ld, is the zmc process for this monitor running?", map_stat.st_size, mem_size );
+    return false;
+  } else if ( map_stat.st_size != mem_size ) {
+    Error( "Got unexpected memory map file size %ld, expected %d", map_stat.st_size, mem_size );
+    return false;
+  } else {
+#ifdef MAP_LOCKED
+    mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED|MAP_LOCKED, map_fd, 0 );
+    if ( mem_ptr == MAP_FAILED ) {
+      if ( errno == EAGAIN ) {
+        Debug( 1, "Unable to map file %s (%d bytes) to locked memory, trying unlocked", mem_file, mem_size );
+#endif
+        mem_ptr = (unsigned char *)mmap( NULL, mem_size, PROT_READ|PROT_WRITE, MAP_SHARED, map_fd, 0 );
+        Debug( 1, "Mapped file %s (%d bytes) to locked memory, unlocked", mem_file, mem_size );
+#ifdef MAP_LOCKED
+      }
+    }
+#endif
+    if ( mem_ptr == MAP_FAILED )
+      Fatal( "Can't map file %s (%d bytes) to memory: %s(%d)", mem_file, mem_size, strerror(errno), errno );
+  }
+#else // ZM_MEM_MAPPED
+  shm_id = shmget( (config.shm_key&0xffff0000)|id, mem_size, IPC_CREAT|0700 );
+  if ( shm_id < 0 ) {
+    Error( "Can't shmget, probably not enough shared memory space free: %s", strerror(errno));
+    exit( -1 );
+  }
+  mem_ptr = (unsigned char *)shmat( shm_id, 0, 0 );
+  if ( mem_ptr < 0 )
+  {
+    Error( "Can't shmat: %s", strerror(errno));
+    exit( -1 );
+  }
+#endif // ZM_MEM_MAPPED
+  shared_data = (SharedData *)mem_ptr;
+  trigger_data = (TriggerData *)((char *)shared_data + sizeof(SharedData));
+  video_store_data = (VideoStoreData *)((char *)trigger_data + sizeof(TriggerData));
+  struct timeval *shared_timestamps = (struct timeval *)((char *)video_store_data + sizeof(VideoStoreData));
+  unsigned char *shared_images = (unsigned char *)((char *)shared_timestamps + (image_buffer_count*sizeof(struct timeval)));
+  
+  if(((unsigned long)shared_images % 16) != 0) {
+    /* Align images buffer to nearest 16 byte boundary */
+    Debug(3,"Aligning shared memory images to the next 16 byte boundary");
+    shared_images = (uint8_t*)((unsigned long)shared_images + (16 - ((unsigned long)shared_images % 16)));
+  }
+  image_buffer = new Snapshot[image_buffer_count];
+  for ( int i = 0; i < image_buffer_count; i++ )
+  {
+    image_buffer[i].timestamp = &(shared_timestamps[i]);
+    image_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder(), &(shared_images[i*camera->ImageSize()]) );
+    image_buffer[i].image->HoldBuffer(true); /* Don't release the internal buffer or replace it with another */
+  }
+  if ( (deinterlacing & 0xff) == 4)
+  {
+    /* Four field motion adaptive deinterlacing in use */
+    /* Allocate a buffer for the next image */
+    next_buffer.image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
+    next_buffer.timestamp = new struct timeval;
+  }
+
+  if ( ( purpose == ANALYSIS ) && analysis_fps )
+  {
+    // Size of pre event buffer must be greater than pre_event_count
+    // if alarm_frame_count > 1, because in this case the buffer contains
+    // alarmed images that must be discarded when event is created
+    pre_event_buffer_count = pre_event_count + alarm_frame_count - 1;
+    pre_event_buffer = new Snapshot[pre_event_buffer_count];
+    for ( int i = 0; i < pre_event_buffer_count; i++ )
+    {
+      pre_event_buffer[i].timestamp = new struct timeval;
+      pre_event_buffer[i].image = new Image( width, height, camera->Colours(), camera->SubpixelOrder());
+    }
+  }
+
+  return true;
 }
 
 Monitor::~Monitor()
 {
-	if ( timestamps ) {
-		delete[] timestamps;
-		timestamps = 0;
-	}
-	if ( images ) {
-		delete[] images;
-		images = 0;
-	}
-        if ( privacy_bitmask ) {
-            delete[] privacy_bitmask;
-            privacy_bitmask = NULL;
-        }
-	if ( mem_ptr ) {
-		if ( event )
-			Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
-		closeEvent();
-
-		if ( (deinterlacing & 0xff) == 4)
-		{
-			delete next_buffer.image;
-			delete next_buffer.timestamp;
-		}
-		for ( int i = 0; i < image_buffer_count; i++ )
-		{
-			delete image_buffer[i].image;
-		}
-		delete[] image_buffer;
-	} // end if mem_ptr
-
-    for ( int i = 0; i < n_zones; i++ )
-    {
-        delete zones[i];
+  if ( timestamps ) {
+    delete[] timestamps;
+    timestamps = 0;
+  }
+  if ( images ) {
+    delete[] images;
+    images = 0;
+  }
+    if ( privacy_bitmask ) {
+      delete[] privacy_bitmask;
+      privacy_bitmask = NULL;
     }
-    delete[] zones;
+  if ( mem_ptr ) {
+    if ( event )
+      Info( "%s: %03d - Closing event %d, shutting down", name, image_count, event->Id() );
+    closeEvent();
 
-    delete camera;
+    if ( (deinterlacing & 0xff) == 4)
+    {
+      delete next_buffer.image;
+      delete next_buffer.timestamp;
+    }
+    for ( int i = 0; i < image_buffer_count; i++ )
+    {
+      delete image_buffer[i].image;
+    }
+    delete[] image_buffer;
+  } // end if mem_ptr
 
-	if ( mem_ptr ) {
-		if ( purpose == ANALYSIS )
-		{
-			shared_data->state = state = IDLE;
-			shared_data->last_read_index = image_buffer_count;
-			shared_data->last_read_time = 0;
+  for ( int i = 0; i < n_zones; i++ )
+  {
+    delete zones[i];
+  }
+  delete[] zones;
 
-			if ( analysis_fps )
-			{
-				for ( int i = 0; i < pre_event_buffer_count; i++ )
-				{
-					delete pre_event_buffer[i].image;
-					delete pre_event_buffer[i].timestamp;
-				}
-				delete[] pre_event_buffer;
-			}
-		}
-		else if ( purpose == CAPTURE )
-		{
-			shared_data->valid = false;
-			memset( mem_ptr, 0, mem_size );
-		}
+  delete camera;
+
+  if ( mem_ptr ) {
+    if ( purpose == ANALYSIS )
+    {
+      shared_data->state = state = IDLE;
+      shared_data->last_read_index = image_buffer_count;
+      shared_data->last_read_time = 0;
+
+      if ( analysis_fps )
+      {
+        for ( int i = 0; i < pre_event_buffer_count; i++ )
+        {
+          delete pre_event_buffer[i].image;
+          delete pre_event_buffer[i].timestamp;
+        }
+        delete[] pre_event_buffer;
+      }
+    }
+    else if ( purpose == CAPTURE )
+    {
+      shared_data->valid = false;
+      memset( mem_ptr, 0, mem_size );
+    }
 
 #if ZM_MEM_MAPPED
-		if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
-			Error( "Can't msync: %s", strerror(errno) );
-		if ( munmap( mem_ptr, mem_size ) < 0 )
-			Fatal( "Can't munmap: %s", strerror(errno) );
-		close( map_fd );
+    if ( msync( mem_ptr, mem_size, MS_SYNC ) < 0 )
+      Error( "Can't msync: %s", strerror(errno) );
+    if ( munmap( mem_ptr, mem_size ) < 0 )
+      Fatal( "Can't munmap: %s", strerror(errno) );
+    close( map_fd );
 #else // ZM_MEM_MAPPED
-		struct shmid_ds shm_data;
-		if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
-			Error( "Can't shmctl: %s", strerror(errno) );
-			exit( -1 );
-		}
-		if ( shm_data.shm_nattch <= 1 ) {
-			if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
-				Error( "Can't shmctl: %s", strerror(errno) );
-				exit( -1 );
-			}
-		}
+    struct shmid_ds shm_data;
+    if ( shmctl( shm_id, IPC_STAT, &shm_data ) < 0 ) {
+      Error( "Can't shmctl: %s", strerror(errno) );
+      exit( -1 );
+    }
+    if ( shm_data.shm_nattch <= 1 ) {
+      if ( shmctl( shm_id, IPC_RMID, 0 ) < 0 ) {
+        Error( "Can't shmctl: %s", strerror(errno) );
+        exit( -1 );
+      }
+    }
 #endif // ZM_MEM_MAPPED
-	} // end if mem_ptr
+  } // end if mem_ptr
 }
 
 void Monitor::AddZones( int p_n_zones, Zone *p_zones[] )
 {
-    for ( int i = 0; i < n_zones; i++ )
-        delete zones[i];
-    delete[] zones;
-    n_zones = p_n_zones;
-    zones = p_zones;
+  for ( int i = 0; i < n_zones; i++ )
+    delete zones[i];
+  delete[] zones;
+  n_zones = p_n_zones;
+  zones = p_zones;
 }
 
 void Monitor::AddPrivacyBitmask( Zone *p_zones[] )
 {
-	if ( privacy_bitmask )
-		delete[] privacy_bitmask;
-    privacy_bitmask = NULL;
-    Image *privacy_image = NULL;
+  if ( privacy_bitmask )
+    delete[] privacy_bitmask;
+  privacy_bitmask = NULL;
+  Image *privacy_image = NULL;
 
-    for ( int i = 0; i < n_zones; i++ )
+  for ( int i = 0; i < n_zones; i++ )
+  {
+    if ( p_zones[i]->IsPrivacy() )
     {
-        if ( p_zones[i]->IsPrivacy() )
-        {
-            if ( !privacy_image )
-            {
-                privacy_image = new Image( width, height, 1, ZM_SUBPIX_ORDER_NONE);
-                privacy_image->Clear();
-            }
-            privacy_image->Fill( 0xff, p_zones[i]->GetPolygon() );
-            privacy_image->Outline( 0xff, p_zones[i]->GetPolygon() );
-        }
-    } // end foreach zone
-    if ( privacy_image )
-        privacy_bitmask = privacy_image->Buffer();
+      if ( !privacy_image )
+      {
+        privacy_image = new Image( width, height, 1, ZM_SUBPIX_ORDER_NONE);
+        privacy_image->Clear();
+      }
+      privacy_image->Fill( 0xff, p_zones[i]->GetPolygon() );
+      privacy_image->Outline( 0xff, p_zones[i]->GetPolygon() );
+    }
+  } // end foreach zone
+  if ( privacy_image )
+    privacy_bitmask = privacy_image->Buffer();
 }
 
 Monitor::State Monitor::GetState() const
 {
-    return( (State)shared_data->state );
+  return( (State)shared_data->state );
 }
 
 int Monitor::GetImage( int index, int scale )
 {
-    if ( index < 0 || index > image_buffer_count )
-    {
-        index = shared_data->last_write_index;
+  if ( index < 0 || index > image_buffer_count )
+  {
+    index = shared_data->last_write_index;
+  }
+
+  if ( index != image_buffer_count )
+  {
+    Image *image;
+    // If we are going to be modifying the snapshot before writing, then we need to copy it
+    if ( ( scale != ZM_SCALE_BASE ) || ( !config.timestamp_on_capture ) ) {
+      Snapshot *snap = &image_buffer[index];
+      Image *snap_image = snap->image;
+
+      alarm_image.Assign( *snap_image );
+
+
+      //write_image.Assign( *snap_image );
+
+      if ( scale != ZM_SCALE_BASE ) {
+        alarm_image.Scale( scale );
+      }
+
+      if ( !config.timestamp_on_capture ) {
+        TimestampImage( &alarm_image, snap->timestamp );
+      }
+      image = &alarm_image;
+    } else {
+      image = image_buffer[index].image;
     }
 
-    if ( index != image_buffer_count )
-    {
-        Image *image;
-		// If we are going to be modifying the snapshot before writing, then we need to copy it
-        if ( ( scale != ZM_SCALE_BASE ) || ( !config.timestamp_on_capture ) ) {
-            Snapshot *snap = &image_buffer[index];
-            Image *snap_image = snap->image;
-
-            alarm_image.Assign( *snap_image );
-
-
-            //write_image.Assign( *snap_image );
-
-            if ( scale != ZM_SCALE_BASE ) {
-                alarm_image.Scale( scale );
-            }
-
-            if ( !config.timestamp_on_capture ) {
-                TimestampImage( &alarm_image, snap->timestamp );
-            }
-            image = &alarm_image;
-        } else {
-            image = image_buffer[index].image;
-        }
-
-        static char filename[PATH_MAX];
-        snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
-        image->WriteJpeg( filename );
-    }
-    else
-    {
-        Error( "Unable to generate image, no images in buffer" );
-    }
-    return( 0 );
+    static char filename[PATH_MAX];
+    snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
+    image->WriteJpeg( filename );
+  }
+  else
+  {
+    Error( "Unable to generate image, no images in buffer" );
+  }
+  return( 0 );
 }
 
 struct timeval Monitor::GetTimestamp( int index ) const
 {
-    if ( index < 0 || index > image_buffer_count )
-    {
-        index = shared_data->last_write_index;
-    }
+  if ( index < 0 || index > image_buffer_count )
+  {
+    index = shared_data->last_write_index;
+  }
 
-    if ( index != image_buffer_count )
-    {
-        Snapshot *snap = &image_buffer[index];
+  if ( index != image_buffer_count )
+  {
+    Snapshot *snap = &image_buffer[index];
 
-        return( *(snap->timestamp) );
-    }
-    else
-    {
-        static struct timeval null_tv = { 0, 0 };
+    return( *(snap->timestamp) );
+  }
+  else
+  {
+    static struct timeval null_tv = { 0, 0 };
 
-        return( null_tv );
-    }
+    return( null_tv );
+  }
 }
 
 unsigned int Monitor::GetLastReadIndex() const
 {
-    return( shared_data->last_read_index!=(unsigned int)image_buffer_count?shared_data->last_read_index:-1 );
+  return( shared_data->last_read_index!=(unsigned int)image_buffer_count?shared_data->last_read_index:-1 );
 }
 
 unsigned int Monitor::GetLastWriteIndex() const
 {
-    return( shared_data->last_write_index!=(unsigned int)image_buffer_count?shared_data->last_write_index:-1 );
+  return( shared_data->last_write_index!=(unsigned int)image_buffer_count?shared_data->last_write_index:-1 );
 }
 
 unsigned int Monitor::GetLastEvent() const
 {
-    return( shared_data->last_event );
+  return( shared_data->last_event );
 }
 
 double Monitor::GetFPS() const
 {
-    int index1 = shared_data->last_write_index;
-    if ( index1 == image_buffer_count )
-    {
-        return( 0.0 );
-    }
-    Snapshot *snap1 = &image_buffer[index1];
-    if ( !snap1->timestamp || !snap1->timestamp->tv_sec )
-    {
-        return( 0.0 );
-    }
-    struct timeval time1 = *snap1->timestamp;
+  int index1 = shared_data->last_write_index;
+  if ( index1 == image_buffer_count )
+  {
+    return( 0.0 );
+  }
+  Snapshot *snap1 = &image_buffer[index1];
+  if ( !snap1->timestamp || !snap1->timestamp->tv_sec )
+  {
+    return( 0.0 );
+  }
+  struct timeval time1 = *snap1->timestamp;
 
-    int image_count = image_buffer_count;
-    int index2 = (index1+1)%image_buffer_count;
-    if ( index2 == image_buffer_count )
+  int image_count = image_buffer_count;
+  int index2 = (index1+1)%image_buffer_count;
+  if ( index2 == image_buffer_count )
+  {
+    return( 0.0 );
+  }
+  Snapshot *snap2 = &image_buffer[index2];
+  while ( !snap2->timestamp || !snap2->timestamp->tv_sec )
+  {
+    if ( index1 == index2 )
     {
-        return( 0.0 );
+      return( 0.0 );
     }
-    Snapshot *snap2 = &image_buffer[index2];
-    while ( !snap2->timestamp || !snap2->timestamp->tv_sec )
-    {
-        if ( index1 == index2 )
-        {
-            return( 0.0 );
-        }
-        index2 = (index2+1)%image_buffer_count;
-        snap2 = &image_buffer[index2];
-        image_count--;
-    }
-    struct timeval time2 = *snap2->timestamp;
+    index2 = (index2+1)%image_buffer_count;
+    snap2 = &image_buffer[index2];
+    image_count--;
+  }
+  struct timeval time2 = *snap2->timestamp;
 
-    double time_diff = tvDiffSec( time2, time1 );
+  double time_diff = tvDiffSec( time2, time1 );
 
-    double curr_fps = image_count/time_diff;
+  double curr_fps = image_count/time_diff;
 
-    if ( curr_fps < 0.0 )
-    {
-        //Error( "Negative FPS %f, time_diff = %lf (%d:%ld.%ld - %d:%ld.%ld), ibc: %d", curr_fps, time_diff, index2, time2.tv_sec, time2.tv_usec, index1, time1.tv_sec, time1.tv_usec, image_buffer_count );
-        return( 0.0 );
-    }
-    return( curr_fps );
+  if ( curr_fps < 0.0 )
+  {
+    //Error( "Negative FPS %f, time_diff = %lf (%d:%ld.%ld - %d:%ld.%ld), ibc: %d", curr_fps, time_diff, index2, time2.tv_sec, time2.tv_usec, index1, time1.tv_sec, time1.tv_usec, image_buffer_count );
+    return( 0.0 );
+  }
+  return( curr_fps );
 }
 
 useconds_t Monitor::GetAnalysisRate()
 {
-    double capturing_fps = GetFPS();
-    if ( !analysis_fps )
-    {
-        return( 0 );
-    }
-    else if ( analysis_fps > capturing_fps )
-    {
-        Warning( "Analysis fps (%.2f) is greater than capturing fps (%.2f)", analysis_fps, capturing_fps );
-        return( 0 );
-    }
-    else
-    {
-        return( ( 1000000 / analysis_fps ) - ( 1000000 / capturing_fps ) );
-    }
+  double capturing_fps = GetFPS();
+  if ( !analysis_fps )
+  {
+    return( 0 );
+  }
+  else if ( analysis_fps > capturing_fps )
+  {
+    Warning( "Analysis fps (%.2f) is greater than capturing fps (%.2f)", analysis_fps, capturing_fps );
+    return( 0 );
+  }
+  else
+  {
+    return( ( 1000000 / analysis_fps ) - ( 1000000 / capturing_fps ) );
+  }
 }
 
 void Monitor::UpdateAdaptiveSkip()
 {
-    if ( config.opt_adaptive_skip )
+  if ( config.opt_adaptive_skip )
+  {
+    double capturing_fps = GetFPS();
+    if ( adaptive_skip && analysis_fps && ( analysis_fps < capturing_fps ) )
     {
-        double capturing_fps = GetFPS();
-        if ( adaptive_skip && analysis_fps && ( analysis_fps < capturing_fps ) )
-        {
-            Info( "Analysis fps (%.2f) is lower than capturing fps (%.2f), disabling adaptive skip feature", analysis_fps, capturing_fps );
-            adaptive_skip = false;
-        }
-        else if ( !adaptive_skip && ( !analysis_fps || ( analysis_fps >= capturing_fps ) ) )
-        {
-            Info( "Enabling adaptive skip feature" );
-            adaptive_skip = true;
-        }
+      Info( "Analysis fps (%.2f) is lower than capturing fps (%.2f), disabling adaptive skip feature", analysis_fps, capturing_fps );
+      adaptive_skip = false;
     }
-    else
+    else if ( !adaptive_skip && ( !analysis_fps || ( analysis_fps >= capturing_fps ) ) )
     {
-        adaptive_skip = false;
+      Info( "Enabling adaptive skip feature" );
+      adaptive_skip = true;
     }
+  }
+  else
+  {
+    adaptive_skip = false;
+  }
 }
 
 void Monitor::ForceAlarmOn( int force_score, const char *force_cause, const char *force_text )
 {
-    trigger_data->trigger_state = TRIGGER_ON;
-    trigger_data->trigger_score = force_score;
-    strncpy( trigger_data->trigger_cause, force_cause, sizeof(trigger_data->trigger_cause) );
-    strncpy( trigger_data->trigger_text, force_text, sizeof(trigger_data->trigger_text) );
+  trigger_data->trigger_state = TRIGGER_ON;
+  trigger_data->trigger_score = force_score;
+  strncpy( trigger_data->trigger_cause, force_cause, sizeof(trigger_data->trigger_cause) );
+  strncpy( trigger_data->trigger_text, force_text, sizeof(trigger_data->trigger_text) );
 }
 
 void Monitor::ForceAlarmOff()
 {
-    trigger_data->trigger_state = TRIGGER_OFF;
+  trigger_data->trigger_state = TRIGGER_OFF;
 }
 
 void Monitor::CancelForced()
 {
-    trigger_data->trigger_state = TRIGGER_CANCEL;
+  trigger_data->trigger_state = TRIGGER_CANCEL;
 }
 
 void Monitor::actionReload()
 {
-    shared_data->action |= RELOAD;
+  shared_data->action |= RELOAD;
 }
 
 void Monitor::actionEnable()
 {
-    shared_data->action |= RELOAD;
+  shared_data->action |= RELOAD;
 
-    static char sql[ZM_SQL_SML_BUFSIZ];
-    snprintf( sql, sizeof(sql), "update Monitors set Enabled = 1 where Id = '%d'", id );
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  static char sql[ZM_SQL_SML_BUFSIZ];
+  snprintf( sql, sizeof(sql), "update Monitors set Enabled = 1 where Id = '%d'", id );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 }
 
 void Monitor::actionDisable()
 {
-    shared_data->action |= RELOAD;
+  shared_data->action |= RELOAD;
 
-    static char sql[ZM_SQL_SML_BUFSIZ];
-    snprintf( sql, sizeof(sql), "update Monitors set Enabled = 0 where Id = '%d'", id );
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  static char sql[ZM_SQL_SML_BUFSIZ];
+  snprintf( sql, sizeof(sql), "update Monitors set Enabled = 0 where Id = '%d'", id );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 }
 
 void Monitor::actionSuspend()
 {
-    shared_data->action |= SUSPEND;
+  shared_data->action |= SUSPEND;
 }
 
 void Monitor::actionResume()
 {
-    shared_data->action |= RESUME;
+  shared_data->action |= RESUME;
 }
 
 int Monitor::actionBrightness( int p_brightness )
 {
-    if ( purpose != CAPTURE )
+  if ( purpose != CAPTURE )
+  {
+    if ( p_brightness >= 0 )
     {
-        if ( p_brightness >= 0 )
-        {
-            shared_data->brightness = p_brightness;
-            shared_data->action |= SET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & SET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to set brightness" );
-                    return( -1 );
-                }
-            }
-        }
+      shared_data->brightness = p_brightness;
+      shared_data->action |= SET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & SET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
         else
         {
-            shared_data->action |= GET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & GET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to get brightness" );
-                    return( -1 );
-                }
-            }
+          Warning( "Timed out waiting to set brightness" );
+          return( -1 );
         }
-        return( shared_data->brightness );
+      }
     }
-    return( camera->Brightness( p_brightness ) );
+    else
+    {
+      shared_data->action |= GET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & GET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
+        else
+        {
+          Warning( "Timed out waiting to get brightness" );
+          return( -1 );
+        }
+      }
+    }
+    return( shared_data->brightness );
+  }
+  return( camera->Brightness( p_brightness ) );
 }
 
 int Monitor::actionContrast( int p_contrast )
 {
-    if ( purpose != CAPTURE )
+  if ( purpose != CAPTURE )
+  {
+    if ( p_contrast >= 0 )
     {
-        if ( p_contrast >= 0 )
-        {
-            shared_data->contrast = p_contrast;
-            shared_data->action |= SET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & SET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to set contrast" );
-                    return( -1 );
-                }
-            }
-        }
+      shared_data->contrast = p_contrast;
+      shared_data->action |= SET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & SET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
         else
         {
-            shared_data->action |= GET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & GET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to get contrast" );
-                    return( -1 );
-                }
-            }
+          Warning( "Timed out waiting to set contrast" );
+          return( -1 );
         }
-        return( shared_data->contrast );
+      }
     }
-    return( camera->Contrast( p_contrast ) );
+    else
+    {
+      shared_data->action |= GET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & GET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
+        else
+        {
+          Warning( "Timed out waiting to get contrast" );
+          return( -1 );
+        }
+      }
+    }
+    return( shared_data->contrast );
+  }
+  return( camera->Contrast( p_contrast ) );
 }
 
 int Monitor::actionHue( int p_hue )
 {
-    if ( purpose != CAPTURE )
+  if ( purpose != CAPTURE )
+  {
+    if ( p_hue >= 0 )
     {
-        if ( p_hue >= 0 )
-        {
-            shared_data->hue = p_hue;
-            shared_data->action |= SET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & SET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to set hue" );
-                    return( -1 );
-                }
-            }
-        }
+      shared_data->hue = p_hue;
+      shared_data->action |= SET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & SET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
         else
         {
-            shared_data->action |= GET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & GET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to get hue" );
-                    return( -1 );
-                }
-            }
+          Warning( "Timed out waiting to set hue" );
+          return( -1 );
         }
-        return( shared_data->hue );
+      }
     }
-    return( camera->Hue( p_hue ) );
+    else
+    {
+      shared_data->action |= GET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & GET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
+        else
+        {
+          Warning( "Timed out waiting to get hue" );
+          return( -1 );
+        }
+      }
+    }
+    return( shared_data->hue );
+  }
+  return( camera->Hue( p_hue ) );
 }
 
 int Monitor::actionColour( int p_colour )
 {
-    if ( purpose != CAPTURE )
+  if ( purpose != CAPTURE )
+  {
+    if ( p_colour >= 0 )
     {
-        if ( p_colour >= 0 )
-        {
-            shared_data->colour = p_colour;
-            shared_data->action |= SET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & SET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to set colour" );
-                    return( -1 );
-                }
-            }
-        }
+      shared_data->colour = p_colour;
+      shared_data->action |= SET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & SET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
         else
         {
-            shared_data->action |= GET_SETTINGS;
-            int wait_loops = 10;
-            while ( shared_data->action & GET_SETTINGS )
-            {
-                if ( wait_loops-- )
-                    usleep( 100000 );
-                else
-                {
-                    Warning( "Timed out waiting to get colour" );
-                    return( -1 );
-                }
-            }
+          Warning( "Timed out waiting to set colour" );
+          return( -1 );
         }
-        return( shared_data->colour );
+      }
     }
-    return( camera->Colour( p_colour ) );
+    else
+    {
+      shared_data->action |= GET_SETTINGS;
+      int wait_loops = 10;
+      while ( shared_data->action & GET_SETTINGS )
+      {
+        if ( wait_loops-- )
+          usleep( 100000 );
+        else
+        {
+          Warning( "Timed out waiting to get colour" );
+          return( -1 );
+        }
+      }
+    }
+    return( shared_data->colour );
+  }
+  return( camera->Colour( p_colour ) );
 }
 
 void Monitor::DumpZoneImage( const char *zone_string )
 {
-    int exclude_id = 0;
-    int extra_colour = 0;
-    Polygon extra_zone;
+  int exclude_id = 0;
+  int extra_colour = 0;
+  Polygon extra_zone;
 
-    if ( zone_string )
+  if ( zone_string )
+  {
+    if ( !Zone::ParseZoneString( zone_string, exclude_id, extra_colour, extra_zone ) )
     {
-        if ( !Zone::ParseZoneString( zone_string, exclude_id, extra_colour, extra_zone ) )
-        {
-            Error( "Failed to parse zone string, ignoring" );
-        }
+      Error( "Failed to parse zone string, ignoring" );
     }
+  }
 
-    int index = shared_data->last_write_index;
-    Snapshot *snap = &image_buffer[index];
-    Image *snap_image = snap->image;
+  int index = shared_data->last_write_index;
+  Snapshot *snap = &image_buffer[index];
+  Image *snap_image = snap->image;
 
-    Image zone_image( *snap_image );
-    if(zone_image.Colours() == ZM_COLOUR_GRAY8) {
-        zone_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
-    }
-    
-    for( int i = 0; i < n_zones; i++ )
+  Image zone_image( *snap_image );
+  if(zone_image.Colours() == ZM_COLOUR_GRAY8) {
+    zone_image.Colourise(ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB );
+  }
+  
+  for( int i = 0; i < n_zones; i++ )
+  {
+    if ( exclude_id && (!extra_colour || extra_zone.getNumCoords()) && zones[i]->Id() == exclude_id )
+      continue;
+
+    Rgb colour;
+    if ( exclude_id && !extra_zone.getNumCoords() && zones[i]->Id() == exclude_id )
     {
-        if ( exclude_id && (!extra_colour || extra_zone.getNumCoords()) && zones[i]->Id() == exclude_id )
-            continue;
-
-        Rgb colour;
-        if ( exclude_id && !extra_zone.getNumCoords() && zones[i]->Id() == exclude_id )
-        {
-            colour = extra_colour;
-        }
-        else
-        {
-            if ( zones[i]->IsActive() )
-            {
-                colour = RGB_RED;
-            }
-            else if ( zones[i]->IsInclusive() )
-            {
-                colour = RGB_ORANGE;
-            }
-            else if ( zones[i]->IsExclusive() )
-            {
-                colour = RGB_PURPLE;
-            }
-            else if ( zones[i]->IsPreclusive() )
-            {
-                colour = RGB_BLUE;
-            }
-            else
-            {
-                colour = RGB_WHITE;
-            }
-        }
-        zone_image.Fill( colour, 2, zones[i]->GetPolygon() );
-        zone_image.Outline( colour, zones[i]->GetPolygon() );
+      colour = extra_colour;
     }
-
-    if ( extra_zone.getNumCoords() )
+    else
     {
-        zone_image.Fill( extra_colour, 2, extra_zone );
-        zone_image.Outline( extra_colour, extra_zone );
+      if ( zones[i]->IsActive() )
+      {
+        colour = RGB_RED;
+      }
+      else if ( zones[i]->IsInclusive() )
+      {
+        colour = RGB_ORANGE;
+      }
+      else if ( zones[i]->IsExclusive() )
+      {
+        colour = RGB_PURPLE;
+      }
+      else if ( zones[i]->IsPreclusive() )
+      {
+        colour = RGB_BLUE;
+      }
+      else
+      {
+        colour = RGB_WHITE;
+      }
     }
+    zone_image.Fill( colour, 2, zones[i]->GetPolygon() );
+    zone_image.Outline( colour, zones[i]->GetPolygon() );
+  }
 
-    static char filename[PATH_MAX];
-    snprintf( filename, sizeof(filename), "Zones%d.jpg", id );
-    zone_image.WriteJpeg( filename );
+  if ( extra_zone.getNumCoords() )
+  {
+    zone_image.Fill( extra_colour, 2, extra_zone );
+    zone_image.Outline( extra_colour, extra_zone );
+  }
+
+  static char filename[PATH_MAX];
+  snprintf( filename, sizeof(filename), "Zones%d.jpg", id );
+  zone_image.WriteJpeg( filename );
 }
 
 void Monitor::DumpImage( Image *dump_image ) const
 {
-    if ( image_count && !(image_count%10) )
-    {
-        static char filename[PATH_MAX];
-        static char new_filename[PATH_MAX];
-        snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
-        snprintf( new_filename, sizeof(new_filename), "Monitor%d-new.jpg", id );
-        dump_image->WriteJpeg( new_filename );
-        rename( new_filename, filename );
-    }
+  if ( image_count && !(image_count%10) )
+  {
+    static char filename[PATH_MAX];
+    static char new_filename[PATH_MAX];
+    snprintf( filename, sizeof(filename), "Monitor%d.jpg", id );
+    snprintf( new_filename, sizeof(new_filename), "Monitor%d-new.jpg", id );
+    dump_image->WriteJpeg( new_filename );
+    rename( new_filename, filename );
+  }
 }
 
 bool Monitor::CheckSignal( const Image *image )
 {
-    static bool static_undef = true;
-    /* RGB24 colors */
-    static uint8_t red_val;
-    static uint8_t green_val;
-    static uint8_t blue_val;
-    static uint8_t grayscale_val; /* 8bit grayscale color */  
-    static Rgb colour_val; /* RGB32 color */
-    static int usedsubpixorder;
+  static bool static_undef = true;
+  /* RGB24 colors */
+  static uint8_t red_val;
+  static uint8_t green_val;
+  static uint8_t blue_val;
+  static uint8_t grayscale_val; /* 8bit grayscale color */  
+  static Rgb colour_val; /* RGB32 color */
+  static int usedsubpixorder;
 
-    if ( config.signal_check_points > 0 )
+  if ( config.signal_check_points > 0 )
+  {
+    if ( static_undef )
     {
-        if ( static_undef )
-        {
-            static_undef = false;
-            usedsubpixorder = camera->SubpixelOrder();
-            colour_val = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
-            colour_val = rgb_convert(colour_val, usedsubpixorder);
-            red_val = RED_VAL_BGRA(signal_check_colour);
-            green_val = GREEN_VAL_BGRA(signal_check_colour);
-            blue_val = BLUE_VAL_BGRA(signal_check_colour);
-            grayscale_val = signal_check_colour & 0xff; /* Clear all bytes but lowest byte */
-        }
-
-        const uint8_t *buffer = image->Buffer();
-        int pixels = image->Pixels();
-        int width = image->Width();
-        int colours = image->Colours();
-
-        int index = 0;
-        for ( int i = 0; i < config.signal_check_points; i++ )
-        {
-            while( true )
-            {
-                index = (int)(((long long)rand()*(long long)(pixels-1))/RAND_MAX);
-                if ( !config.timestamp_on_capture || !label_format[0] )
-                    break;
-                // Avoid sampling the rows with timestamp in
-                if ( index < (label_coord.Y()*width) || index >= (label_coord.Y()+Image::LINE_HEIGHT)*width )
-                    break;
-            }
-            
-		if(colours == ZM_COLOUR_GRAY8) {
-			if ( *(buffer+index) != grayscale_val )
-				return true;
-			
-		} else if(colours == ZM_COLOUR_RGB24) {
-			const uint8_t *ptr = buffer+(index*colours);
-			
-			if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
-				if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
-					return true;
-			} else {
-				/* Assume RGB */
-				if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
-					return true;
-			}
-			
-		} else if(colours == ZM_COLOUR_RGB32) {
-			if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
-				if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
-					return true;
-			} else {
-				/* Assume RGBA or BGRA */
-				if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
-					return true;
-			}
-		}
-        
-        }
-        return( false );
+      static_undef = false;
+      usedsubpixorder = camera->SubpixelOrder();
+      colour_val = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
+      colour_val = rgb_convert(colour_val, usedsubpixorder);
+      red_val = RED_VAL_BGRA(signal_check_colour);
+      green_val = GREEN_VAL_BGRA(signal_check_colour);
+      blue_val = BLUE_VAL_BGRA(signal_check_colour);
+      grayscale_val = signal_check_colour & 0xff; /* Clear all bytes but lowest byte */
     }
-    return( true );
+
+    const uint8_t *buffer = image->Buffer();
+    int pixels = image->Pixels();
+    int width = image->Width();
+    int colours = image->Colours();
+
+    int index = 0;
+    for ( int i = 0; i < config.signal_check_points; i++ )
+    {
+      while( true )
+      {
+        index = (int)(((long long)rand()*(long long)(pixels-1))/RAND_MAX);
+        if ( !config.timestamp_on_capture || !label_format[0] )
+          break;
+        // Avoid sampling the rows with timestamp in
+        if ( index < (label_coord.Y()*width) || index >= (label_coord.Y()+Image::LINE_HEIGHT)*width )
+          break;
+      }
+      
+    if(colours == ZM_COLOUR_GRAY8) {
+      if ( *(buffer+index) != grayscale_val )
+        return true;
+      
+    } else if(colours == ZM_COLOUR_RGB24) {
+      const uint8_t *ptr = buffer+(index*colours);
+      
+      if ( usedsubpixorder == ZM_SUBPIX_ORDER_BGR) {
+        if ( (RED_PTR_BGRA(ptr) != red_val) || (GREEN_PTR_BGRA(ptr) != green_val) || (BLUE_PTR_BGRA(ptr) != blue_val) )
+          return true;
+      } else {
+        /* Assume RGB */
+        if ( (RED_PTR_RGBA(ptr) != red_val) || (GREEN_PTR_RGBA(ptr) != green_val) || (BLUE_PTR_RGBA(ptr) != blue_val) )
+          return true;
+      }
+      
+    } else if(colours == ZM_COLOUR_RGB32) {
+      if ( usedsubpixorder == ZM_SUBPIX_ORDER_ARGB || usedsubpixorder == ZM_SUBPIX_ORDER_ABGR) {
+        if ( ARGB_ABGR_ZEROALPHA(*(((const Rgb*)buffer)+index)) != ARGB_ABGR_ZEROALPHA(colour_val) )
+          return true;
+      } else {
+        /* Assume RGBA or BGRA */
+        if ( RGBA_BGRA_ZEROALPHA(*(((const Rgb*)buffer)+index)) != RGBA_BGRA_ZEROALPHA(colour_val) )
+          return true;
+      }
+    }
+    
+    }
+    return( false );
+  }
+  return( true );
 }
 
 bool Monitor::Analyse()
 {
-    if ( shared_data->last_read_index == shared_data->last_write_index )
+  if ( shared_data->last_read_index == shared_data->last_write_index )
+  {
+        // I wonder how often this happens. Maybe if this happens we should sleep or something?
+    return( false );
+  }
+
+  struct timeval now;
+  gettimeofday( &now, NULL );
+
+  if ( image_count && fps_report_interval && !(image_count%fps_report_interval) )
+  {
+    fps = double(fps_report_interval)/(now.tv_sec-last_fps_time);
+    Info( "%s: %d - Analysing at %.2f fps", name, image_count, fps );
+    last_fps_time = now.tv_sec;
+  }
+
+  int index;
+  if ( adaptive_skip )
+  {
+    int read_margin = shared_data->last_read_index - shared_data->last_write_index;
+    if ( read_margin < 0 ) read_margin += image_buffer_count;
+
+    int step = 1;
+    // Isn't read_margin always > 0 here?
+    if ( read_margin > 0 )
     {
-        return( false );
+      // TODO explain this so... 90% of image buffer / 50% of read margin?
+      step = (9*image_buffer_count)/(5*read_margin);
     }
 
-    struct timeval now;
-    gettimeofday( &now, NULL );
+    int pending_frames = shared_data->last_write_index - shared_data->last_read_index;
+    if ( pending_frames < 0 ) pending_frames += image_buffer_count;
 
-    if ( image_count && fps_report_interval && !(image_count%fps_report_interval) )
+    Debug( 4, "RI:%d, WI: %d, PF = %d, RM = %d, Step = %d", shared_data->last_read_index, shared_data->last_write_index, pending_frames, read_margin, step );
+    if ( step <= pending_frames )
     {
-        fps = double(fps_report_interval)/(now.tv_sec-last_fps_time);
-        Info( "%s: %d - Analysing at %.2f fps", name, image_count, fps );
-        last_fps_time = now.tv_sec;
-    }
-
-    int index;
-    if ( adaptive_skip )
-    {
-        int read_margin = shared_data->last_read_index - shared_data->last_write_index;
-        if ( read_margin < 0 ) read_margin += image_buffer_count;
-
-        int step = 1;
-        if ( read_margin > 0 )
-        {
-            step = (9*image_buffer_count)/(5*read_margin);
-        }
-
-        int pending_frames = shared_data->last_write_index - shared_data->last_read_index;
-        if ( pending_frames < 0 ) pending_frames += image_buffer_count;
-
-        Debug( 4, "RI:%d, WI: %d, PF = %d, RM = %d, Step = %d", shared_data->last_read_index, shared_data->last_write_index, pending_frames, read_margin, step );
-        if ( step <= pending_frames )
-        {
-            index = (shared_data->last_read_index+step)%image_buffer_count;
-        }
-        else
-        {
-            if ( pending_frames )
-            {
-                Warning( "Approaching buffer overrun, consider slowing capture, simplifying analysis or increasing ring buffer size" );
-            }
-            index = shared_data->last_write_index%image_buffer_count;
-        }
+      index = (shared_data->last_read_index+step)%image_buffer_count;
     }
     else
     {
-        index = shared_data->last_write_index%image_buffer_count;
+      if ( pending_frames )
+      {
+        Warning( "Approaching buffer overrun, consider slowing capture, simplifying analysis or increasing ring buffer size" );
+      }
+      index = shared_data->last_write_index%image_buffer_count;
     }
+  }
+  else
+  {
+    index = shared_data->last_write_index%image_buffer_count;
+  }
 
-    Snapshot *snap = &image_buffer[index];
-    struct timeval *timestamp = snap->timestamp;
-    Image *snap_image = snap->image;
+  Snapshot *snap = &image_buffer[index];
+  struct timeval *timestamp = snap->timestamp;
+  Image *snap_image = snap->image;
 
-    if ( shared_data->action )
+  if ( shared_data->action )
+  {
+    if ( shared_data->action & RELOAD )
     {
-        if ( shared_data->action & RELOAD )
-        {
-            Info( "Received reload indication at count %d", image_count );
-            shared_data->action &= ~RELOAD;
-            Reload();
-        }
-        if ( shared_data->action & SUSPEND )
-        {
-            if ( Active() )
-            {
-                Info( "Received suspend indication at count %d", image_count );
-                shared_data->active = false;
-                //closeEvent();
-            }
-            if ( config.max_suspend_time )
-            {
-                auto_resume_time = now.tv_sec + config.max_suspend_time;
-            }
-            shared_data->action &= ~SUSPEND;
-        }
-        if ( shared_data->action & RESUME )
-        {
-            if ( Enabled() && !Active() )
-            {
-                Info( "Received resume indication at count %d", image_count );
-                shared_data->active = true;
-                ref_image = *snap_image;
-                ready_count = image_count+(warmup_count/2);
-                shared_data->alarm_x = shared_data->alarm_y = -1;
-            }
-            shared_data->action &= ~RESUME;
-        }
+      Info( "Received reload indication at count %d", image_count );
+      shared_data->action &= ~RELOAD;
+      Reload();
     }
-    if ( auto_resume_time && (now.tv_sec >= auto_resume_time) )
+    if ( shared_data->action & SUSPEND )
     {
-        Info( "Auto resuming at count %d", image_count );
+      if ( Active() )
+      {
+        Info( "Received suspend indication at count %d", image_count );
+        shared_data->active = false;
+        //closeEvent();
+      }
+      if ( config.max_suspend_time )
+      {
+        auto_resume_time = now.tv_sec + config.max_suspend_time;
+      }
+      shared_data->action &= ~SUSPEND;
+    }
+    if ( shared_data->action & RESUME )
+    {
+      if ( Enabled() && !Active() )
+      {
+        Info( "Received resume indication at count %d", image_count );
         shared_data->active = true;
         ref_image = *snap_image;
         ready_count = image_count+(warmup_count/2);
-        auto_resume_time = 0;
+        shared_data->alarm_x = shared_data->alarm_y = -1;
+      }
+      shared_data->action &= ~RESUME;
     }
+  }
+  if ( auto_resume_time && (now.tv_sec >= auto_resume_time) )
+  {
+    Info( "Auto resuming at count %d", image_count );
+    shared_data->active = true;
+    ref_image = *snap_image;
+    ready_count = image_count+(warmup_count/2);
+    auto_resume_time = 0;
+  }
 
-    static bool static_undef = true;
-    static int last_section_mod = 0;
-    static bool last_signal;
+  static bool static_undef = true;
+  static int last_section_mod = 0;
+  static bool last_signal;
 
-    if ( static_undef )
+  if ( static_undef )
+  {
+// Sure would be nice to be able to assume that these were already initialized.  It's just 1 compare/branch, but really not neccessary.
+    static_undef = false;
+    timestamps = new struct timeval *[pre_event_count];
+    images = new Image *[pre_event_count];
+    last_signal = shared_data->signal;
+  }
+
+  if ( Enabled() )
+  {
+    bool signal = shared_data->signal;
+    bool signal_change = (signal != last_signal);
+    //Set video recording flag for event start constructor and easy reference in code
+    // TODO: Use enum instead of the # 2. Makes for easier reading
+    bool videoRecording = ((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo());
+    
+    if ( trigger_data->trigger_state != TRIGGER_OFF )
     {
-        static_undef = false;
-        timestamps = new struct timeval *[pre_event_count];
-        images = new Image *[pre_event_count];
-        last_signal = shared_data->signal;
-    }
+      unsigned int score = 0;
+      if ( Ready() )
+      {
+        std::string cause;
+        Event::StringSetMap noteSetMap;
 
-    if ( Enabled() )
-    {
-        bool signal = shared_data->signal;
-        bool signal_change = (signal != last_signal);
-        
-        //Set video recording flag for event start constructor and easy reference in code
-        bool videoRecording = ((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo());
-        
-        if ( trigger_data->trigger_state != TRIGGER_OFF )
+        if ( trigger_data->trigger_state == TRIGGER_ON )
         {
-            unsigned int score = 0;
-            if ( Ready() )
+          score += trigger_data->trigger_score;
+          if ( !event )
+          {
+            if ( cause.length() )
+              cause += ", ";
+            cause += trigger_data->trigger_cause;
+          }
+          Event::StringSet noteSet;
+          noteSet.insert( trigger_data->trigger_text );
+          noteSetMap[trigger_data->trigger_cause] = noteSet;
+        }
+        if ( signal_change )
+        {
+          const char *signalText;
+          if ( !signal )
+            signalText = "Lost";
+          else
+          {
+            signalText = "Reacquired";
+            score += 100;
+          }
+          Warning( "%s: %s", SIGNAL_CAUSE, signalText );
+          if ( event && !signal )
+          {
+            Info( "%s: %03d - Closing event %d, signal loss", name, image_count, event->Id() );
+            closeEvent();
+            last_section_mod = 0;
+          }
+          if ( !event )
+          {
+            if ( cause.length() )
+              cause += ", ";
+            cause += SIGNAL_CAUSE;
+          }
+          Event::StringSet noteSet;
+          noteSet.insert( signalText );
+          noteSetMap[SIGNAL_CAUSE] = noteSet;
+          shared_data->state = state = IDLE;
+          shared_data->active = signal;
+          ref_image = *snap_image;
+        }
+        else if ( signal && Active() && (function == MODECT || function == MOCORD) )
+        {
+          Event::StringSet zoneSet;
+          int motion_score = last_motion_score;
+          if ( !(image_count % (motion_frame_skip+1) ) )
+          {
+            // Get new score.
+            motion_score = last_motion_score = DetectMotion( *snap_image, zoneSet );
+          }
+          //int motion_score = DetectBlack( *snap_image, zoneSet );
+          if ( motion_score )
+          {
+            if ( !event )
             {
-                std::string cause;
-                Event::StringSetMap noteSetMap;
+              score += motion_score;
+              if ( cause.length() )
+                cause += ", ";
+              cause += MOTION_CAUSE;
+            }
+            else
+            {
+              score += motion_score;
+            }
+            noteSetMap[MOTION_CAUSE] = zoneSet;
 
-                if ( trigger_data->trigger_state == TRIGGER_ON )
+          }
+          shared_data->active = signal;
+        }
+        if ( (!signal_change && signal) && n_linked_monitors > 0 )
+        {
+          bool first_link = true;
+          Event::StringSet noteSet;
+          for ( int i = 0; i < n_linked_monitors; i++ )
+          {
+            if ( linked_monitors[i]->isConnected() )
+            {
+              if ( linked_monitors[i]->hasAlarmed() )
+              {
+                if ( !event )
                 {
-                    score += trigger_data->trigger_score;
-                    if ( !event )
-                    {
-                        if ( cause.length() )
-                            cause += ", ";
-                        cause += trigger_data->trigger_cause;
-                    }
-                    Event::StringSet noteSet;
-                    noteSet.insert( trigger_data->trigger_text );
-                    noteSetMap[trigger_data->trigger_cause] = noteSet;
+                  if ( first_link )
+                  {
+                    if ( cause.length() )
+                      cause += ", ";
+                    cause += LINKED_CAUSE;
+                    first_link = false;
+                  }
                 }
-                if ( signal_change )
+                noteSet.insert( linked_monitors[i]->Name() );
+                score += 50;
+              }
+            }
+            else
+            {
+              linked_monitors[i]->connect();
+            }
+          }
+          if ( noteSet.size() > 0 )
+            noteSetMap[LINKED_CAUSE] = noteSet;
+        }
+        //TODO: What happens is the event closes and sets recording to false then recording to true again so quickly that our capture daemon never picks it up. Maybe need a refresh flag?
+        if ( (!signal_change && signal) && (function == RECORD || function == MOCORD) )
+        {
+          if ( event )
+          {
+            //TODO: We shouldn't have to do this every time. Not sure why it clears itself if this isn't here??
+            snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
+            int section_mod = timestamp->tv_sec%section_length;
+            if ( section_mod < last_section_mod )
+            {
+              if ( state == IDLE || state == TAPE || event_close_mode == CLOSE_TIME )
+              {
+                if ( state == TAPE )
                 {
-                    const char *signalText;
-                    if ( !signal )
-                        signalText = "Lost";
-                    else
-                    {
-                        signalText = "Reacquired";
-                        score += 100;
-                    }
-                    Warning( "%s: %s", SIGNAL_CAUSE, signalText );
-                    if ( event && !signal )
-                    {
-                        Info( "%s: %03d - Closing event %d, signal loss", name, image_count, event->Id() );
-                        closeEvent();
-                        last_section_mod = 0;
-                    }
-                    if ( !event )
-                    {
-                        if ( cause.length() )
-                            cause += ", ";
-                        cause += SIGNAL_CAUSE;
-                    }
-                    Event::StringSet noteSet;
-                    noteSet.insert( signalText );
-                    noteSetMap[SIGNAL_CAUSE] = noteSet;
-                    shared_data->state = state = IDLE;
-                    shared_data->active = signal;
-                    ref_image = *snap_image;
+                  shared_data->state = state = IDLE;
+                  Info( "%s: %03d - Closing event %d, section end", name, image_count, event->Id() )
                 }
-                else if ( signal && Active() && (function == MODECT || function == MOCORD) )
-                {
-                    Event::StringSet zoneSet;
-                    int motion_score = last_motion_score;
-                    if ( !(image_count % (motion_frame_skip+1) ) )
-                    {
-                        // Get new score.
-                        motion_score = last_motion_score = DetectMotion( *snap_image, zoneSet );
-                    }
-                    //int motion_score = DetectBlack( *snap_image, zoneSet );
-                    if ( motion_score )
-                    {
-                        if ( !event )
-                        {
-                            score += motion_score;
-                            if ( cause.length() )
-                                cause += ", ";
-                            cause += MOTION_CAUSE;
-                        }
-                        else
-                        {
-                            score += motion_score;
-                        }
-                        noteSetMap[MOTION_CAUSE] = zoneSet;
+                else
+                  Info( "%s: %03d - Closing event %d, section end forced ", name, image_count, event->Id() );
+                closeEvent();
+                last_section_mod = 0;
+              }
+            }
+            else
+            {
+              last_section_mod = section_mod;
+            }
+          }
+          if ( !event )
+          {
 
-                    }
-                    shared_data->active = signal;
+            // Create event
+            event = new Event( this, *timestamp, "Continuous", noteSetMap, videoRecording );
+            shared_data->last_event = event->Id();
+            //set up video store data
+            snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
+            video_store_data->recording = true;
+
+            Info( "%s: %03d - Opening new event %d, section start", name, image_count, event->Id() );
+
+            /* To prevent cancelling out an existing alert\prealarm\alarm state */
+            if ( state == IDLE )
+            {
+              shared_data->state = state = TAPE;
+            }
+
+            //if ( config.overlap_timed_events )
+            if ( false )
+            {
+              int pre_index;
+              int pre_event_images = pre_event_count;
+
+              if ( analysis_fps )
+              {
+                // If analysis fps is set,
+                // compute the index for pre event images in the dedicated buffer
+                pre_index = image_count%pre_event_buffer_count;
+
+                // Seek forward the next filled slot in to the buffer (oldest data)
+                // from the current position
+                while ( pre_event_images && !pre_event_buffer[pre_index].timestamp->tv_sec )
+                {
+                  pre_index = (pre_index + 1)%pre_event_buffer_count;
+                  // Slot is empty, removing image from counter
+                  pre_event_images--;
                 }
-                if ( (!signal_change && signal) && n_linked_monitors > 0 )
+              }
+              else
+              {
+                // If analysis fps is not set (analysis performed at capturing framerate),
+                // compute the index for pre event images in the capturing buffer
+                pre_index = ((index + image_buffer_count) - pre_event_count)%image_buffer_count;
+
+                // Seek forward the next filled slot in to the buffer (oldest data)
+                // from the current position
+                while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec )
                 {
-                    bool first_link = true;
-                    Event::StringSet noteSet;
-                    for ( int i = 0; i < n_linked_monitors; i++ )
-                    {
-                        if ( linked_monitors[i]->isConnected() )
-                        {
-                            if ( linked_monitors[i]->hasAlarmed() )
-                            {
-                                if ( !event )
-                                {
-                                    if ( first_link )
-                                    {
-                                        if ( cause.length() )
-                                            cause += ", ";
-                                        cause += LINKED_CAUSE;
-                                        first_link = false;
-                                    }
-                                }
-                                noteSet.insert( linked_monitors[i]->Name() );
-                                score += 50;
-                            }
-                        }
-                        else
-                        {
-                            linked_monitors[i]->connect();
-                        }
-                    }
-                    if ( noteSet.size() > 0 )
-                        noteSetMap[LINKED_CAUSE] = noteSet;
+                  pre_index = (pre_index + 1)%image_buffer_count;
+                  // Slot is empty, removing image from counter
+                  pre_event_images--;
                 }
-                
-                //TODO: What happens is the event closes and sets recording to false then recording to true again so quickly that our capture daemon never picks it up. Maybe need a refresh flag?
-                if ( (!signal_change && signal) && (function == RECORD || function == MOCORD) )
+              }
+
+              if ( pre_event_images )
+              {
+                if ( analysis_fps )
+                  for ( int i = 0; i < pre_event_images; i++ )
+                  {
+                    timestamps[i] = pre_event_buffer[pre_index].timestamp;
+                    images[i] = pre_event_buffer[pre_index].image;
+                    pre_index = (pre_index + 1)%pre_event_buffer_count;
+                  }
+                else
+                  for ( int i = 0; i < pre_event_images; i++ )
+                  {
+                    timestamps[i] = image_buffer[pre_index].timestamp;
+                    images[i] = image_buffer[pre_index].image;
+                    pre_index = (pre_index + 1)%image_buffer_count;
+                  }
+
+                event->AddFrames( pre_event_images, images, timestamps );
+              }
+            }
+          }
+        }
+        if ( score )
+        {
+          if ( (state == IDLE || state == TAPE || state == PREALARM ) )
+          {
+            if ( Event::PreAlarmCount() >= (alarm_frame_count-1) )
+            {
+              Info( "%s: %03d - Gone into alarm state", name, image_count );
+              shared_data->state = state = ALARM;
+              if ( signal_change || (function != MOCORD && state != ALERT) )
+              {
+                int pre_index;
+                int pre_event_images = pre_event_count;
+
+                if ( analysis_fps )
                 {
-                    if ( event )
-                    {
-                        //TODO: We shouldn't have to do this every time. Not sure why it clears itself if this isn't here??
-                        snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-                        
-                        int section_mod = timestamp->tv_sec%section_length;
-                        if ( section_mod < last_section_mod )
-                        {
-                            if ( state == IDLE || state == TAPE || event_close_mode == CLOSE_TIME )
-                            {
-                                if ( state == TAPE )
-                                {
-                                    shared_data->state = state = IDLE;
-                                    Info( "%s: %03d - Closing event %d, section end", name, image_count, event->Id() )
-                                }
-                                else
-                                    Info( "%s: %03d - Closing event %d, section end forced ", name, image_count, event->Id() );
-                                closeEvent();
-                                last_section_mod = 0;
-                            }
-                        }
-                        else
-                        {
-                            last_section_mod = section_mod;
-                        }
-                    }
-                    if ( !event )
-                    {
+                  // If analysis fps is set,
+                  // compute the index for pre event images in the dedicated buffer
+                  pre_index = image_count%pre_event_buffer_count;
 
-                        // Create event
-                        event = new Event( this, *timestamp, "Continuous", noteSetMap, videoRecording );
-                        shared_data->last_event = event->Id();
-                        //set up video store data
-                        snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-                        video_store_data->recording = true;
-                        
-                        Info( "%s: %03d - Opening new event %d, section start", name, image_count, event->Id() );
+                  // Seek forward the next filled slot in to the buffer (oldest data)
+                  // from the current position
+                  while ( pre_event_images && !pre_event_buffer[pre_index].timestamp->tv_sec )
+                  {
+                    pre_index = (pre_index + 1)%pre_event_buffer_count;
+                    // Slot is empty, removing image from counter
+                    pre_event_images--;
+                  }
 
-                        /* To prevent cancelling out an existing alert\prealarm\alarm state */
-                        if ( state == IDLE )
-                        {
-                            shared_data->state = state = TAPE;
-                        }
-
-                        //if ( config.overlap_timed_events )
-                        if ( false )
-                        {
-                            int pre_index;
-                            int pre_event_images = pre_event_count;
-
-                            if ( analysis_fps )
-                            {
-                                // If analysis fps is set,
-                                // compute the index for pre event images in the dedicated buffer
-                                pre_index = image_count%pre_event_buffer_count;
-
-                                // Seek forward the next filled slot in to the buffer (oldest data)
-                                // from the current position
-                                while ( pre_event_images && !pre_event_buffer[pre_index].timestamp->tv_sec )
-                                {
-                                    pre_index = (pre_index + 1)%pre_event_buffer_count;
-                                    // Slot is empty, removing image from counter
-                                    pre_event_images--;
-                                }
-                            }
-                            else
-                            {
-                                // If analysis fps is not set (analysis performed at capturing framerate),
-                                // compute the index for pre event images in the capturing buffer
-                                pre_index = ((index + image_buffer_count) - pre_event_count)%image_buffer_count;
-
-                                // Seek forward the next filled slot in to the buffer (oldest data)
-                                // from the current position
-                                while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec )
-                                {
-                                    pre_index = (pre_index + 1)%image_buffer_count;
-                                    // Slot is empty, removing image from counter
-                                    pre_event_images--;
-                                }
-                            }
-
-                            if ( pre_event_images )
-                            {
-                                if ( analysis_fps )
-                                    for ( int i = 0; i < pre_event_images; i++ )
-                                    {
-                                        timestamps[i] = pre_event_buffer[pre_index].timestamp;
-                                        images[i] = pre_event_buffer[pre_index].image;
-                                        pre_index = (pre_index + 1)%pre_event_buffer_count;
-                                    }
-                                else
-                                    for ( int i = 0; i < pre_event_images; i++ )
-                                    {
-                                        timestamps[i] = image_buffer[pre_index].timestamp;
-                                        images[i] = image_buffer[pre_index].image;
-                                        pre_index = (pre_index + 1)%image_buffer_count;
-                                    }
-
-                                event->AddFrames( pre_event_images, images, timestamps );
-                            }
-                        }
-                    }
-                }
-                if ( score )
-                {
-                    if ( (state == IDLE || state == TAPE || state == PREALARM ) )
-                    {
-                        if ( Event::PreAlarmCount() >= (alarm_frame_count-1) )
-                        {
-                            Info( "%s: %03d - Gone into alarm state", name, image_count );
-                            shared_data->state = state = ALARM;
-                            if ( signal_change || (function != MOCORD && state != ALERT) )
-                            {
-                                int pre_index;
-                                int pre_event_images = pre_event_count;
-
-                                if ( analysis_fps )
-                                {
-                                    // If analysis fps is set,
-                                    // compute the index for pre event images in the dedicated buffer
-                                    pre_index = image_count%pre_event_buffer_count;
-
-                                    // Seek forward the next filled slot in to the buffer (oldest data)
-                                    // from the current position
-                                    while ( pre_event_images && !pre_event_buffer[pre_index].timestamp->tv_sec )
-                                    {
-                                        pre_index = (pre_index + 1)%pre_event_buffer_count;
-                                        // Slot is empty, removing image from counter
-                                        pre_event_images--;
-                                    }
-
-                                    event = new Event( this, *(pre_event_buffer[pre_index].timestamp), cause, noteSetMap );
-                                }
-                                else
-                                {
-                                    // If analysis fps is not set (analysis performed at capturing framerate),
-                                    // compute the index for pre event images in the capturing buffer
-                                    if ( alarm_frame_count > 1 )
-                                        pre_index = ((index + image_buffer_count) - ((alarm_frame_count - 1) + pre_event_count))%image_buffer_count;
-                                    else
-                                        pre_index = ((index + image_buffer_count) - pre_event_count)%image_buffer_count;
-
-                                    // Seek forward the next filled slot in to the buffer (oldest data)
-                                    // from the current position
-                                    while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec )
-                                    {
-                                        pre_index = (pre_index + 1)%image_buffer_count;
-                                        // Slot is empty, removing image from counter
-                                        pre_event_images--;
-                                    }
-
-                                    event = new Event( this, *(image_buffer[pre_index].timestamp), cause, noteSetMap );
-                                }
-                                shared_data->last_event = event->Id();
-                                //set up video store data
-                                snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
-                                video_store_data->recording = true;
-
-                                Info( "%s: %03d - Opening new event %d, alarm start", name, image_count, event->Id() );
-
-                                if ( pre_event_images )
-                                {
-                                    if ( analysis_fps )
-                                        for ( int i = 0; i < pre_event_images; i++ )
-                                        {
-                                            timestamps[i] = pre_event_buffer[pre_index].timestamp;
-                                            images[i] = pre_event_buffer[pre_index].image;
-                                            pre_index = (pre_index + 1)%pre_event_buffer_count;
-                                        }
-                                    else
-                                        for ( int i = 0; i < pre_event_images; i++ )
-                                        {
-                                            timestamps[i] = image_buffer[pre_index].timestamp;
-                                            images[i] = image_buffer[pre_index].image;
-                                            pre_index = (pre_index + 1)%image_buffer_count;
-                                        }
-
-                                    event->AddFrames( pre_event_images, images, timestamps );
-                                }
-                                if ( alarm_frame_count )
-                                {
-                                    event->SavePreAlarmFrames();
-                                }
-                            }
-                        }
-                        else if ( state != PREALARM )
-                        {
-                            Info( "%s: %03d - Gone into prealarm state", name, image_count );
-                            shared_data->state = state = PREALARM;
-                        }
-                    }
-                    else if ( state == ALERT )
-                    {
-                        Info( "%s: %03d - Gone back into alarm state", name, image_count );
-                        shared_data->state = state = ALARM;
-                    }
-                    last_alarm_count = image_count;
+                  event = new Event( this, *(pre_event_buffer[pre_index].timestamp), cause, noteSetMap );
                 }
                 else
                 {
-                    if ( state == ALARM )
-                    {
-                        Info( "%s: %03d - Gone into alert state", name, image_count );
-                        shared_data->state = state = ALERT;
-                    }
-                    else if ( state == ALERT )
-                    {
-                        if ( image_count-last_alarm_count > post_event_count )
-                        {
-                            Info( "%s: %03d - Left alarm state (%d) - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() );
-                            //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
-                            if ( function != MOCORD || event_close_mode == CLOSE_ALARM )
-                            {
-                                shared_data->state = state = IDLE;
-                                Info( "%s: %03d - Closing event %d, alarm end%s", name, image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
-                                closeEvent();
-                            }
-                            else
-                            {
-                                shared_data->state = state = TAPE;
-                            }
-                        }
-                    }
-                    if ( state == PREALARM )
-                    {
-                        if ( function != MOCORD )
-                        {
-                            shared_data->state = state = IDLE;
-                        }
-                        else
-                        {
-                            shared_data->state = state = TAPE;
-                        }
-                    }
-                    if ( Event::PreAlarmCount() )
-                        Event::EmptyPreAlarmFrames();
+                  // If analysis fps is not set (analysis performed at capturing framerate),
+                  // compute the index for pre event images in the capturing buffer
+                  if ( alarm_frame_count > 1 )
+                    pre_index = ((index + image_buffer_count) - ((alarm_frame_count - 1) + pre_event_count))%image_buffer_count;
+                  else
+                    pre_index = ((index + image_buffer_count) - pre_event_count)%image_buffer_count;
+
+                  // Seek forward the next filled slot in to the buffer (oldest data)
+                  // from the current position
+                  while ( pre_event_images && !image_buffer[pre_index].timestamp->tv_sec )
+                  {
+                    pre_index = (pre_index + 1)%image_buffer_count;
+                    // Slot is empty, removing image from counter
+                    pre_event_images--;
+                  }
+
+                  event = new Event( this, *(image_buffer[pre_index].timestamp), cause, noteSetMap );
                 }
-                if ( state != IDLE )
+                shared_data->last_event = event->Id();
+                //set up video store data
+                snprintf(video_store_data->event_file, sizeof(video_store_data->event_file), "%s", event->getEventFile());
+                video_store_data->recording = true;
+
+                Info( "%s: %03d - Opening new event %d, alarm start", name, image_count, event->Id() );
+
+                if ( pre_event_images )
                 {
-                    if ( state == PREALARM || state == ALARM )
+                  if ( analysis_fps )
+                    for ( int i = 0; i < pre_event_images; i++ )
                     {
-                        if ( config.create_analysis_images )
-                        {
-                            bool got_anal_image = false;
-							alarm_image.Assign( *snap_image );
-                            for( int i = 0; i < n_zones; i++ )
-                            {
-                                if ( zones[i]->Alarmed() )
-                                {
-                                    if ( zones[i]->AlarmImage() )
-                                    {
-                                        alarm_image.Overlay( *(zones[i]->AlarmImage()) );
-                                        got_anal_image = true;
-                                    }
-                                    if ( config.record_event_stats && state == ALARM )
-                                    {
-                                        zones[i]->RecordStats( event );
-                                    }
-                                }
-                            }
-                            if ( got_anal_image )
-                            {
-                                if ( state == PREALARM )
-                                    Event::AddPreAlarmFrame( snap_image, *timestamp, score, &alarm_image );
-                                else
-                                    event->AddFrame( snap_image, *timestamp, score, &alarm_image );
-                            }
-                            else
-                            {
-                                if ( state == PREALARM )
-                                    Event::AddPreAlarmFrame( snap_image, *timestamp, score );
-                                else
-                                    event->AddFrame( snap_image, *timestamp, score );
-                            }
-                        }
-                        else
-                        {
-                            for( int i = 0; i < n_zones; i++ )
-                            {
-                                if ( zones[i]->Alarmed() )
-                                {
-                                    if ( config.record_event_stats && state == ALARM )
-                                    {
-                                        zones[i]->RecordStats( event );
-                                    }
-                                }
-                            }
-                            if ( state == PREALARM )
-                                Event::AddPreAlarmFrame( snap_image, *timestamp, score );
-                            else
-                                event->AddFrame( snap_image, *timestamp, score );
-                        }
-                        if ( event && noteSetMap.size() > 0 )
-                            event->updateNotes( noteSetMap );
+                      timestamps[i] = pre_event_buffer[pre_index].timestamp;
+                      images[i] = pre_event_buffer[pre_index].image;
+                      pre_index = (pre_index + 1)%pre_event_buffer_count;
                     }
-                    else if ( state == ALERT )
+                  else
+                    for ( int i = 0; i < pre_event_images; i++ )
                     {
-                        event->AddFrame( snap_image, *timestamp );
-                        if ( noteSetMap.size() > 0 )
-                            event->updateNotes( noteSetMap );
-                    }
-                    else if ( state == TAPE )
-                    {
-                        //Video Storage: activate only for supported cameras. Event::AddFrame knows whether or not we are recording video and saves frames accordingly
-                        if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo())
-                        {
-                            video_store_data->recording = true;
-                        }
-                        if ( !(image_count%(frame_skip+1)) )
-                        {
-                            if ( config.bulk_frame_interval > 1 )
-                            {
-                                event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) );
-                            }
-                            else
-                            {
-                                event->AddFrame( snap_image, *timestamp );
-                            }
-                        }
+                      timestamps[i] = image_buffer[pre_index].timestamp;
+                      images[i] = image_buffer[pre_index].image;
+                      pre_index = (pre_index + 1)%image_buffer_count;
                     }
+
+                  event->AddFrames( pre_event_images, images, timestamps );
                 }
+                if ( alarm_frame_count )
+                {
+                  event->SavePreAlarmFrames();
+                }
+              }
             }
+            else if ( state != PREALARM )
+            {
+              Info( "%s: %03d - Gone into prealarm state", name, image_count );
+              shared_data->state = state = PREALARM;
+            }
+          }
+          else if ( state == ALERT )
+          {
+            Info( "%s: %03d - Gone back into alarm state", name, image_count );
+            shared_data->state = state = ALARM;
+          }
+          last_alarm_count = image_count;
         }
         else
         {
-            if ( event )
+          if ( state == ALARM )
+          {
+            Info( "%s: %03d - Gone into alert state", name, image_count );
+            shared_data->state = state = ALERT;
+          }
+          else if ( state == ALERT )
+          {
+            if ( image_count-last_alarm_count > post_event_count )
             {
-                Info( "%s: %03d - Closing event %d, trigger off", name, image_count, event->Id() );
+              Info( "%s: %03d - Left alarm state (%d) - %d(%d) images", name, image_count, event->Id(), event->Frames(), event->AlarmFrames() );
+              //if ( function != MOCORD || event_close_mode == CLOSE_ALARM || event->Cause() == SIGNAL_CAUSE )
+              if ( function != MOCORD || event_close_mode == CLOSE_ALARM )
+              {
+                shared_data->state = state = IDLE;
+                Info( "%s: %03d - Closing event %d, alarm end%s", name, image_count, event->Id(), (function==MOCORD)?", section truncated":"" );
                 closeEvent();
+              }
+              else
+              {
+                shared_data->state = state = TAPE;
+              }
             }
-            shared_data->state = state = IDLE;
-            last_section_mod = 0;
+          }
+          if ( state == PREALARM )
+          {
+            if ( function != MOCORD )
+            {
+              shared_data->state = state = IDLE;
+            }
+            else
+            {
+              shared_data->state = state = TAPE;
+            }
+          }
+          if ( Event::PreAlarmCount() )
+            Event::EmptyPreAlarmFrames();
         }
-        if ( (!signal_change && signal) && (function == MODECT || function == MOCORD) )
+        if ( state != IDLE )
         {
-            if ( state == ALARM ) {
-               ref_image.Blend( *snap_image, alarm_ref_blend_perc );
-            } else {
-               ref_image.Blend( *snap_image, ref_blend_perc );
+          if ( state == PREALARM || state == ALARM )
+          {
+            if ( config.create_analysis_images )
+            {
+              bool got_anal_image = false;
+              alarm_image.Assign( *snap_image );
+              for( int i = 0; i < n_zones; i++ )
+              {
+                if ( zones[i]->Alarmed() )
+                {
+                  if ( zones[i]->AlarmImage() )
+                  {
+                    alarm_image.Overlay( *(zones[i]->AlarmImage()) );
+                    got_anal_image = true;
+                  }
+                  if ( config.record_event_stats && state == ALARM )
+                  {
+                    zones[i]->RecordStats( event );
+                  }
+                }
+              }
+              if ( got_anal_image )
+              {
+                if ( state == PREALARM )
+                  Event::AddPreAlarmFrame( snap_image, *timestamp, score, &alarm_image );
+                else
+                  event->AddFrame( snap_image, *timestamp, score, &alarm_image );
+              }
+              else
+              {
+                if ( state == PREALARM )
+                  Event::AddPreAlarmFrame( snap_image, *timestamp, score );
+                else
+                  event->AddFrame( snap_image, *timestamp, score );
+              }
             }
+            else
+            {
+              for( int i = 0; i < n_zones; i++ )
+              {
+                if ( zones[i]->Alarmed() )
+                {
+                  if ( config.record_event_stats && state == ALARM )
+                  {
+                    zones[i]->RecordStats( event );
+                  }
+                }
+              }
+              if ( state == PREALARM )
+                Event::AddPreAlarmFrame( snap_image, *timestamp, score );
+              else
+                event->AddFrame( snap_image, *timestamp, score );
+            }
+            if ( event && noteSetMap.size() > 0 )
+              event->updateNotes( noteSetMap );
+          }
+          else if ( state == ALERT )
+          {
+            event->AddFrame( snap_image, *timestamp );
+            if ( noteSetMap.size() > 0 )
+              event->updateNotes( noteSetMap );
+          }
+          else if ( state == TAPE )
+          {
+            //Video Storage: activate only for supported cameras. Event::AddFrame knows whether or not we are recording video and saves frames accordingly
+            if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo())
+            {
+              video_store_data->recording = true;
+            }
+            if ( !(image_count%(frame_skip+1)) )
+            {
+              if ( config.bulk_frame_interval > 1 )
+              {
+                event->AddFrame( snap_image, *timestamp, (event->Frames()<pre_event_count?0:-1) );
+              }
+              else
+              {
+                event->AddFrame( snap_image, *timestamp );
+              }
+            }
+          }
         }
-        last_signal = signal;
+      }
     }
-
-    shared_data->last_read_index = index%image_buffer_count;
-    //shared_data->last_read_time = image_buffer[index].timestamp->tv_sec;
-    shared_data->last_read_time = now.tv_sec;
-
-    if ( analysis_fps )
+    else
     {
-        // If analysis fps is set, add analysed image to dedicated pre event buffer
-        int pre_index = image_count%pre_event_buffer_count;
-        pre_event_buffer[pre_index].image->Assign(*snap->image);
-        memcpy( pre_event_buffer[pre_index].timestamp, snap->timestamp, sizeof(struct timeval) );
+      if ( event )
+      {
+        Info( "%s: %03d - Closing event %d, trigger off", name, image_count, event->Id() );
+        closeEvent();
+      }
+      shared_data->state = state = IDLE;
+      last_section_mod = 0;
     }
+    if ( (!signal_change && signal) && (function == MODECT || function == MOCORD) )
+    {
+      if ( state == ALARM ) {
+         ref_image.Blend( *snap_image, alarm_ref_blend_perc );
+      } else {
+         ref_image.Blend( *snap_image, ref_blend_perc );
+      }
+    }
+    last_signal = signal;
+  }
 
-    image_count++;
+  shared_data->last_read_index = index%image_buffer_count;
+  //shared_data->last_read_time = image_buffer[index].timestamp->tv_sec;
+  shared_data->last_read_time = now.tv_sec;
 
-    return( true );
+  if ( analysis_fps )
+  {
+    // If analysis fps is set, add analysed image to dedicated pre event buffer
+    int pre_index = image_count%pre_event_buffer_count;
+    pre_event_buffer[pre_index].image->Assign(*snap->image);
+    memcpy( pre_event_buffer[pre_index].timestamp, snap->timestamp, sizeof(struct timeval) );
+  }
+
+  image_count++;
+
+  return( true );
 }
 
 void Monitor::Reload()
 {
-    Debug( 1, "Reloading monitor %s", name );
+  Debug( 1, "Reloading monitor %s", name );
 
-    if ( event )
-        Info( "%s: %03d - Closing event %d, reloading", name, image_count, event->Id() );
+  if ( event )
+    Info( "%s: %03d - Closing event %d, reloading", name, image_count, event->Id() );
 
-    closeEvent();
+  closeEvent();
 
-    static char sql[ZM_SQL_MED_BUFSIZ];
-    snprintf( sql, sizeof(sql), "select Function+0, Enabled, LinkedMonitors, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, WarmupCount, PreEventCount, PostEventCount, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Id = '%d'", id );
+  static char sql[ZM_SQL_MED_BUFSIZ];
+  // This seems to have fallen out of date.
+  snprintf( sql, sizeof(sql), "select Function+0, Enabled, LinkedMonitors, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, WarmupCount, PreEventCount, PostEventCount, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour from Monitors where Id = '%d'", id );
 
-    if ( mysql_query( &dbconn, sql ) )
-    {
-        Error( "Can't run query: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-    MYSQL_RES *result = mysql_store_result( &dbconn );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    int n_monitors = mysql_num_rows( result );
-    if ( n_monitors != 1 )
-    {
-        Error( "Bogus number of monitors, %d, returned. Can't reload", n_monitors ); 
-        return;
-    }
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_monitors = mysql_num_rows( result );
+  if ( n_monitors != 1 )
+  {
+    Error( "Bogus number of monitors, %d, returned. Can't reload", n_monitors ); 
+    return;
+  }
 
-    if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
-    {
-        int index = 0;
-        function = (Function)atoi(dbrow[index++]);
-        enabled = atoi(dbrow[index++]);
-        const char *p_linked_monitors = dbrow[index++];
-        strncpy( event_prefix, dbrow[index++], sizeof(event_prefix) );
-        strncpy( label_format, dbrow[index++], sizeof(label_format) );
-        label_coord = Coord( atoi(dbrow[index]), atoi(dbrow[index+1]) ); index += 2;
-        label_size = atoi(dbrow[index++]);
-        warmup_count = atoi(dbrow[index++]);
-        pre_event_count = atoi(dbrow[index++]);
-        post_event_count = atoi(dbrow[index++]);
-        alarm_frame_count = atoi(dbrow[index++]);
-        section_length = atoi(dbrow[index++]);
-        frame_skip = atoi(dbrow[index++]);
-        motion_frame_skip = atoi(dbrow[index++]);
-        analysis_fps = dbrow[index] ? strtod(dbrow[index], NULL) : 0; index++;
-        analysis_update_delay = strtoul(dbrow[index++], NULL, 0);
-        capture_delay = (dbrow[index]&&atof(dbrow[index])>0.0)?int(DT_PREC_3/atof(dbrow[index])):0; index++;
-        alarm_capture_delay = (dbrow[index]&&atof(dbrow[index])>0.0)?int(DT_PREC_3/atof(dbrow[index])):0; index++;
-        fps_report_interval = atoi(dbrow[index++]);
-        ref_blend_perc = atoi(dbrow[index++]);
-        alarm_ref_blend_perc = atoi(dbrow[index++]);
-        track_motion = atoi(dbrow[index++]);
-        
+  if ( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
+  {
+    int index = 0;
+    function = (Function)atoi(dbrow[index++]);
+    enabled = atoi(dbrow[index++]);
+    const char *p_linked_monitors = dbrow[index++];
+    strncpy( event_prefix, dbrow[index++], sizeof(event_prefix) );
+    strncpy( label_format, dbrow[index++], sizeof(label_format) );
+    label_coord = Coord( atoi(dbrow[index]), atoi(dbrow[index+1]) ); index += 2;
+    label_size = atoi(dbrow[index++]);
+    warmup_count = atoi(dbrow[index++]);
+    pre_event_count = atoi(dbrow[index++]);
+    post_event_count = atoi(dbrow[index++]);
+    alarm_frame_count = atoi(dbrow[index++]);
+    section_length = atoi(dbrow[index++]);
+    frame_skip = atoi(dbrow[index++]);
+    motion_frame_skip = atoi(dbrow[index++]);
+    analysis_fps = dbrow[index] ? strtod(dbrow[index], NULL) : 0; index++;
+    analysis_update_delay = strtoul(dbrow[index++], NULL, 0);
+    capture_delay = (dbrow[index]&&atof(dbrow[index])>0.0)?int(DT_PREC_3/atof(dbrow[index])):0; index++;
+    alarm_capture_delay = (dbrow[index]&&atof(dbrow[index])>0.0)?int(DT_PREC_3/atof(dbrow[index])):0; index++;
+    fps_report_interval = atoi(dbrow[index++]);
+    ref_blend_perc = atoi(dbrow[index++]);
+    alarm_ref_blend_perc = atoi(dbrow[index++]);
+    track_motion = atoi(dbrow[index++]);
+    
 
-        if ( dbrow[index][0] == '#' )
-            signal_check_colour = strtol(dbrow[index]+1,0,16);
-        else
-            signal_check_colour = strtol(dbrow[index],0,16);
-        index++;
+    if ( dbrow[index][0] == '#' )
+      signal_check_colour = strtol(dbrow[index]+1,0,16);
+    else
+      signal_check_colour = strtol(dbrow[index],0,16);
+    index++;
 
-        shared_data->state = state = IDLE;
-        shared_data->alarm_x = shared_data->alarm_y = -1;
-        if ( enabled )
-            shared_data->active = true;
-        ready_count = image_count+warmup_count;
+    shared_data->state = state = IDLE;
+    shared_data->alarm_x = shared_data->alarm_y = -1;
+    if ( enabled )
+      shared_data->active = true;
+    ready_count = image_count+warmup_count;
 
-        ReloadLinkedMonitors( p_linked_monitors );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    mysql_free_result( result );
+    ReloadLinkedMonitors( p_linked_monitors );
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  mysql_free_result( result );
 
-    ReloadZones();
+  ReloadZones();
 }
 
 void Monitor::ReloadZones()
 {
-    Debug( 1, "Reloading zones for monitor %s", name );
-    for( int i = 0; i < n_zones; i++ )
-    {
-        delete zones[i];
-    }
-    delete[] zones;
-    zones = 0;
-    n_zones = Zone::Load( this, zones );
-    //DumpZoneImage();
+  Debug( 1, "Reloading zones for monitor %s", name );
+  for( int i = 0; i < n_zones; i++ )
+  {
+    delete zones[i];
+  }
+  delete[] zones;
+  zones = 0;
+  n_zones = Zone::Load( this, zones );
+  //DumpZoneImage();
 }
 
 void Monitor::ReloadLinkedMonitors( const char *p_linked_monitors )
 {
-    Debug( 1, "Reloading linked monitors for monitor %s, '%s'", name, p_linked_monitors );
-    if ( n_linked_monitors )
+  Debug( 1, "Reloading linked monitors for monitor %s, '%s'", name, p_linked_monitors );
+  if ( n_linked_monitors )
+  {
+    for( int i = 0; i < n_linked_monitors; i++ )
     {
-        for( int i = 0; i < n_linked_monitors; i++ )
-        {
-            delete linked_monitors[i];
-        }
-        delete[] linked_monitors;
-        linked_monitors = 0;
+      delete linked_monitors[i];
     }
+    delete[] linked_monitors;
+    linked_monitors = 0;
+  }
 
-    n_linked_monitors = 0;
-    if ( p_linked_monitors )
+  n_linked_monitors = 0;
+  if ( p_linked_monitors )
+  {
+    int n_link_ids = 0;
+    unsigned int link_ids[256];
+
+    char link_id_str[8];
+    char *dest_ptr = link_id_str;
+    const char *src_ptr = p_linked_monitors;
+    while( 1 )
     {
-        int n_link_ids = 0;
-        unsigned int link_ids[256];
-
-        char link_id_str[8];
-        char *dest_ptr = link_id_str;
-        const char *src_ptr = p_linked_monitors;
-        while( 1 )
+      dest_ptr = link_id_str;
+      while( *src_ptr >= '0' && *src_ptr <= '9' )
+      {
+        if ( (dest_ptr-link_id_str) < (unsigned int)(sizeof(link_id_str)-1) )
         {
-            dest_ptr = link_id_str;
-            while( *src_ptr >= '0' && *src_ptr <= '9' )
-            {
-                if ( (dest_ptr-link_id_str) < (unsigned int)(sizeof(link_id_str)-1) )
-                {
-                    *dest_ptr++ = *src_ptr++;
-                }
-                else
-                {
-                    break;
-                }
-            }
-            // Add the link monitor
-            if ( dest_ptr != link_id_str )
-            {
-                *dest_ptr = '\0';
-                unsigned int link_id = atoi(link_id_str);
-                if ( link_id > 0 && link_id != id)
-                {
-                    Debug( 3, "Found linked monitor id %d", link_id );
-                    int j;
-                    for ( j = 0; j < n_link_ids; j++ )
-                    {
-                        if ( link_ids[j] == link_id )
-                            break;
-                    }
-                    if ( j == n_link_ids ) // Not already found
-                    {
-                        link_ids[n_link_ids++] = link_id;
-                    }
-                }
-            }
-            if ( !*src_ptr )
-                break;
-            while( *src_ptr && (*src_ptr < '0' || *src_ptr > '9') )
-                src_ptr++;
-            if ( !*src_ptr )
-                break;
+          *dest_ptr++ = *src_ptr++;
         }
-        if ( n_link_ids > 0 )
+        else
         {
-            Debug( 1, "Linking to %d monitors", n_link_ids );
-            linked_monitors = new MonitorLink *[n_link_ids];
-            int count = 0;
-            for ( int i = 0; i < n_link_ids; i++ )
-            {
-                Debug( 1, "Checking linked monitor %d", link_ids[i] );
-
-                static char sql[ZM_SQL_SML_BUFSIZ];
-                snprintf( sql, sizeof(sql), "select Id, Name from Monitors where Id = %d and Function != 'None' and Function != 'Monitor' and Enabled = 1", link_ids[i] );
-                if ( mysql_query( &dbconn, sql ) )
-                {
-                    Error( "Can't run query: %s", mysql_error( &dbconn ) );
-                    exit( mysql_errno( &dbconn ) );
-                }
-
-                MYSQL_RES *result = mysql_store_result( &dbconn );
-                if ( !result )
-                {
-                    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-                    exit( mysql_errno( &dbconn ) );
-                }
-                int n_monitors = mysql_num_rows( result );
-                if ( n_monitors == 1 )
-                {
-                    MYSQL_ROW dbrow = mysql_fetch_row( result );
-                    Debug( 1, "Linking to monitor %d", link_ids[i] );
-                    linked_monitors[count++] = new MonitorLink( link_ids[i], dbrow[1] );
-                }
-                else
-                {
-                    Warning( "Can't link to monitor %d, invalid id, function or not enabled", link_ids[i] );
-                }
-                mysql_free_result( result );
-            }
-            n_linked_monitors = count;
+          break;
         }
+      }
+      // Add the link monitor
+      if ( dest_ptr != link_id_str )
+      {
+        *dest_ptr = '\0';
+        unsigned int link_id = atoi(link_id_str);
+        if ( link_id > 0 && link_id != id)
+        {
+          Debug( 3, "Found linked monitor id %d", link_id );
+          int j;
+          for ( j = 0; j < n_link_ids; j++ )
+          {
+            if ( link_ids[j] == link_id )
+              break;
+          }
+          if ( j == n_link_ids ) // Not already found
+          {
+            link_ids[n_link_ids++] = link_id;
+          }
+        }
+      }
+      if ( !*src_ptr )
+        break;
+      while( *src_ptr && (*src_ptr < '0' || *src_ptr > '9') )
+        src_ptr++;
+      if ( !*src_ptr )
+        break;
     }
+    if ( n_link_ids > 0 )
+    {
+      Debug( 1, "Linking to %d monitors", n_link_ids );
+      linked_monitors = new MonitorLink *[n_link_ids];
+      int count = 0;
+      for ( int i = 0; i < n_link_ids; i++ )
+      {
+        Debug( 1, "Checking linked monitor %d", link_ids[i] );
+
+        static char sql[ZM_SQL_SML_BUFSIZ];
+        snprintf( sql, sizeof(sql), "select Id, Name from Monitors where Id = %d and Function != 'None' and Function != 'Monitor' and Enabled = 1", link_ids[i] );
+        if ( mysql_query( &dbconn, sql ) )
+        {
+          Error( "Can't run query: %s", mysql_error( &dbconn ) );
+          exit( mysql_errno( &dbconn ) );
+        }
+
+        MYSQL_RES *result = mysql_store_result( &dbconn );
+        if ( !result )
+        {
+          Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+          exit( mysql_errno( &dbconn ) );
+        }
+        int n_monitors = mysql_num_rows( result );
+        if ( n_monitors == 1 )
+        {
+          MYSQL_ROW dbrow = mysql_fetch_row( result );
+          Debug( 1, "Linking to monitor %d", link_ids[i] );
+          linked_monitors[count++] = new MonitorLink( link_ids[i], dbrow[1] );
+        }
+        else
+        {
+          Warning( "Can't link to monitor %d, invalid id, function or not enabled", link_ids[i] );
+        }
+        mysql_free_result( result );
+      }
+      n_linked_monitors = count;
+    }
+  }
 }
 
 #if ZM_HAS_V4L
 int Monitor::LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose )
 {
-    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
-    if ( device[0] ) {
-        sql += " AND Device='";
-        sql += device;
-        sql += "'";
-    }
-    if ( staticConfig.SERVER_ID ) {
-        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
-    }
-	Debug( 1, "Loading Local Monitors with %s", sql.c_str() );
+  std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Method, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Function != 'None' and Type = 'Local'";
+  if ( device[0] ) {
+    sql += " AND Device='";
+    sql += device;
+    sql += "'";
+  }
+  if ( staticConfig.SERVER_ID ) {
+    sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
+  }
+  Debug( 1, "Loading Local Monitors with %s", sql.c_str() );
 
-    MYSQL_RES *result = zmDbFetch( sql.c_str() );
-    if ( !result ) {
-        Error( "Can't load local monitors: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    int n_monitors = mysql_num_rows( result );
-    Debug( 1, "Got %d monitors", n_monitors );
-    delete[] monitors;
-    monitors = new Monitor *[n_monitors];
-    for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-    {
-        int col = 0;
+  MYSQL_RES *result = zmDbFetch( sql.c_str() );
+  if ( !result ) {
+    Error( "Can't load local monitors: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_monitors = mysql_num_rows( result );
+  Debug( 1, "Got %d monitors", n_monitors );
+  delete[] monitors;
+  monitors = new Monitor *[n_monitors];
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+  {
+    int col = 0;
 
-        int id = atoi(dbrow[col]); col++;
-        const char *name = dbrow[col]; col++;
-        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-        int function = atoi(dbrow[col]); col++;
-        int enabled = atoi(dbrow[col]); col++;
-        const char *linked_monitors = dbrow[col]; col++;
-
-        const char *device = dbrow[col]; col++;
-        int channel = atoi(dbrow[col]); col++;
-        int format = atoi(dbrow[col]); col++;
-		bool v4l_multi_buffer = config.v4l_multi_buffer;
-		if ( dbrow[col] ) {
-			if (*dbrow[col] == '0' ) {
-				v4l_multi_buffer = false;
-			} else if ( *dbrow[col] == '1' ) {
-				v4l_multi_buffer = true;
-			} 
-		}
-		col++;
-		
-		int v4l_captures_per_frame = 0;
-		if ( dbrow[col] ) {
-			 v4l_captures_per_frame = atoi(dbrow[col]);
-		} else {
-			v4l_captures_per_frame = config.captures_per_frame;
-		}
-Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
-		col++;
-        const char *method = dbrow[col]; col++;
-
-        int width = atoi(dbrow[col]); col++;
-        int height = atoi(dbrow[col]); col++;
-        int colours = atoi(dbrow[col]); col++;
-        int palette = atoi(dbrow[col]); col++;
-        Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-        unsigned int deinterlacing = atoi(dbrow[col]); col++;
-
-        int savejpegs = atoi(dbrow[col]); col++;
-        int videowriter = atoi(dbrow[col]); col++;
-        std::string encoderparams =  dbrow[col]; col++;
-
-        int brightness = atoi(dbrow[col]); col++;
-        int contrast = atoi(dbrow[col]); col++;
-        int hue = atoi(dbrow[col]); col++;
-        int colour = atoi(dbrow[col]); col++;
-
-        const char *event_prefix = dbrow[col]; col++;
-        const char *label_format = dbrow[col]; col++;
-
-        int label_x = atoi(dbrow[col]); col++;
-        int label_y = atoi(dbrow[col]); col++;
-        int label_size = atoi(dbrow[col]); col++;
-
-        int image_buffer_count = atoi(dbrow[col]); col++;
-        int warmup_count = atoi(dbrow[col]); col++;
-        int pre_event_count = atoi(dbrow[col]); col++;
-        int post_event_count = atoi(dbrow[col]); col++;
-        int stream_replay_buffer = atoi(dbrow[col]); col++;
-        int alarm_frame_count = atoi(dbrow[col]); col++;
-        int section_length = atoi(dbrow[col]); col++;
-        int frame_skip = atoi(dbrow[col]); col++;
-        int motion_frame_skip = atoi(dbrow[col]); col++;
-        double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
-        unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
-        int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int fps_report_interval = atoi(dbrow[col]); col++;
-        int ref_blend_perc = atoi(dbrow[col]); col++;
-        int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-        int track_motion = atoi(dbrow[col]); col++;
-
-        int signal_check_colour;
-        if ( dbrow[col][0] == '#' )
-            signal_check_colour = strtol(dbrow[col]+1,0,16);
-        else
-            signal_check_colour = strtol(dbrow[col],0,16);
-        col++;
-        bool embed_exif = (*dbrow[col] != '0'); col++;
-
-        int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-        int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
-
-        int extras = (deinterlacing>>24)&0xff;
-
-        Camera *camera = new LocalCamera(
-            id,
-            device,
-            channel,
-            format,
-			v4l_multi_buffer,
-			v4l_captures_per_frame,
-            method,
-            cam_width,
-            cam_height,
-            colours,
-            palette,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE,
-            extras
-        );
-
-        monitors[i] = new Monitor(
-            id,
-            name,
-            server_id,
-            function,
-            enabled,
-            linked_monitors,
-            camera,
-            orientation,
-            deinterlacing,
-            savejpegs,
-            videowriter,
-            encoderparams,
-            event_prefix,
-            label_format,
-            Coord( label_x, label_y ),
-            label_size,
-            image_buffer_count,
-            warmup_count,
-            pre_event_count,
-            post_event_count,
-            stream_replay_buffer,
-            alarm_frame_count,
-            section_length,
-            frame_skip,
-            motion_frame_skip,
-            analysis_fps,
-            analysis_update_delay,
-            capture_delay,
-            alarm_capture_delay,
-            fps_report_interval,
-            ref_blend_perc,
-            alarm_ref_blend_perc,
-            track_motion,
-            signal_check_colour,
-            embed_exif,
-            purpose,
-            0,
-            0
-        );
-        Zone **zones = 0;
-        int n_zones = Zone::Load( monitors[i], zones );
-        monitors[i]->AddZones( n_zones, zones );
-        monitors[i]->AddPrivacyBitmask( zones );
-        Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    // Yadda yadda
-    mysql_free_result( result );
-
-    return( n_monitors );
-}
-#endif // ZM_HAS_V4L
-
-int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose )
-{
-    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, SaveJPEGs, VideoWriter, EncoderParameters, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'";
-    if ( staticConfig.SERVER_ID ) {
-        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
-    }
-
-    if ( protocol ) {
-        sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path );
-    }
-
-	Debug( 1, "Loading Remote Monitors with %s", sql.c_str() );
-    MYSQL_RES *result = zmDbFetch( sql.c_str() );
-    if ( !result ) {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    int n_monitors = mysql_num_rows( result );
-    Debug( 1, "Got %d monitors", n_monitors );
-    delete[] monitors;
-    monitors = new Monitor *[n_monitors];
-    for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-    {
-        int col = 0;
-
-        int id = atoi(dbrow[col]); col++;
-        std::string name = dbrow[col]; col++;
-        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-        int function = atoi(dbrow[col]); col++;
-        int enabled = atoi(dbrow[col]); col++;
-        const char *linked_monitors = dbrow[col]; col++;
-
-        std::string protocol = dbrow[col]; col++;
-        std::string method = dbrow[col]; col++;
-        std::string host = dbrow[col]; col++;
-        std::string port = dbrow[col]; col++;
-        std::string path = dbrow[col]; col++;
-
-        int width = atoi(dbrow[col]); col++;
-        int height = atoi(dbrow[col]); col++;
-        int colours = atoi(dbrow[col]); col++;
-        /* int palette = atoi(dbrow[col]); */ col++;
-        Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-        unsigned int deinterlacing = atoi(dbrow[col]); col++;
-        bool rtsp_describe = (*dbrow[col] != '0'); col++;
-        int savejpegs = atoi(dbrow[col]); col++;
-        int videowriter = atoi(dbrow[col]); col++;
-        std::string encoderparams =  dbrow[col]; col++;
-      
-        int brightness = atoi(dbrow[col]); col++;
-        int contrast = atoi(dbrow[col]); col++;
-        int hue = atoi(dbrow[col]); col++;
-        int colour = atoi(dbrow[col]); col++;
-
-        std::string event_prefix = dbrow[col]; col++;
-        std::string label_format = dbrow[col]; col++;
-
-        int label_x = atoi(dbrow[col]); col++;
-        int label_y = atoi(dbrow[col]); col++;
-        int label_size = atoi(dbrow[col]); col++;
-
-        int image_buffer_count = atoi(dbrow[col]); col++;
-        int warmup_count = atoi(dbrow[col]); col++;
-        int pre_event_count = atoi(dbrow[col]); col++;
-        int post_event_count = atoi(dbrow[col]); col++;
-        int stream_replay_buffer = atoi(dbrow[col]); col++;
-        int alarm_frame_count = atoi(dbrow[col]); col++;
-        int section_length = atoi(dbrow[col]); col++;
-        int frame_skip = atoi(dbrow[col]); col++;
-        int motion_frame_skip = atoi(dbrow[col]); col++;
-        double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
-        unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
-        int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int fps_report_interval = atoi(dbrow[col]); col++;
-        int ref_blend_perc = atoi(dbrow[col]); col++;
-        int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-        int track_motion = atoi(dbrow[col]); col++;
-        bool embed_exif = (*dbrow[col] != '0'); col++;
-
-        int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-        int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
-
-        Camera *camera = 0;
-        if ( protocol == "http" )
-        {
-            camera = new RemoteCameraHttp(
-                id,
-                method,
-                host, // Host
-                port, // Port
-                path, // Path
-                cam_width,
-                cam_height,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
-        }
-#if HAVE_LIBAVFORMAT
-        else if ( protocol == "rtsp" )
-        {
-            camera = new RemoteCameraRtsp(
-                id,
-                method,
-                host, // Host
-                port, // Port
-                path, // Path
-                cam_width,
-                cam_height,
-                rtsp_describe,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
-        }
-#endif // HAVE_LIBAVFORMAT
-        else
-        {
-            Fatal( "Unexpected remote camera protocol '%s'", protocol.c_str() );
-        }
-
-        monitors[i] = new Monitor(
-            id,
-            name.c_str(),
-            server_id,
-            function,
-            enabled,
-            linked_monitors,
-            camera,
-            orientation,
-            deinterlacing,
-            savejpegs,
-            videowriter,
-            encoderparams,
-            event_prefix.c_str(),
-            label_format.c_str(),
-            Coord( label_x, label_y ),
-            label_size,
-            image_buffer_count,
-            warmup_count,
-            pre_event_count,
-            post_event_count,
-            stream_replay_buffer,
-            alarm_frame_count,
-            section_length,
-            frame_skip,
-            motion_frame_skip,
-            analysis_fps,
-            analysis_update_delay,
-            capture_delay,
-            alarm_capture_delay,
-            fps_report_interval,
-            ref_blend_perc,
-            alarm_ref_blend_perc,
-            track_motion,
-            RGB_WHITE,
-            embed_exif,
-            purpose,
-            0,
-            0
-
-        );
-        Zone **zones = 0;
-        int n_zones = Zone::Load( monitors[i], zones );
-        monitors[i]->AddZones( n_zones, zones );
-        monitors[i]->AddPrivacyBitmask( zones );
-        Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    // Yadda yadda
-    mysql_free_result( result );
-
-    return( n_monitors );
-}
-
-int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose )
-{
-        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'File'";
-    if ( file[0] ) {
-        sql += " AND Path='";
-        sql += file;
-        sql += "'";
-    }
-    if ( staticConfig.SERVER_ID ) {
-        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
-    }
-	Debug( 1, "Loading File Monitors with %s", sql.c_str() );
-    MYSQL_RES *result = zmDbFetch( sql.c_str() );
-    if ( !result )
-    {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    int n_monitors = mysql_num_rows( result );
-    Debug( 1, "Got %d monitors", n_monitors );
-    delete[] monitors;
-    monitors = new Monitor *[n_monitors];
-    for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-    {
-        int col = 0;
-
-        int id = atoi(dbrow[col]); col++;
-        const char *name = dbrow[col]; col++;
-        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-        int function = atoi(dbrow[col]); col++;
-        int enabled = atoi(dbrow[col]); col++;
-        const char *linked_monitors = dbrow[col]; col++;
-
-        const char *path = dbrow[col]; col++;
-
-        int width = atoi(dbrow[col]); col++;
-        int height = atoi(dbrow[col]); col++;
-        int colours = atoi(dbrow[col]); col++;
-        /* int palette = atoi(dbrow[col]); */ col++;
-        Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-        unsigned int deinterlacing = atoi(dbrow[col]); col++;
-
-        int savejpegs = atoi(dbrow[col]); col++;
-        int videowriter = atoi(dbrow[col]); col++;
-        std::string encoderparams =  dbrow[col]; col++;
-
-        int brightness = atoi(dbrow[col]); col++;
-        int contrast = atoi(dbrow[col]); col++;
-        int hue = atoi(dbrow[col]); col++;
-        int colour = atoi(dbrow[col]); col++;
-
-        const char *event_prefix = dbrow[col]; col++;
-        const char *label_format = dbrow[col]; col++;
-
-        int label_x = atoi(dbrow[col]); col++;
-        int label_y = atoi(dbrow[col]); col++;
-        int label_size = atoi(dbrow[col]); col++;
-
-        int image_buffer_count = atoi(dbrow[col]); col++;
-        int warmup_count = atoi(dbrow[col]); col++;
-        int pre_event_count = atoi(dbrow[col]); col++;
-        int post_event_count = atoi(dbrow[col]); col++;
-        int stream_replay_buffer = atoi(dbrow[col]); col++;
-        int alarm_frame_count = atoi(dbrow[col]); col++;
-        int section_length = atoi(dbrow[col]); col++;
-        int frame_skip = atoi(dbrow[col]); col++;
-        int motion_frame_skip = atoi(dbrow[col]); col++;
-        double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
-        unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
-        int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int fps_report_interval = atoi(dbrow[col]); col++;
-        int ref_blend_perc = atoi(dbrow[col]); col++;
-        int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-        int track_motion = atoi(dbrow[col]); col++;
-        bool embed_exif = (*dbrow[col] != '0'); col++;
-
-        int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-        int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
-
-        Camera *camera = new FileCamera(
-            id,
-            path, // File
-            cam_width,
-            cam_height,
-            colours,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE
-        );
-
-        monitors[i] = new Monitor(
-            id,
-            name,
-            server_id,
-            function,
-            enabled,
-            linked_monitors,
-            camera,
-            orientation,
-            deinterlacing,
-            savejpegs,
-            videowriter,
-            encoderparams,
-            event_prefix,
-            label_format,
-            Coord( label_x, label_y ),
-            label_size,
-            image_buffer_count,
-            warmup_count,
-            pre_event_count,
-            post_event_count,
-            stream_replay_buffer,
-            alarm_frame_count,
-            section_length,
-            frame_skip,
-            motion_frame_skip,
-            analysis_fps,
-            analysis_update_delay,
-            capture_delay,
-            alarm_capture_delay,
-            fps_report_interval,
-            ref_blend_perc,
-            alarm_ref_blend_perc,
-            track_motion,
-            embed_exif,
-            RGB_WHITE,
-            purpose,
-            0,
-            0
-        );
-        Zone **zones = 0;
-        int n_zones = Zone::Load( monitors[i], zones );
-        monitors[i]->AddZones( n_zones, zones );
-        monitors[i]->AddPrivacyBitmask( zones );
-        Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    // Yadda yadda
-    mysql_free_result( result );
-
-    return( n_monitors );
-}
-
-#if HAVE_LIBAVFORMAT
-int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose )
-{
-        std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Ffmpeg'";
-    if ( file[0] ) {
-        sql += " AND Path = '";
-        sql += file;
-        sql += "'";
-    }
-    if ( staticConfig.SERVER_ID ) {
-        sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
-    }
-	Debug( 1, "Loading FFMPEG Monitors with %s", sql.c_str() );
-    MYSQL_RES *result = zmDbFetch( sql.c_str() );
-    if ( ! result ) {
-        Error( "Cannot load FfmpegMonitors" );
-        exit( mysql_errno( &dbconn ) );
-    }
-
-    int n_monitors = mysql_num_rows( result );
-    Debug( 1, "Got %d monitors", n_monitors );
-    delete[] monitors;
-    monitors = new Monitor *[n_monitors];
-    for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-    {
-        int col = 0;
-
-        int id = atoi(dbrow[col]); col++;
-        const char *name = dbrow[col]; col++;
-        unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-        int function = atoi(dbrow[col]); col++;
-        int enabled = atoi(dbrow[col]); col++;
-        const char *linked_monitors = dbrow[col]; col++;
-
-        const char *path = dbrow[col]; col++;
-        const char *method = dbrow[col]; col++;
-        const char *options = dbrow[col]; col++;
-
-        int width = atoi(dbrow[col]); col++;
-        int height = atoi(dbrow[col]); col++;
-        int colours = atoi(dbrow[col]); col++;
-        /* int palette = atoi(dbrow[col]); */ col++;
-        Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
-        unsigned int deinterlacing = atoi(dbrow[col]); col++;
-
-        int savejpegs = atoi(dbrow[col]); col++;
-        int videowriter = atoi(dbrow[col]); col++;
-        std::string encoderparams =  dbrow[col]; col++;
-
-        int brightness = atoi(dbrow[col]); col++;
-        int contrast = atoi(dbrow[col]); col++;
-        int hue = atoi(dbrow[col]); col++;
-        int colour = atoi(dbrow[col]); col++;
-
-        const char *event_prefix = dbrow[col]; col++;
-        const char *label_format = dbrow[col]; col++;
-
-        int label_x = atoi(dbrow[col]); col++;
-        int label_y = atoi(dbrow[col]); col++;
-        int label_size = atoi(dbrow[col]); col++;
-
-        int image_buffer_count = atoi(dbrow[col]); col++;
-        int warmup_count = atoi(dbrow[col]); col++;
-        int pre_event_count = atoi(dbrow[col]); col++;
-        int post_event_count = atoi(dbrow[col]); col++;
-        int stream_replay_buffer = atoi(dbrow[col]); col++;
-        int alarm_frame_count = atoi(dbrow[col]); col++;
-        int section_length = atoi(dbrow[col]); col++;
-        int frame_skip = atoi(dbrow[col]); col++;
-        int motion_frame_skip = atoi(dbrow[col]); col++;
-        double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
-        unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
-        int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
-        int fps_report_interval = atoi(dbrow[col]); col++;
-        int ref_blend_perc = atoi(dbrow[col]); col++;
-        int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
-        int track_motion = atoi(dbrow[col]); col++;
-        bool embed_exif = (*dbrow[col] != '0'); col++;
-
-        int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-        int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
-
-        Camera *camera = new FfmpegCamera(
-            id,
-            path, // File
-            method,
-            options,
-            cam_width,
-            cam_height,
-            colours,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE
-        );
-
-        monitors[i] = new Monitor(
-            id,
-            name,
-            server_id,
-            function,
-            enabled,
-            linked_monitors,
-            camera,
-            orientation,
-            deinterlacing,
-            savejpegs,
-            videowriter,
-            encoderparams,
-            event_prefix,
-            label_format,
-            Coord( label_x, label_y ),
-            label_size,
-            image_buffer_count,
-            warmup_count,
-            pre_event_count,
-            post_event_count,
-            stream_replay_buffer,
-            alarm_frame_count,
-            section_length,
-            frame_skip,
-            motion_frame_skip,
-            analysis_fps,
-            analysis_update_delay,
-            capture_delay,
-            alarm_capture_delay,
-            fps_report_interval,
-            ref_blend_perc,
-            alarm_ref_blend_perc,
-            track_motion,
-            embed_exif,
-            RGB_WHITE,
-            purpose,
-            0,
-            0
-        );
-        Zone **zones = 0;
-        int n_zones = Zone::Load( monitors[i], zones );
-        monitors[i]->AddZones( n_zones, zones );
-        monitors[i]->AddPrivacyBitmask( zones );
-        Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
-    }
-    if ( mysql_errno( &dbconn ) )
-    {
-        Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    // Yadda yadda
-    mysql_free_result( result );
-
-    return( n_monitors );
-}
-#endif // HAVE_LIBAVFORMAT
-
-Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
-{
-    std::string sql = stringtf( "select Id, Name, ServerId, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, SaveJPEGs, VideoWriter, EncoderParameters, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", p_id );
-
-    MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() );
-    if ( ! dbrow ) {
-        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-        exit( mysql_errno( &dbconn ) );
-    }
-    Monitor *monitor = 0;
-    unsigned int col = 0;
-
-    unsigned int id = atoi(dbrow[col]); col++;
-    std::string name = dbrow[col]; col++;
+    int id = atoi(dbrow[col]); col++;
+    const char *name = dbrow[col]; col++;
     unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
-    std::string type = dbrow[col]; col++;
     int function = atoi(dbrow[col]); col++;
     int enabled = atoi(dbrow[col]); col++;
-    std::string linked_monitors = dbrow[col]; col++;
+    const char *linked_monitors = dbrow[col]; col++;
 
-    std::string device = dbrow[col]; col++;
+    const char *device = dbrow[col]; col++;
     int channel = atoi(dbrow[col]); col++;
     int format = atoi(dbrow[col]); col++;
-
     bool v4l_multi_buffer = config.v4l_multi_buffer;
     if ( dbrow[col] ) {
-        if (*dbrow[col] == '0' ) {
-            v4l_multi_buffer = false;
-        } else if ( *dbrow[col] == '1' ) {
-            v4l_multi_buffer = true;
-        }
+      if (*dbrow[col] == '0' ) {
+        v4l_multi_buffer = false;
+      } else if ( *dbrow[col] == '1' ) {
+        v4l_multi_buffer = true;
+      } 
     }
     col++;
-
+    
     int v4l_captures_per_frame = 0;
     if ( dbrow[col] ) {
-         v4l_captures_per_frame = atoi(dbrow[col]);
+       v4l_captures_per_frame = atoi(dbrow[col]);
     } else {
-        v4l_captures_per_frame = config.captures_per_frame;
+      v4l_captures_per_frame = config.captures_per_frame;
     }
 Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
     col++;
-
-    std::string protocol = dbrow[col]; col++;
-    std::string method = dbrow[col]; col++;
-    std::string host = dbrow[col]; col++;
-    std::string port = dbrow[col]; col++;
-    std::string path = dbrow[col]; col++;
-    std::string options = dbrow[col]; col++;
-    std::string user = dbrow[col]; col++;
-    std::string pass = dbrow[col]; col++;
+    const char *method = dbrow[col]; col++;
 
     int width = atoi(dbrow[col]); col++;
     int height = atoi(dbrow[col]); col++;
@@ -2820,10 +2150,181 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
     int palette = atoi(dbrow[col]); col++;
     Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
     unsigned int deinterlacing = atoi(dbrow[col]); col++;
-	bool rtsp_describe = (*dbrow[col] != '0'); col++;
+
     int savejpegs = atoi(dbrow[col]); col++;
     int videowriter = atoi(dbrow[col]); col++;
     std::string encoderparams =  dbrow[col]; col++;
+    bool record_audio = (*dbrow[col] != '0'); col++;
+
+    int brightness = atoi(dbrow[col]); col++;
+    int contrast = atoi(dbrow[col]); col++;
+    int hue = atoi(dbrow[col]); col++;
+    int colour = atoi(dbrow[col]); col++;
+
+    const char *event_prefix = dbrow[col]; col++;
+    const char *label_format = dbrow[col]; col++;
+
+    int label_x = atoi(dbrow[col]); col++;
+    int label_y = atoi(dbrow[col]); col++;
+    int label_size = atoi(dbrow[col]); col++;
+
+    int image_buffer_count = atoi(dbrow[col]); col++;
+    int warmup_count = atoi(dbrow[col]); col++;
+    int pre_event_count = atoi(dbrow[col]); col++;
+    int post_event_count = atoi(dbrow[col]); col++;
+    int stream_replay_buffer = atoi(dbrow[col]); col++;
+    int alarm_frame_count = atoi(dbrow[col]); col++;
+    int section_length = atoi(dbrow[col]); col++;
+    int frame_skip = atoi(dbrow[col]); col++;
+    int motion_frame_skip = atoi(dbrow[col]); col++;
+    double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
+    unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
+    int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int fps_report_interval = atoi(dbrow[col]); col++;
+    int ref_blend_perc = atoi(dbrow[col]); col++;
+    int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+    int track_motion = atoi(dbrow[col]); col++;
+
+    int signal_check_colour;
+    if ( dbrow[col][0] == '#' )
+      signal_check_colour = strtol(dbrow[col]+1,0,16);
+    else
+      signal_check_colour = strtol(dbrow[col],0,16);
+    col++;
+    bool embed_exif = (*dbrow[col] != '0'); col++;
+
+    int extras = (deinterlacing>>24)&0xff;
+
+    Camera *camera = new LocalCamera(
+      id,
+      device,
+      channel,
+      format,
+      v4l_multi_buffer,
+      v4l_captures_per_frame,
+      method,
+      width,
+      height,
+      colours,
+      palette,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio,
+      extras
+    );
+
+    monitors[i] = new Monitor(
+      id,
+      name,
+      server_id,
+      function,
+      enabled,
+      linked_monitors,
+      camera,
+      orientation,
+      deinterlacing,
+      savejpegs,
+      videowriter,
+      encoderparams,
+      record_audio,
+      event_prefix,
+      label_format,
+      Coord( label_x, label_y ),
+      label_size,
+      image_buffer_count,
+      warmup_count,
+      pre_event_count,
+      post_event_count,
+      stream_replay_buffer,
+      alarm_frame_count,
+      section_length,
+      frame_skip,
+      motion_frame_skip,
+      analysis_fps,
+      analysis_update_delay,
+      capture_delay,
+      alarm_capture_delay,
+      fps_report_interval,
+      ref_blend_perc,
+      alarm_ref_blend_perc,
+      track_motion,
+      signal_check_colour,
+      embed_exif,
+      purpose,
+      0,
+      0
+    );
+    Zone **zones = 0;
+    int n_zones = Zone::Load( monitors[i], zones );
+    monitors[i]->AddZones( n_zones, zones );
+    monitors[i]->AddPrivacyBitmask( zones );
+    Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  // Yadda yadda
+  mysql_free_result( result );
+
+  return( n_monitors );
+}
+#endif // ZM_HAS_V4L
+
+int Monitor::LoadRemoteMonitors( const char *protocol, const char *host, const char *port, const char *path, Monitor **&monitors, Purpose purpose )
+{
+  std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Protocol, Method, Host, Port, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Remote'";
+  if ( staticConfig.SERVER_ID ) {
+    sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
+  }
+
+  if ( protocol ) {
+    sql += stringtf(" AND Protocol = '%s' and Host = '%s' and Port = '%s' and Path = '%s'", protocol, host, port, path );
+  }
+
+  Debug( 1, "Loading Remote Monitors with %s", sql.c_str() );
+  MYSQL_RES *result = zmDbFetch( sql.c_str() );
+  if ( !result ) {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_monitors = mysql_num_rows( result );
+  Debug( 1, "Got %d monitors", n_monitors );
+  delete[] monitors;
+  monitors = new Monitor *[n_monitors];
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+  {
+    int col = 0;
+
+    int id = atoi(dbrow[col]); col++;
+    std::string name = dbrow[col]; col++;
+    unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+    int function = atoi(dbrow[col]); col++;
+    int enabled = atoi(dbrow[col]); col++;
+    const char *linked_monitors = dbrow[col]; col++;
+
+    std::string protocol = dbrow[col]; col++;
+    std::string method = dbrow[col]; col++;
+    std::string host = dbrow[col]; col++;
+    std::string port = dbrow[col]; col++;
+    std::string path = dbrow[col]; col++;
+
+    int width = atoi(dbrow[col]); col++;
+    int height = atoi(dbrow[col]); col++;
+    int colours = atoi(dbrow[col]); col++;
+    /* int palette = atoi(dbrow[col]); */ col++;
+    Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
+    unsigned int deinterlacing = atoi(dbrow[col]); col++;
+    bool rtsp_describe = (*dbrow[col] != '0'); col++;
+    int savejpegs = atoi(dbrow[col]); col++;
+    int videowriter = atoi(dbrow[col]); col++;
+    std::string encoderparams =  dbrow[col]; col++;
+    bool record_audio = (*dbrow[col] != '0'); col++;
 
     int brightness = atoi(dbrow[col]); col++;
     int contrast = atoi(dbrow[col]); col++;
@@ -2854,1765 +2355,2094 @@ Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
     int ref_blend_perc = atoi(dbrow[col]); col++;
     int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
     int track_motion = atoi(dbrow[col]); col++;
-
-    int signal_check_colour;
-    if ( dbrow[col][0] == '#' )
-        signal_check_colour = strtol(dbrow[col]+1,0,16);
-    else
-        signal_check_colour = strtol(dbrow[col],0,16);
-	col++;
     bool embed_exif = (*dbrow[col] != '0'); col++;
 
-    int cam_width = ((orientation==ROTATE_90||orientation==ROTATE_270)?height:width);
-    int cam_height = ((orientation==ROTATE_90||orientation==ROTATE_270)?width:height);
-
-    int extras = (deinterlacing>>24)&0xff;
-
     Camera *camera = 0;
-    if ( type == "Local" )
+    if ( protocol == "http" )
     {
+      camera = new RemoteCameraHttp(
+        id,
+        method,
+        host, // Host
+        port, // Port
+        path, // Path
+        width,
+        height,
+        colours,
+        brightness,
+        contrast,
+        hue,
+        colour,
+        purpose==CAPTURE,
+        record_audio
+      );
+    }
+#if HAVE_LIBAVFORMAT
+    else if ( protocol == "rtsp" )
+    {
+      camera = new RemoteCameraRtsp(
+        id,
+        method,
+        host, // Host
+        port, // Port
+        path, // Path
+        width,
+        height,
+        rtsp_describe,
+        colours,
+        brightness,
+        contrast,
+        hue,
+        colour,
+        purpose==CAPTURE,
+        record_audio
+      );
+    }
+#endif // HAVE_LIBAVFORMAT
+    else
+    {
+      Fatal( "Unexpected remote camera protocol '%s'", protocol.c_str() );
+    }
+
+    monitors[i] = new Monitor(
+      id,
+      name.c_str(),
+      server_id,
+      function,
+      enabled,
+      linked_monitors,
+      camera,
+      orientation,
+      deinterlacing,
+      savejpegs,
+      videowriter,
+      encoderparams,
+      record_audio,
+      event_prefix.c_str(),
+      label_format.c_str(),
+      Coord( label_x, label_y ),
+      label_size,
+      image_buffer_count,
+      warmup_count,
+      pre_event_count,
+      post_event_count,
+      stream_replay_buffer,
+      alarm_frame_count,
+      section_length,
+      frame_skip,
+      motion_frame_skip,
+      analysis_fps,
+      analysis_update_delay,
+      capture_delay,
+      alarm_capture_delay,
+      fps_report_interval,
+      ref_blend_perc,
+      alarm_ref_blend_perc,
+      track_motion,
+      RGB_WHITE,
+      embed_exif,
+      purpose,
+      0,
+      0
+
+    );
+    Zone **zones = 0;
+    int n_zones = Zone::Load( monitors[i], zones );
+    monitors[i]->AddZones( n_zones, zones );
+    monitors[i]->AddPrivacyBitmask( zones );
+    Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  // Yadda yadda
+  mysql_free_result( result );
+
+  return( n_monitors );
+}
+
+int Monitor::LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose )
+{
+    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'File'";
+  if ( file[0] ) {
+    sql += " AND Path='";
+    sql += file;
+    sql += "'";
+  }
+  if ( staticConfig.SERVER_ID ) {
+    sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
+  }
+  Debug( 1, "Loading File Monitors with %s", sql.c_str() );
+  MYSQL_RES *result = zmDbFetch( sql.c_str() );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_monitors = mysql_num_rows( result );
+  Debug( 1, "Got %d monitors", n_monitors );
+  delete[] monitors;
+  monitors = new Monitor *[n_monitors];
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+  {
+    int col = 0;
+
+    int id = atoi(dbrow[col]); col++;
+    const char *name = dbrow[col]; col++;
+    unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+    int function = atoi(dbrow[col]); col++;
+    int enabled = atoi(dbrow[col]); col++;
+    const char *linked_monitors = dbrow[col]; col++;
+
+    const char *path = dbrow[col]; col++;
+
+    int width = atoi(dbrow[col]); col++;
+    int height = atoi(dbrow[col]); col++;
+    int colours = atoi(dbrow[col]); col++;
+    /* int palette = atoi(dbrow[col]); */ col++;
+    Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
+    unsigned int deinterlacing = atoi(dbrow[col]); col++;
+
+    int savejpegs = atoi(dbrow[col]); col++;
+    int videowriter = atoi(dbrow[col]); col++;
+    std::string encoderparams =  dbrow[col]; col++;
+    bool record_audio = (*dbrow[col] != '0'); col++;
+
+    int brightness = atoi(dbrow[col]); col++;
+    int contrast = atoi(dbrow[col]); col++;
+    int hue = atoi(dbrow[col]); col++;
+    int colour = atoi(dbrow[col]); col++;
+
+    const char *event_prefix = dbrow[col]; col++;
+    const char *label_format = dbrow[col]; col++;
+
+    int label_x = atoi(dbrow[col]); col++;
+    int label_y = atoi(dbrow[col]); col++;
+    int label_size = atoi(dbrow[col]); col++;
+
+    int image_buffer_count = atoi(dbrow[col]); col++;
+    int warmup_count = atoi(dbrow[col]); col++;
+    int pre_event_count = atoi(dbrow[col]); col++;
+    int post_event_count = atoi(dbrow[col]); col++;
+    int stream_replay_buffer = atoi(dbrow[col]); col++;
+    int alarm_frame_count = atoi(dbrow[col]); col++;
+    int section_length = atoi(dbrow[col]); col++;
+    int frame_skip = atoi(dbrow[col]); col++;
+    int motion_frame_skip = atoi(dbrow[col]); col++;
+    double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
+    unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
+    int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int fps_report_interval = atoi(dbrow[col]); col++;
+    int ref_blend_perc = atoi(dbrow[col]); col++;
+    int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+    int track_motion = atoi(dbrow[col]); col++;
+    bool embed_exif = (*dbrow[col] != '0'); col++;
+
+    Camera *camera = new FileCamera(
+      id,
+      path, // File
+      width,
+      height,
+      colours,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio
+    );
+
+    monitors[i] = new Monitor(
+      id,
+      name,
+      server_id,
+      function,
+      enabled,
+      linked_monitors,
+      camera,
+      orientation,
+      deinterlacing,
+      savejpegs,
+      videowriter,
+      encoderparams,
+      record_audio,
+      event_prefix,
+      label_format,
+      Coord( label_x, label_y ),
+      label_size,
+      image_buffer_count,
+      warmup_count,
+      pre_event_count,
+      post_event_count,
+      stream_replay_buffer,
+      alarm_frame_count,
+      section_length,
+      frame_skip,
+      motion_frame_skip,
+      analysis_fps,
+      analysis_update_delay,
+      capture_delay,
+      alarm_capture_delay,
+      fps_report_interval,
+      ref_blend_perc,
+      alarm_ref_blend_perc,
+      track_motion,
+      embed_exif,
+      RGB_WHITE,
+      purpose,
+      0,
+      0
+    );
+    Zone **zones = 0;
+    int n_zones = Zone::Load( monitors[i], zones );
+    monitors[i]->AddZones( n_zones, zones );
+    monitors[i]->AddPrivacyBitmask( zones );
+    Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  // Yadda yadda
+  mysql_free_result( result );
+
+  return( n_monitors );
+}
+
+#if HAVE_LIBAVFORMAT
+int Monitor::LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose )
+{
+    std::string sql = "select Id, Name, ServerId, Function+0, Enabled, LinkedMonitors, Path, Method, Options, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, Exif from Monitors where Function != 'None' and Type = 'Ffmpeg'";
+  if ( file[0] ) {
+    sql += " AND Path = '";
+    sql += file;
+    sql += "'";
+  }
+  if ( staticConfig.SERVER_ID ) {
+    sql += stringtf( " AND ServerId=%d", staticConfig.SERVER_ID );
+  }
+  Debug( 1, "Loading FFMPEG Monitors with %s", sql.c_str() );
+  MYSQL_RES *result = zmDbFetch( sql.c_str() );
+  if ( ! result ) {
+    Error( "Cannot load FfmpegMonitors" );
+    exit( mysql_errno( &dbconn ) );
+  }
+
+  int n_monitors = mysql_num_rows( result );
+  Debug( 1, "Got %d monitors", n_monitors );
+  delete[] monitors;
+  monitors = new Monitor *[n_monitors];
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+  {
+    int col = 0;
+
+    int id = atoi(dbrow[col]); col++;
+    const char *name = dbrow[col]; col++;
+    unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+    int function = atoi(dbrow[col]); col++;
+    int enabled = atoi(dbrow[col]); col++;
+    const char *linked_monitors = dbrow[col]; col++;
+
+    const char *path = dbrow[col]; col++;
+    const char *method = dbrow[col]; col++;
+    const char *options = dbrow[col]; col++;
+
+    int width = atoi(dbrow[col]); col++;
+    int height = atoi(dbrow[col]); col++;
+    int colours = atoi(dbrow[col]); col++;
+    /* int palette = atoi(dbrow[col]); */ col++;
+    Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
+    unsigned int deinterlacing = atoi(dbrow[col]); col++;
+
+    int savejpegs = atoi(dbrow[col]); col++;
+    int videowriter = atoi(dbrow[col]); col++;
+    std::string encoderparams =  dbrow[col]; col++;
+    bool record_audio = (*dbrow[col] != '0'); col++;
+
+    int brightness = atoi(dbrow[col]); col++;
+    int contrast = atoi(dbrow[col]); col++;
+    int hue = atoi(dbrow[col]); col++;
+    int colour = atoi(dbrow[col]); col++;
+
+    const char *event_prefix = dbrow[col]; col++;
+    const char *label_format = dbrow[col]; col++;
+
+    int label_x = atoi(dbrow[col]); col++;
+    int label_y = atoi(dbrow[col]); col++;
+    int label_size = atoi(dbrow[col]); col++;
+
+    int image_buffer_count = atoi(dbrow[col]); col++;
+    int warmup_count = atoi(dbrow[col]); col++;
+    int pre_event_count = atoi(dbrow[col]); col++;
+    int post_event_count = atoi(dbrow[col]); col++;
+    int stream_replay_buffer = atoi(dbrow[col]); col++;
+    int alarm_frame_count = atoi(dbrow[col]); col++;
+    int section_length = atoi(dbrow[col]); col++;
+    int frame_skip = atoi(dbrow[col]); col++;
+    int motion_frame_skip = atoi(dbrow[col]); col++;
+    double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
+    unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
+    int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+    int fps_report_interval = atoi(dbrow[col]); col++;
+    int ref_blend_perc = atoi(dbrow[col]); col++;
+    int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+    int track_motion = atoi(dbrow[col]); col++;
+    bool embed_exif = (*dbrow[col] != '0'); col++;
+
+    Camera *camera = new FfmpegCamera(
+      id,
+      path, // File
+      method,
+      options,
+      width,
+      height,
+      colours,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio
+    );
+
+    monitors[i] = new Monitor(
+      id,
+      name,
+      server_id,
+      function,
+      enabled,
+      linked_monitors,
+      camera,
+      orientation,
+      deinterlacing,
+      savejpegs,
+      videowriter,
+      encoderparams,
+      record_audio,
+      event_prefix,
+      label_format,
+      Coord( label_x, label_y ),
+      label_size,
+      image_buffer_count,
+      warmup_count,
+      pre_event_count,
+      post_event_count,
+      stream_replay_buffer,
+      alarm_frame_count,
+      section_length,
+      frame_skip,
+      motion_frame_skip,
+      analysis_fps,
+      analysis_update_delay,
+      capture_delay,
+      alarm_capture_delay,
+      fps_report_interval,
+      ref_blend_perc,
+      alarm_ref_blend_perc,
+      track_motion,
+      embed_exif,
+      RGB_WHITE,
+      purpose,
+      0,
+      0
+    );
+    Zone **zones = 0;
+    int n_zones = Zone::Load( monitors[i], zones );
+    monitors[i]->AddZones( n_zones, zones );
+    monitors[i]->AddPrivacyBitmask( zones );
+    Debug( 1, "Loaded monitor %d(%s), %d zones", id, name, n_zones );
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  // Yadda yadda
+  mysql_free_result( result );
+
+  return( n_monitors );
+}
+#endif // HAVE_LIBAVFORMAT
+
+Monitor *Monitor::Load( unsigned int p_id, bool load_zones, Purpose purpose )
+{
+  std::string sql = stringtf( "select Id, Name, ServerId, Type, Function+0, Enabled, LinkedMonitors, Device, Channel, Format, V4LMultiBuffer, V4LCapturesPerFrame, Protocol, Method, Host, Port, Path, Options, User, Pass, Width, Height, Colours, Palette, Orientation+0, Deinterlacing, RTSPDescribe, SaveJPEGs, VideoWriter, EncoderParameters, RecordAudio, Brightness, Contrast, Hue, Colour, EventPrefix, LabelFormat, LabelX, LabelY, LabelSize, ImageBufferCount, WarmupCount, PreEventCount, PostEventCount, StreamReplayBuffer, AlarmFrameCount, SectionLength, FrameSkip, MotionFrameSkip, AnalysisFPS, AnalysisUpdateDelay, MaxFPS, AlarmMaxFPS, FPSReportInterval, RefBlendPerc, AlarmRefBlendPerc, TrackMotion, SignalCheckColour, Exif from Monitors where Id = %d", p_id );
+
+  MYSQL_ROW dbrow = zmDbFetchOne( sql.c_str() );
+  if ( ! dbrow ) {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  Monitor *monitor = 0;
+  unsigned int col = 0;
+
+  unsigned int id = atoi(dbrow[col]); col++;
+  std::string name = dbrow[col]; col++;
+  unsigned int server_id = dbrow[col] ? atoi(dbrow[col]) : 0; col++;
+  std::string type = dbrow[col]; col++;
+  int function = atoi(dbrow[col]); col++;
+  int enabled = atoi(dbrow[col]); col++;
+  std::string linked_monitors = dbrow[col]; col++;
+
+  std::string device = dbrow[col]; col++;
+  int channel = atoi(dbrow[col]); col++;
+  int format = atoi(dbrow[col]); col++;
+
+  bool v4l_multi_buffer = config.v4l_multi_buffer;
+  if ( dbrow[col] ) {
+    if (*dbrow[col] == '0' ) {
+      v4l_multi_buffer = false;
+    } else if ( *dbrow[col] == '1' ) {
+      v4l_multi_buffer = true;
+    }
+  }
+  col++;
+
+  int v4l_captures_per_frame = 0;
+  if ( dbrow[col] ) {
+     v4l_captures_per_frame = atoi(dbrow[col]);
+  } else {
+    v4l_captures_per_frame = config.captures_per_frame;
+  }
+Debug( 1, "Got %d for v4l_captures_per_frame", v4l_captures_per_frame );
+  col++;
+
+  std::string protocol = dbrow[col]; col++;
+  std::string method = dbrow[col]; col++;
+  std::string host = dbrow[col]; col++;
+  std::string port = dbrow[col]; col++;
+  std::string path = dbrow[col]; col++;
+  std::string options = dbrow[col]; col++;
+  std::string user = dbrow[col]; col++;
+  std::string pass = dbrow[col]; col++;
+
+  int width = atoi(dbrow[col]); col++;
+  int height = atoi(dbrow[col]); col++;
+  int colours = atoi(dbrow[col]); col++;
+  int palette = atoi(dbrow[col]); col++;
+  Orientation orientation = (Orientation)atoi(dbrow[col]); col++;
+  unsigned int deinterlacing = atoi(dbrow[col]); col++;
+  bool rtsp_describe = (*dbrow[col] != '0'); col++;
+  int savejpegs = atoi(dbrow[col]); col++;
+  int videowriter = atoi(dbrow[col]); col++;
+  std::string encoderparams =  dbrow[col]; col++;
+  bool record_audio = (*dbrow[col] != '0'); col++;
+
+  int brightness = atoi(dbrow[col]); col++;
+  int contrast = atoi(dbrow[col]); col++;
+  int hue = atoi(dbrow[col]); col++;
+  int colour = atoi(dbrow[col]); col++;
+
+  std::string event_prefix = dbrow[col]; col++;
+  std::string label_format = dbrow[col]; col++;
+
+  int label_x = atoi(dbrow[col]); col++;
+  int label_y = atoi(dbrow[col]); col++;
+  int label_size = atoi(dbrow[col]); col++;
+
+  int image_buffer_count = atoi(dbrow[col]); col++;
+  int warmup_count = atoi(dbrow[col]); col++;
+  int pre_event_count = atoi(dbrow[col]); col++;
+  int post_event_count = atoi(dbrow[col]); col++;
+  int stream_replay_buffer = atoi(dbrow[col]); col++;
+  int alarm_frame_count = atoi(dbrow[col]); col++;
+  int section_length = atoi(dbrow[col]); col++;
+  int frame_skip = atoi(dbrow[col]); col++;
+  int motion_frame_skip = atoi(dbrow[col]); col++;
+  double analysis_fps = dbrow[col] ? strtod(dbrow[col], NULL) : 0; col++;
+  unsigned int analysis_update_delay = strtoul(dbrow[col++], NULL, 0);
+  int capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+  int alarm_capture_delay = (dbrow[col]&&atof(dbrow[col])>0.0)?int(DT_PREC_3/atof(dbrow[col])):0; col++;
+  int fps_report_interval = atoi(dbrow[col]); col++;
+  int ref_blend_perc = atoi(dbrow[col]); col++;
+  int alarm_ref_blend_perc = atoi(dbrow[col]); col++;
+  int track_motion = atoi(dbrow[col]); col++;
+
+  int signal_check_colour;
+  if ( dbrow[col][0] == '#' )
+    signal_check_colour = strtol(dbrow[col]+1,0,16);
+  else
+    signal_check_colour = strtol(dbrow[col],0,16);
+  col++;
+  bool embed_exif = (*dbrow[col] != '0'); col++;
+
+  int extras = (deinterlacing>>24)&0xff;
+
+  Camera *camera = 0;
+  if ( type == "Local" )
+  {
 #if ZM_HAS_V4L
-        camera = new LocalCamera(
-            id,
-            device.c_str(),
-            channel,
-            format,
-            v4l_multi_buffer,
-            v4l_captures_per_frame,
-            method,
-            cam_width,
-            cam_height,
-            colours,
-            palette,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE,
-            extras
-        );
+    camera = new LocalCamera(
+      id,
+      device.c_str(),
+      channel,
+      format,
+      v4l_multi_buffer,
+      v4l_captures_per_frame,
+      method,
+      width,
+      height,
+      colours,
+      palette,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio,
+      extras
+    );
 #else // ZM_HAS_V4L
-        Fatal( "You must have video4linux libraries and headers installed to use local analog or USB cameras for monitor %d", id );
+    Fatal( "You must have video4linux libraries and headers installed to use local analog or USB cameras for monitor %d", id );
 #endif // ZM_HAS_V4L
-    }
-    else if ( type == "Remote" )
+  }
+  else if ( type == "Remote" )
+  {
+    if ( protocol == "http" )
     {
-        if ( protocol == "http" )
-        {
-            camera = new RemoteCameraHttp(
-                id,
-                method.c_str(),
-                host.c_str(),
-                port.c_str(),
-                path.c_str(),
-                cam_width,
-                cam_height,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
-        }
-        else if ( protocol == "rtsp" )
-        {
-#if HAVE_LIBAVFORMAT
-            camera = new RemoteCameraRtsp(
-                id,
-                method.c_str(),
-                host.c_str(),
-                port.c_str(),
-                path.c_str(),
-                cam_width,
-                cam_height,
-                rtsp_describe,
-                colours,
-                brightness,
-                contrast,
-                hue,
-                colour,
-                purpose==CAPTURE
-            );
-#else // HAVE_LIBAVFORMAT
-            Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
-#endif // HAVE_LIBAVFORMAT
-        }
-        else
-        {
-            Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
-        }
+      camera = new RemoteCameraHttp(
+        id,
+        method.c_str(),
+        host.c_str(),
+        port.c_str(),
+        path.c_str(),
+        width,
+        height,
+        colours,
+        brightness,
+        contrast,
+        hue,
+        colour,
+        purpose==CAPTURE,
+        record_audio
+      );
     }
-    else if ( type == "File" )
-    {
-        camera = new FileCamera(
-            id,
-            path.c_str(),
-            cam_width,
-            cam_height,
-            colours,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE
-        );
-    }
-    else if ( type == "Ffmpeg" )
+    else if ( protocol == "rtsp" )
     {
 #if HAVE_LIBAVFORMAT
-        camera = new FfmpegCamera(
-            id,
-            path.c_str(),
-            method,
-            options,
-            cam_width,
-            cam_height,
-            colours,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE
-        );
+      camera = new RemoteCameraRtsp(
+        id,
+        method.c_str(),
+        host.c_str(),
+        port.c_str(),
+        path.c_str(),
+        width,
+        height,
+        rtsp_describe,
+        colours,
+        brightness,
+        contrast,
+        hue,
+        colour,
+        purpose==CAPTURE,
+        record_audio
+      );
 #else // HAVE_LIBAVFORMAT
-        Fatal( "You must have ffmpeg libraries installed to use ffmpeg cameras for monitor %d", id );
+      Fatal( "You must have ffmpeg libraries installed to use remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
 #endif // HAVE_LIBAVFORMAT
-    }
-    else if (type == "Libvlc")
-    {
-#if HAVE_LIBVLC
-        camera = new LibvlcCamera(
-            id,
-            path.c_str(),
-            method,
-            options,
-            cam_width,
-            cam_height,
-            colours,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE
-        );
-#else // HAVE_LIBVLC
-        Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
-#endif // HAVE_LIBVLC
-    }
-    else if ( type == "cURL" )
-    {
-#if HAVE_LIBCURL
-        camera = new cURLCamera(
-            id,
-            path.c_str(),
-            user.c_str(),
-            pass.c_str(),
-            cam_width,
-            cam_height,
-            colours,
-            brightness,
-            contrast,
-            hue,
-            colour,
-            purpose==CAPTURE
-        );
-#else // HAVE_LIBCURL
-        Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
-#endif // HAVE_LIBCURL
     }
     else
     {
-        Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
+      Fatal( "Unexpected remote camera protocol '%s' for monitor %d", protocol.c_str(), id );
     }
-    monitor = new Monitor(
-        id,
-        name.c_str(),
-        server_id,
-        function,
-        enabled,
-        linked_monitors.c_str(),
-        camera,
-        orientation,
-        deinterlacing,
-        savejpegs,
-        videowriter,
-        encoderparams,
-        event_prefix.c_str(),
-        label_format.c_str(),
-        Coord( label_x, label_y ),
-        label_size,
-        image_buffer_count,
-        warmup_count,
-        pre_event_count,
-        post_event_count,
-        stream_replay_buffer,
-        alarm_frame_count,
-        section_length,
-        frame_skip,
-        motion_frame_skip,
-        analysis_fps,
-        analysis_update_delay,
-        capture_delay,
-        alarm_capture_delay,
-        fps_report_interval,
-        ref_blend_perc,
-        alarm_ref_blend_perc,
-        track_motion,
-        signal_check_colour,
-        embed_exif,
-        purpose,
-        0,
-        0
-
+  }
+  else if ( type == "File" )
+  {
+    camera = new FileCamera(
+      id,
+      path.c_str(),
+      width,
+      height,
+      colours,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio
     );
+  }
+  else if ( type == "Ffmpeg" )
+  {
+#if HAVE_LIBAVFORMAT
+    camera = new FfmpegCamera(
+      id,
+      path.c_str(),
+      method,
+      options,
+      width,
+      height,
+      colours,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio
+    );
+#else // HAVE_LIBAVFORMAT
+    Fatal( "You must have ffmpeg libraries installed to use ffmpeg cameras for monitor %d", id );
+#endif // HAVE_LIBAVFORMAT
+  }
+  else if (type == "Libvlc")
+  {
+#if HAVE_LIBVLC
+    camera = new LibvlcCamera(
+      id,
+      path.c_str(),
+      method,
+      options,
+      width,
+      height,
+      colours,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio
+    );
+#else // HAVE_LIBVLC
+    Fatal( "You must have vlc libraries installed to use vlc cameras for monitor %d", id );
+#endif // HAVE_LIBVLC
+  }
+  else if ( type == "cURL" )
+  {
+#if HAVE_LIBCURL
+    camera = new cURLCamera(
+      id,
+      path.c_str(),
+      user.c_str(),
+      pass.c_str(),
+      width,
+      height,
+      colours,
+      brightness,
+      contrast,
+      hue,
+      colour,
+      purpose==CAPTURE,
+      record_audio
+    );
+#else // HAVE_LIBCURL
+    Fatal( "You must have libcurl installed to use ffmpeg cameras for monitor %d", id );
+#endif // HAVE_LIBCURL
+  }
+  else
+  {
+    Fatal( "Bogus monitor type '%s' for monitor %d", type.c_str(), id );
+  }
+  monitor = new Monitor(
+    id,
+    name.c_str(),
+    server_id,
+    function,
+    enabled,
+    linked_monitors.c_str(),
+    camera,
+    orientation,
+    deinterlacing,
+    savejpegs,
+    videowriter,
+    encoderparams,
+    record_audio,
+    event_prefix.c_str(),
+    label_format.c_str(),
+    Coord( label_x, label_y ),
+    label_size,
+    image_buffer_count,
+    warmup_count,
+    pre_event_count,
+    post_event_count,
+    stream_replay_buffer,
+    alarm_frame_count,
+    section_length,
+    frame_skip,
+    motion_frame_skip,
+    analysis_fps,
+    analysis_update_delay,
+    capture_delay,
+    alarm_capture_delay,
+    fps_report_interval,
+    ref_blend_perc,
+    alarm_ref_blend_perc,
+    track_motion,
+    signal_check_colour,
+    embed_exif,
+    purpose,
+    0,
+    0
 
-    int n_zones = 0;
-    if ( load_zones )
-    {
-        Zone **zones = 0;
-        n_zones = Zone::Load( monitor, zones );
-        monitor->AddZones( n_zones, zones );
-        monitor->AddPrivacyBitmask( zones );
-    }
-    Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
-    return( monitor );
+  );
+
+  int n_zones = 0;
+  if ( load_zones )
+  {
+    Zone **zones = 0;
+    n_zones = Zone::Load( monitor, zones );
+    monitor->AddZones( n_zones, zones );
+    monitor->AddPrivacyBitmask( zones );
+  }
+  Debug( 1, "Loaded monitor %d(%s), %d zones", id, name.c_str(), n_zones );
+  return( monitor );
 }
 
 int Monitor::Capture()
 {
-	static int FirstCapture = 1;
-	int captureResult;
+  static int FirstCapture = 1;
+  int captureResult;
 
-	int index = image_count%image_buffer_count;
-	Image* capture_image = image_buffer[index].image;
+  int index = image_count%image_buffer_count;
+  Image* capture_image = image_buffer[index].image;
 
-	if ( (deinterlacing & 0xff) == 4) {
-		if ( FirstCapture != 1 ) {
-			/* Copy the next image into the shared memory */
-			capture_image->CopyBuffer(*(next_buffer.image)); 
-		}
-		
-	    /* Capture a new next image */
-        
-        //Check if FFMPEG camera
-        if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo()){
-            captureResult = camera->CaptureAndRecord(*(next_buffer.image), video_store_data->recording, video_store_data->event_file);
-        }else{
-            captureResult = camera->Capture(*(next_buffer.image));
-        }
+  if ( (deinterlacing & 0xff) == 4) {
+    if ( FirstCapture != 1 ) {
+      /* Copy the next image into the shared memory */
+      capture_image->CopyBuffer(*(next_buffer.image)); 
+    }
 
-        if ( FirstCapture ) {
-                    FirstCapture = 0;
-                    return 0;
-            }
+    /* Capture a new next image */
+    
+    //Check if FFMPEG camera
+    if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo()){
+      captureResult = camera->CaptureAndRecord(*(next_buffer.image), video_store_data->recording, video_store_data->event_file);
+    }else{
+      captureResult = camera->Capture(*(next_buffer.image));
+    }
 
-    } else {
-        //Check if FFMPEG camera
-        if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo()){
-            //Warning("ZMC: Recording: %d", video_store_data->recording);
-            captureResult = camera->CaptureAndRecord(*capture_image, video_store_data->recording, video_store_data->event_file);
-        }else{
-            /* Capture directly into image buffer, avoiding the need to memcpy() */
-            captureResult = camera->Capture(*capture_image);
-        }
+    if ( FirstCapture ) {
+      FirstCapture = 0;
+      return 0;
+    }
+
+  } else {
+    //Check if FFMPEG camera
+    if((GetOptVideoWriter() == 2) && camera->SupportsNativeVideo()){
+      //Warning("ZMC: Recording: %d", video_store_data->recording);
+      captureResult = camera->CaptureAndRecord(*capture_image, video_store_data->recording, video_store_data->event_file);
+    }else{
+      /* Capture directly into image buffer, avoiding the need to memcpy() */
+      captureResult = camera->Capture(*capture_image);
+    }
+  }
+  
+  if((GetOptVideoWriter() == 2) && captureResult > 0)
+  {
+    //video_store_data->frameNumber = captureResult;
+    captureResult = 0;
+  }
+ 
+  if ( captureResult != 0 )
+  {
+    // Unable to capture image for temporary reason
+    // Fake a signal loss image
+    Rgb signalcolor;
+    signalcolor = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
+    capture_image->Fill(signalcolor);
+    captureResult = 0;
+  } else { 
+    captureResult = 1;
+  }
+  
+  if ( captureResult == 1 )
+  {
+    
+    /* Deinterlacing */
+    if ( (deinterlacing & 0xff) == 1 ) {
+      capture_image->Deinterlace_Discard();
+    } else if ( (deinterlacing & 0xff) == 2 ) {
+      capture_image->Deinterlace_Linear();
+    } else if ( (deinterlacing & 0xff) == 3 ) {
+      capture_image->Deinterlace_Blend();
+    } else if ( (deinterlacing & 0xff) == 4 ) {
+      capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
+    } else if ( (deinterlacing & 0xff) == 5 ) {
+      capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
     }
     
-    if((GetOptVideoWriter() == 2) && captureResult > 0){
-        //video_store_data->frameNumber = captureResult;
-        captureResult = 0;
-    }
     
-    if ( captureResult != 0 )
+    if ( orientation != ROTATE_0 )
     {
-        // Unable to capture image for temporary reason
-        // Fake a signal loss image
-        Rgb signalcolor;
-        signalcolor = rgb_convert(signal_check_colour, ZM_SUBPIX_ORDER_BGR); /* HTML colour code is actually BGR in memory, we want RGB */
-        capture_image->Fill(signalcolor);
-        captureResult = 0;
-    } else { 
-        captureResult = 1;
+      switch ( orientation )
+      {
+        case ROTATE_0 :
+        {
+          // No action required
+          break;
+        }
+        case ROTATE_90 :
+        case ROTATE_180 :
+        case ROTATE_270 :
+        {
+          capture_image->Rotate( (orientation-1)*90 );
+          break;
+        }
+        case FLIP_HORI :
+        case FLIP_VERT :
+        {
+          capture_image->Flip( orientation==FLIP_HORI );
+          break;
+        }
+      }
     }
-    
-    if ( captureResult == 1 )
+  } // end if captureResults == 1
+
+  // if true? let's get rid of this.
+  if ( true ) {
+
+    if ( capture_image->Size() > camera->ImageSize() )
     {
-        
-		/* Deinterlacing */
-		if ( (deinterlacing & 0xff) == 1 ) {
-			capture_image->Deinterlace_Discard();
-		} else if ( (deinterlacing & 0xff) == 2 ) {
-			capture_image->Deinterlace_Linear();
-		} else if ( (deinterlacing & 0xff) == 3 ) {
-			capture_image->Deinterlace_Blend();
-		} else if ( (deinterlacing & 0xff) == 4 ) {
-			capture_image->Deinterlace_4Field( next_buffer.image, (deinterlacing>>8)&0xff );
-		} else if ( (deinterlacing & 0xff) == 5 ) {
-			capture_image->Deinterlace_Blend_CustomRatio( (deinterlacing>>8)&0xff );
-		}
-        
-        
-        if ( orientation != ROTATE_0 )
-        {
-            switch ( orientation )
-            {
-                case ROTATE_0 :
-                {
-                    // No action required
-                    break;
-                }
-                case ROTATE_90 :
-                case ROTATE_180 :
-                case ROTATE_270 :
-                {
-                    capture_image->Rotate( (orientation-1)*90 );
-                    break;
-                }
-                case FLIP_HORI :
-                case FLIP_VERT :
-                {
-                    capture_image->Flip( orientation==FLIP_HORI );
-                    break;
-                }
-            }
-        }
-
+      Error( "Captured image %d does not match expected size %d check width, height and colour depth",capture_image->Size(),camera->ImageSize() );
+      return( -1 );
     }
-    if ( true ) {
 
-        if ( capture_image->Size() > camera->ImageSize() )
-        {
-            Error( "Captured image %d does not match expected size %d check width, height and colour depth",capture_image->Size(),camera->ImageSize() );
-            return( -1 );
-        }
-
-        if ( ((unsigned int)index == shared_data->last_read_index) && (function > MONITOR) )
-        {
-            Warning( "Buffer overrun at index %d, image %d, slow down capture, speed up analysis or increase ring buffer size", index, image_count );
-            time_t now = time(0);
-            double approxFps = double(image_buffer_count)/double(now-image_buffer[index].timestamp->tv_sec);
-            time_t last_read_delta = now - shared_data->last_read_time;
-            if ( last_read_delta > (image_buffer_count/approxFps) )
-            {
-                Warning( "Last image read from shared memory %ld seconds ago, zma may have gone away", last_read_delta )
-                shared_data->last_read_index = image_buffer_count;
-            }
-        }
-
-        if ( privacy_bitmask )
-            capture_image->MaskPrivacy( privacy_bitmask );
-
-        gettimeofday( image_buffer[index].timestamp, NULL );
-        if ( config.timestamp_on_capture )
-        {
-            TimestampImage( capture_image, image_buffer[index].timestamp );
-        }
-        shared_data->signal = CheckSignal(capture_image);
-        shared_data->last_write_index = index;
-        shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
-
-        image_count++;
-
-        if ( image_count && fps_report_interval && !(image_count%fps_report_interval) )
-        {
-            time_t now = image_buffer[index].timestamp->tv_sec;
-            fps = double(fps_report_interval)/(now-last_fps_time);
-            //Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
-            //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
-            Info( "%s: %d - Capturing at %.2lf fps", name, image_count, fps );
-            last_fps_time = now;
-        }
-
-        if ( shared_data->action & GET_SETTINGS )
-        {
-            shared_data->brightness = camera->Brightness();
-            shared_data->hue = camera->Hue();
-            shared_data->colour = camera->Colour();
-            shared_data->contrast = camera->Contrast();
-            shared_data->action &= ~GET_SETTINGS;
-        }
-        if ( shared_data->action & SET_SETTINGS )
-        {
-            camera->Brightness( shared_data->brightness );
-            camera->Hue( shared_data->hue );
-            camera->Colour( shared_data->colour );
-            camera->Contrast( shared_data->contrast );
-            shared_data->action &= ~SET_SETTINGS;
-        }
-        return( 0 );
+    if ( ((unsigned int)index == shared_data->last_read_index) && (function > MONITOR) )
+    {
+      Warning( "Buffer overrun at index %d, image %d, slow down capture, speed up analysis or increase ring buffer size", index, image_count );
+      time_t now = time(0);
+      double approxFps = double(image_buffer_count)/double(now-image_buffer[index].timestamp->tv_sec);
+      time_t last_read_delta = now - shared_data->last_read_time;
+      if ( last_read_delta > (image_buffer_count/approxFps) )
+      {
+        Warning( "Last image read from shared memory %ld seconds ago, zma may have gone away", last_read_delta )
+        shared_data->last_read_index = image_buffer_count;
+      }
     }
-    shared_data->signal = false;
-    return( -1 );
+
+    if ( privacy_bitmask )
+      capture_image->MaskPrivacy( privacy_bitmask );
+
+    gettimeofday( image_buffer[index].timestamp, NULL );
+    if ( config.timestamp_on_capture )
+    {
+      TimestampImage( capture_image, image_buffer[index].timestamp );
+    }
+    shared_data->signal = CheckSignal(capture_image);
+    shared_data->last_write_index = index;
+    shared_data->last_write_time = image_buffer[index].timestamp->tv_sec;
+
+    image_count++;
+
+    if ( image_count && fps_report_interval && !(image_count%fps_report_interval) )
+    {
+      time_t now = image_buffer[index].timestamp->tv_sec;
+      fps = double(fps_report_interval)/(now-last_fps_time);
+      //Info( "%d -> %d -> %d", fps_report_interval, now, last_fps_time );
+      //Info( "%d -> %d -> %lf -> %lf", now-last_fps_time, fps_report_interval/(now-last_fps_time), double(fps_report_interval)/(now-last_fps_time), fps );
+      Info( "%s: %d - Capturing at %.2lf fps", name, image_count, fps );
+      last_fps_time = now;
+    }
+
+    if ( shared_data->action & GET_SETTINGS )
+    {
+      shared_data->brightness = camera->Brightness();
+      shared_data->hue = camera->Hue();
+      shared_data->colour = camera->Colour();
+      shared_data->contrast = camera->Contrast();
+      shared_data->action &= ~GET_SETTINGS;
+    }
+    if ( shared_data->action & SET_SETTINGS )
+    {
+      camera->Brightness( shared_data->brightness );
+      camera->Hue( shared_data->hue );
+      camera->Colour( shared_data->colour );
+      camera->Contrast( shared_data->contrast );
+      shared_data->action &= ~SET_SETTINGS;
+    }
+    return( 0 );
+  }
+  shared_data->signal = false;
+  return( -1 );
 }
 
 void Monitor::TimestampImage( Image *ts_image, const struct timeval *ts_time ) const
 {
-    if ( label_format[0] )
-    {
-        // Expand the strftime macros first
-        char label_time_text[256];
-        strftime( label_time_text, sizeof(label_time_text), label_format, localtime( &ts_time->tv_sec ) );
+  if ( label_format[0] )
+  {
+    // Expand the strftime macros first
+    char label_time_text[256];
+    strftime( label_time_text, sizeof(label_time_text), label_format, localtime( &ts_time->tv_sec ) );
 
-        char label_text[1024];
-        const char *s_ptr = label_time_text;
-        char *d_ptr = label_text;
-        while ( *s_ptr && ((d_ptr-label_text) < (unsigned int)sizeof(label_text)) )
+    char label_text[1024];
+    const char *s_ptr = label_time_text;
+    char *d_ptr = label_text;
+    while ( *s_ptr && ((d_ptr-label_text) < (unsigned int)sizeof(label_text)) )
+    {
+      if ( *s_ptr == '%' )
+      {
+        bool found_macro = false;
+        switch ( *(s_ptr+1) )
         {
-            if ( *s_ptr == '%' )
-            {
-                bool found_macro = false;
-                switch ( *(s_ptr+1) )
-                {
-                    case 'N' :
-                        d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name );
-                        found_macro = true;
-                        break;
-                    case 'Q' :
-                        d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", trigger_data->trigger_showtext );
-                        found_macro = true;
-                        break;
-                    case 'f' :
-                        d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000 );
-                        found_macro = true;
-                        break;
-                }
-                if ( found_macro )
-                {
-                    s_ptr += 2;
-                    continue;
-                }
-            }
-            *d_ptr++ = *s_ptr++;
+          case 'N' :
+            d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", name );
+            found_macro = true;
+            break;
+          case 'Q' :
+            d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%s", trigger_data->trigger_showtext );
+            found_macro = true;
+            break;
+          case 'f' :
+            d_ptr += snprintf( d_ptr, sizeof(label_text)-(d_ptr-label_text), "%02ld", ts_time->tv_usec/10000 );
+            found_macro = true;
+            break;
         }
-        *d_ptr = '\0';
-        ts_image->Annotate( label_text, label_coord, label_size );
+        if ( found_macro )
+        {
+          s_ptr += 2;
+          continue;
+        }
+      }
+      *d_ptr++ = *s_ptr++;
     }
+    *d_ptr = '\0';
+    ts_image->Annotate( label_text, label_coord, label_size );
+  }
 }
 
 bool Monitor::closeEvent()
 {
-    video_store_data->recording = false;
-    if ( event )
+  video_store_data->recording = false;
+  if ( event )
+  {
+    if ( function == RECORD || function == MOCORD )
     {
-        if ( function == RECORD || function == MOCORD )
-        {
-            gettimeofday( &(event->EndTime()), NULL );
-        }
-        delete event;
-        event = 0;
-        return( true );
+      gettimeofday( &(event->EndTime()), NULL );
     }
-    return( false );
+    delete event;
+    event = 0;
+    return( true );
+  }
+  return( false );
 }
 
-//-----------------------------------------
-
-/* 
- * NOTE Nextime's comment:
- *
- * OurCheckAlarms seems to be called only by DetectBlack method, and DetectBlack 
- * method is only called in a commented line  instead of DetectMotion in zm_monitor.cpp.
- *
- * Probably this is just a dead code used for debugghing purpose, so, instead of fixing it
- * it seems to be safe to just comment it out.
- *
- * Anyway, the issues with this code is that it assumes the image to be an RGB24 image,
- * so, as i've discussed on IRC with mastertheknife, changes needed are:
- *
- * Check if the image is 24 or 32 bits ( pImage->Colours() says 3 for 24 and 4 for 32 bits, 
- * comparing it with ZM_COLOUR_RGB24 or ZM_COLOUR_RGB32 is the way ), and then
- * manage che check using RGB_VAL_RED() and so on macros instead of just RED().
- *
- * Be careful that in 32 bit images we need to check also where the alpha channel is, so,
- * (RGBA and BGRA) or (ABGR and ARGB) aren't the same!
- *
- * To check black pixels in 32 bit images i can do a more efficient way using 
- * RGBA_ZERO_ALPHA(pixel) == RGBA_ZERO_ALPHA(RGB_BLACK), but before of that i need to 
- * check where the alpha channel is and maybe convert it.
- * Maybe this won't work as they assign "23" to black_thr, so, they are not checking
- * if the pixel is black, but just "quasi" black is enough.
- *
- * Anyway, for the moment, comment out whole part.
- */
-
-/*
-bool Monitor::OurCheckAlarms( Zone *zone, const Image *pImage )
-{
-    Info("Entering OurCheckAlarms >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-    unsigned char black_thr = 23;
-    int min_alarm_score = 10;
-    int max_alarm_score = 99;
-    //bool alarm = false;
-    unsigned int score;
-    Polygon zone_polygon = zone->GetPolygon();
-    Info("Got polygon of a zone. It has %d vertices.", zone_polygon.getNumCoords());
-
-  zone->ResetStats();
-    Info("ResetStats done.");
-
-    if ( !zone->CheckOverloadCount() )
-    {
-        Info("CheckOverloadCount() return false, we'll return false.");
-        return( false );
-    }
-
-    Image *pMaskImage = new Image(pImage->Width(), pImage->Height(), ZM_COLOUR_GRAY8, pImage->SubpixelOrder());
-    Info("Mask image created.");
- 
-    pMaskImage->Fill(BLACK);
-    Info("Mask image filled with BLACK.");
-    if (pImage->Colours() == ZM_COLOUR_GRAY8)
-    {
-        Info("Analysed image is not colored! Set score = 0.");
-        score = 0;
-    }
-    else
-    {
-        Info("Start processing image.");
-        //Process image
-        unsigned char *buffer = (unsigned char*)pImage->Buffer();
-        unsigned char *mask_buffer = (unsigned char*)pMaskImage->Buffer();
-        
-        int black_pixels_count = 0;
-        Info("Loop for black pixels counting and mask filling.");
-        while (buffer < (pImage->Buffer() + pImage->Size()))
-        {
-            if ( (RED(buffer) < black_thr) && (GREEN(buffer) < black_thr) && (BLUE(buffer) < black_thr) )
-            {
-                *mask_buffer = WHITE;
-                black_pixels_count++;
-            }
-            buffer += pImage->Colours();
-            mask_buffer++;
-        }
-
-        if ( !black_pixels_count )
-        {
-            delete pMaskImage;
-            return( false );
-        }
-        score = (100*black_pixels_count)/zone_polygon.Area();
-        Info("Number of black pixels is %d, zone polygon area is %d, score is %d", black_pixels_count, zone_polygon.Area(), score);
-
-        if ( min_alarm_score && ( score < min_alarm_score) )
-        {
-            delete pMaskImage;
-            return( false );
-        }
-        if ( max_alarm_score && (score > max_alarm_score) )
-        {
-            zone->SetOverloadCount(zone->GetOverloadFrames());
-            delete pMaskImage;
-            return( false );
-        }
-    }
-
-    zone->SetScore(score);
-    Info("Score have been set in zone.");
-    //Get mask
-    Rgb alarm_colour = RGB_RED;
-  Image *tempImage = pMaskImage->HighlightEdges(alarm_colour, &zone_polygon.Extent() );
-    Info("After HighlightEdges");
-
-    zone->SetAlarmImage(tempImage);
-    Info("After SetAlarmImage");
-    delete pMaskImage;
-    Info("After Delete pMaskImage");
-    delete tempImage;
-
-    Info("Leaving OurCheckAlarms >>>>>>>>>>>>>>>>>>>>>>>>>>>>");
-    return true;
-}
-
-unsigned int Monitor::DetectBlack(const Image &comp_image, Event::StringSet &zoneSet )
-{
-    Info("Entering DetectBlack >>>>>>>>>>>>>>>>>>>>>>>>>>");
-    bool alarm = false;
-    unsigned int score = 0;
-
-    if ( n_zones <= 0 ) return( alarm );
-
-//    Coord alarm_centre;
-//    int top_score = -1;
-
-    // Find all alarm pixels in active zones
-    Info("Number of zones to process %d", n_zones);
-    for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
-    {
-        Zone *zone = zones[n_zone];
-        if ( !zone->IsActive() )
-        {
-            continue;
-        }
-        Debug( 3, "Checking active zone %s", zone->Label() );
-        Info( "Checking active zone %s", zone->Label() );
-        if ( OurCheckAlarms( zone, &comp_image ) )
-        {
-            Info("OurCheckAlarm is TRUE!!!!!!");
-            alarm = true;
-            score += zone->Score();
-            zone->SetAlarm();
-            Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-            Info( "Zone is alarmed, zone score = %d", zone->Score() );
-            zoneSet.insert( zone->Label() );
-//            if ( config.opt_control && track_motion )
-//            {
-//                if ( (int)zone->Score() > top_score )
-//                {
-//                    top_score = zone->Score();
-//                    alarm_centre = zone->GetAlarmCentre();
-//                }
-//            }
-        }
-        Info( "Finish checking active zone %s", zone->Label() );
-    }
-
-
-//    if ( top_score > 0 )
-//    {
-//        shared_data->alarm_x = alarm_centre.X();
-//        shared_data->alarm_y = alarm_centre.Y();
-//
-//        Info( "Got alarm centre at %d,%d, at count %d", shared_data->alarm_x, shared_data->alarm_y, image_count );
-//    }
-//    else
-//    {
-//        shared_data->alarm_x = shared_data->alarm_y = -1;
-//    }
-
-    // This is a small and innocent hack to prevent scores of 0 being returned in alarm state
-    Info("Leaving DetectBlack <<<<<<<<<<<<<<<<<<<<<<<<<<<");
-    return( score?score:alarm );
-}
-
-*/
-//-----------------------------------------------------------------------------------------------
-
-
-
 unsigned int Monitor::DetectMotion( const Image &comp_image, Event::StringSet &zoneSet )
 {
-    bool alarm = false;
-    unsigned int score = 0;
+  bool alarm = false;
+  unsigned int score = 0;
 
-    if ( n_zones <= 0 ) return( alarm );
+  if ( n_zones <= 0 ) return( alarm );
 
-    if ( config.record_diag_images )
+  if ( config.record_diag_images )
+  {
+    static char diag_path[PATH_MAX] = "";
+    if ( !diag_path[0] )
     {
-        static char diag_path[PATH_MAX] = "";
-        if ( !diag_path[0] )
-        {
-            snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", config.dir_events, id );
-        }
-        ref_image.WriteJpeg( diag_path );
+      snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-r.jpg", config.dir_events, id );
     }
+    ref_image.WriteJpeg( diag_path );
+  }
 
-    ref_image.Delta( comp_image, &delta_image);
+  ref_image.Delta( comp_image, &delta_image);
 
-    if ( config.record_diag_images )
+  if ( config.record_diag_images )
+  {
+    static char diag_path[PATH_MAX] = "";
+    if ( !diag_path[0] )
     {
-        static char diag_path[PATH_MAX] = "";
-        if ( !diag_path[0] )
-        {
-            snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", config.dir_events, id );
-        }
-        delta_image.WriteJpeg( diag_path );
+      snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-d.jpg", config.dir_events, id );
     }
+    delta_image.WriteJpeg( diag_path );
+  }
 
-    // Blank out all exclusion zones
-    for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+  // Blank out all exclusion zones
+  for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+  {
+    Zone *zone = zones[n_zone];
+    // need previous alarmed state for preclusive zone, so don't clear just yet
+    if (!zone->IsPreclusive())
+      zone->ClearAlarm();
+    if ( !zone->IsInactive() )
     {
-        Zone *zone = zones[n_zone];
-        // need previous alarmed state for preclusive zone, so don't clear just yet
-        if (!zone->IsPreclusive())
-            zone->ClearAlarm();
-        if ( !zone->IsInactive() )
-        {
-            continue;
-        }
-        Debug( 3, "Blanking inactive zone %s", zone->Label() );
-        delta_image.Fill( RGB_BLACK, zone->GetPolygon() );
+      continue;
     }
+    Debug( 3, "Blanking inactive zone %s", zone->Label() );
+    delta_image.Fill( RGB_BLACK, zone->GetPolygon() );
+  }
 
-    // Check preclusive zones first
-    for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+  // Check preclusive zones first
+  for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+  {
+    Zone *zone = zones[n_zone];
+    if ( !zone->IsPreclusive() )
     {
-        Zone *zone = zones[n_zone];
-        if ( !zone->IsPreclusive() )
-        {
-            continue;
+      continue;
+    }
+    int old_zone_score = zone->Score();
+    bool old_zone_alarmed = zone->Alarmed();
+    Debug( 3, "Checking preclusive zone %s - old score: %d, state: %s", zone->Label(),old_zone_score, zone->Alarmed()?"alarmed":"quiet" );
+    if ( zone->CheckAlarms( &delta_image ) )
+    {
+      alarm = true;
+      score += zone->Score();
+      zone->SetAlarm();
+      Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
+      zoneSet.insert( zone->Label() );
+      //zone->ResetStats();
+    } else {
+      // check if end of alarm
+      if (old_zone_alarmed) {
+        Debug(3, "Preclusive Zone %s alarm Ends. Prevíous score: %d", zone->Label(), old_zone_score);
+        if (old_zone_score > 0) {
+          zone->SetExtendAlarmCount(zone->GetExtendAlarmFrames());
         }
-        int old_zone_score = zone->Score();
-        bool old_zone_alarmed = zone->Alarmed();
-        Debug( 3, "Checking preclusive zone %s - old score: %d, state: %s", zone->Label(),old_zone_score, zone->Alarmed()?"alarmed":"quiet" );
-        if ( zone->CheckAlarms( &delta_image ) )
-        {
-            alarm = true;
-            score += zone->Score();
-            zone->SetAlarm();
-            Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-            zoneSet.insert( zone->Label() );
-            //zone->ResetStats();
+        if (zone->CheckExtendAlarmCount()) {
+          alarm=true;
+      zone->SetAlarm();
         } else {
-            // check if end of alarm
-            if (old_zone_alarmed) {
-                Debug(3, "Preclusive Zone %s alarm Ends. Prevíous score: %d", zone->Label(), old_zone_score);
-                if (old_zone_score > 0) {
-                    zone->SetExtendAlarmCount(zone->GetExtendAlarmFrames());
-                }
-                if (zone->CheckExtendAlarmCount()) {
-                    alarm=true;
-            zone->SetAlarm();
-                } else {
-                    zone->ClearAlarm();
-                }
-            } 
+          zone->ClearAlarm();
         }
+      } 
     }
+  }
 
-    Coord alarm_centre;
-    int top_score = -1;
+  Coord alarm_centre;
+  int top_score = -1;
+
+  if ( alarm )
+  {
+    alarm = false;
+    score = 0;
+  }
+  else
+  {
+    // Find all alarm pixels in active zones
+    for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+    {
+      Zone *zone = zones[n_zone];
+      if ( !zone->IsActive() || zone->IsPreclusive())
+      {
+        continue;
+      }
+      Debug( 3, "Checking active zone %s", zone->Label() );
+      if ( zone->CheckAlarms( &delta_image ) )
+      {
+        alarm = true;
+        score += zone->Score();
+        zone->SetAlarm();
+        Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
+        zoneSet.insert( zone->Label() );
+        if ( config.opt_control && track_motion )
+        {
+          if ( (int)zone->Score() > top_score )
+          {
+            top_score = zone->Score();
+            alarm_centre = zone->GetAlarmCentre();
+          }
+        }
+      }
+    }
 
     if ( alarm )
     {
-        alarm = false;
-        score = 0;
+      for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+      {
+        Zone *zone = zones[n_zone];
+        if ( !zone->IsInclusive() )
+        {
+          continue;
+        }
+        Debug( 3, "Checking inclusive zone %s", zone->Label() );
+        if ( zone->CheckAlarms( &delta_image ) )
+        {
+          alarm = true;
+          score += zone->Score();
+          zone->SetAlarm();
+          Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
+          zoneSet.insert( zone->Label() );
+          if ( config.opt_control && track_motion )
+          {
+            if ( zone->Score() > (unsigned int)top_score )
+            {
+              top_score = zone->Score();
+              alarm_centre = zone->GetAlarmCentre();
+            }
+          }
+        }
+      }
     }
     else
     {
-        // Find all alarm pixels in active zones
-        for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+      // Find all alarm pixels in exclusive zones
+      for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
+      {
+        Zone *zone = zones[n_zone];
+        if ( !zone->IsExclusive() )
         {
-            Zone *zone = zones[n_zone];
-            if ( !zone->IsActive() || zone->IsPreclusive())
-            {
-                continue;
-            }
-            Debug( 3, "Checking active zone %s", zone->Label() );
-            if ( zone->CheckAlarms( &delta_image ) )
-            {
-                alarm = true;
-                score += zone->Score();
-                zone->SetAlarm();
-                Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-                zoneSet.insert( zone->Label() );
-                if ( config.opt_control && track_motion )
-                {
-                    if ( (int)zone->Score() > top_score )
-                    {
-                        top_score = zone->Score();
-                        alarm_centre = zone->GetAlarmCentre();
-                    }
-                }
-            }
+          continue;
         }
-
-        if ( alarm )
+        Debug( 3, "Checking exclusive zone %s", zone->Label() );
+        if ( zone->CheckAlarms( &delta_image ) )
         {
-            for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
-            {
-                Zone *zone = zones[n_zone];
-                if ( !zone->IsInclusive() )
-                {
-                    continue;
-                }
-                Debug( 3, "Checking inclusive zone %s", zone->Label() );
-                if ( zone->CheckAlarms( &delta_image ) )
-                {
-                    alarm = true;
-                    score += zone->Score();
-                    zone->SetAlarm();
-                    Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-                    zoneSet.insert( zone->Label() );
-                    if ( config.opt_control && track_motion )
-                    {
-                        if ( zone->Score() > (unsigned int)top_score )
-                        {
-                            top_score = zone->Score();
-                            alarm_centre = zone->GetAlarmCentre();
-                        }
-                    }
-                }
-            }
-        }
-        else
-        {
-            // Find all alarm pixels in exclusive zones
-            for ( int n_zone = 0; n_zone < n_zones; n_zone++ )
-            {
-                Zone *zone = zones[n_zone];
-                if ( !zone->IsExclusive() )
-                {
-                    continue;
-                }
-                Debug( 3, "Checking exclusive zone %s", zone->Label() );
-                if ( zone->CheckAlarms( &delta_image ) )
-                {
-                    alarm = true;
-                    score += zone->Score();
-                    zone->SetAlarm();
-                    Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
-                    zoneSet.insert( zone->Label() );
-                }
-            }
+          alarm = true;
+          score += zone->Score();
+          zone->SetAlarm();
+          Debug( 3, "Zone is alarmed, zone score = %d", zone->Score() );
+          zoneSet.insert( zone->Label() );
         }
+      }
     }
+  }
 
-    if ( top_score > 0 )
-    {
-        shared_data->alarm_x = alarm_centre.X();
-        shared_data->alarm_y = alarm_centre.Y();
+  if ( top_score > 0 )
+  {
+    shared_data->alarm_x = alarm_centre.X();
+    shared_data->alarm_y = alarm_centre.Y();
 
-        Info( "Got alarm centre at %d,%d, at count %d", shared_data->alarm_x, shared_data->alarm_y, image_count );
-    }
-    else
-    {
-        shared_data->alarm_x = shared_data->alarm_y = -1;
-    }
+    Info( "Got alarm centre at %d,%d, at count %d", shared_data->alarm_x, shared_data->alarm_y, image_count );
+  }
+  else
+  {
+    shared_data->alarm_x = shared_data->alarm_y = -1;
+  }
 
-    // This is a small and innocent hack to prevent scores of 0 being returned in alarm state
-    return( score?score:alarm );
+  // This is a small and innocent hack to prevent scores of 0 being returned in alarm state
+  return( score?score:alarm );
 } 
 
 bool Monitor::DumpSettings( char *output, bool verbose )
 {
-    output[0] = 0;
+  output[0] = 0;
 
-    sprintf( output+strlen(output), "Id : %d\n", id );
-    sprintf( output+strlen(output), "Name : %s\n", name );
-    sprintf( output+strlen(output), "Type : %s\n", camera->IsLocal()?"Local":(camera->IsRemote()?"Remote":"File") );
+  sprintf( output+strlen(output), "Id : %d\n", id );
+  sprintf( output+strlen(output), "Name : %s\n", name );
+  sprintf( output+strlen(output), "Type : %s\n", camera->IsLocal()?"Local":(camera->IsRemote()?"Remote":"File") );
 #if ZM_HAS_V4L
-    if ( camera->IsLocal() )
-    {
-        sprintf( output+strlen(output), "Device : %s\n", ((LocalCamera *)camera)->Device().c_str() );
-        sprintf( output+strlen(output), "Channel : %d\n", ((LocalCamera *)camera)->Channel() );
-        sprintf( output+strlen(output), "Standard : %d\n", ((LocalCamera *)camera)->Standard() );
-    }
-    else
+  if ( camera->IsLocal() )
+  {
+    sprintf( output+strlen(output), "Device : %s\n", ((LocalCamera *)camera)->Device().c_str() );
+    sprintf( output+strlen(output), "Channel : %d\n", ((LocalCamera *)camera)->Channel() );
+    sprintf( output+strlen(output), "Standard : %d\n", ((LocalCamera *)camera)->Standard() );
+  }
+  else
 #endif // ZM_HAS_V4L
-    if ( camera->IsRemote() )
-    {
-        sprintf( output+strlen(output), "Protocol : %s\n", ((RemoteCamera *)camera)->Protocol().c_str() );
-        sprintf( output+strlen(output), "Host : %s\n", ((RemoteCamera *)camera)->Host().c_str() );
-        sprintf( output+strlen(output), "Port : %s\n", ((RemoteCamera *)camera)->Port().c_str() );
-        sprintf( output+strlen(output), "Path : %s\n", ((RemoteCamera *)camera)->Path().c_str() );
-    }
-    else if ( camera->IsFile() )
-    {
-        sprintf( output+strlen(output), "Path : %s\n", ((FileCamera *)camera)->Path() );
-    }
+  if ( camera->IsRemote() )
+  {
+    sprintf( output+strlen(output), "Protocol : %s\n", ((RemoteCamera *)camera)->Protocol().c_str() );
+    sprintf( output+strlen(output), "Host : %s\n", ((RemoteCamera *)camera)->Host().c_str() );
+    sprintf( output+strlen(output), "Port : %s\n", ((RemoteCamera *)camera)->Port().c_str() );
+    sprintf( output+strlen(output), "Path : %s\n", ((RemoteCamera *)camera)->Path().c_str() );
+  }
+  else if ( camera->IsFile() )
+  {
+    sprintf( output+strlen(output), "Path : %s\n", ((FileCamera *)camera)->Path() );
+  }
 #if HAVE_LIBAVFORMAT
-    else if ( camera->IsFfmpeg() )
-    {
-        sprintf( output+strlen(output), "Path : %s\n", ((FfmpegCamera *)camera)->Path().c_str() );
-    }
+  else if ( camera->IsFfmpeg() )
+  {
+    sprintf( output+strlen(output), "Path : %s\n", ((FfmpegCamera *)camera)->Path().c_str() );
+  }
 #endif // HAVE_LIBAVFORMAT
-    sprintf( output+strlen(output), "Width : %d\n", camera->Width() );
-    sprintf( output+strlen(output), "Height : %d\n", camera->Height() );
+  sprintf( output+strlen(output), "Width : %d\n", camera->Width() );
+  sprintf( output+strlen(output), "Height : %d\n", camera->Height() );
 #if ZM_HAS_V4L
-    if ( camera->IsLocal() )
-    {
-        sprintf( output+strlen(output), "Palette : %d\n", ((LocalCamera *)camera)->Palette() );
-    }
+  if ( camera->IsLocal() )
+  {
+    sprintf( output+strlen(output), "Palette : %d\n", ((LocalCamera *)camera)->Palette() );
+  }
 #endif // ZM_HAS_V4L
-    sprintf( output+strlen(output), "Colours : %d\n", camera->Colours() );
-    sprintf( output+strlen(output), "Subpixel Order : %d\n", camera->SubpixelOrder() );
-    sprintf( output+strlen(output), "Event Prefix : %s\n", event_prefix );
-    sprintf( output+strlen(output), "Label Format : %s\n", label_format );
-    sprintf( output+strlen(output), "Label Coord : %d,%d\n", label_coord.X(), label_coord.Y() );
-    sprintf( output+strlen(output), "Label Size : %d\n", label_size );
-    sprintf( output+strlen(output), "Image Buffer Count : %d\n", image_buffer_count );
-    sprintf( output+strlen(output), "Warmup Count : %d\n", warmup_count );
-    sprintf( output+strlen(output), "Pre Event Count : %d\n", pre_event_count );
-    sprintf( output+strlen(output), "Post Event Count : %d\n", post_event_count );
-    sprintf( output+strlen(output), "Stream Replay Buffer : %d\n", stream_replay_buffer );
-    sprintf( output+strlen(output), "Alarm Frame Count : %d\n", alarm_frame_count );
-    sprintf( output+strlen(output), "Section Length : %d\n", section_length );
-    sprintf( output+strlen(output), "Maximum FPS : %.2f\n", capture_delay?DT_PREC_3/capture_delay:0.0 );
-    sprintf( output+strlen(output), "Alarm Maximum FPS : %.2f\n", alarm_capture_delay?DT_PREC_3/alarm_capture_delay:0.0 );
-    sprintf( output+strlen(output), "Reference Blend %%ge : %d\n", ref_blend_perc );
-    sprintf( output+strlen(output), "Alarm Reference Blend %%ge : %d\n", alarm_ref_blend_perc );
-    sprintf( output+strlen(output), "Track Motion : %d\n", track_motion );
-    sprintf( output+strlen(output), "Function: %d - %s\n", function,
-        function==NONE?"None":(
-        function==MONITOR?"Monitor Only":(
-        function==MODECT?"Motion Detection":(
-        function==RECORD?"Continuous Record":(
-        function==MOCORD?"Continuous Record with Motion Detection":(
-        function==NODECT?"Externally Triggered only, no Motion Detection":"Unknown"
-    ))))));
-    sprintf( output+strlen(output), "Zones : %d\n", n_zones );
-    for ( int i = 0; i < n_zones; i++ )
-    {
-        zones[i]->DumpSettings( output+strlen(output), verbose );
-    }
-    return( true );
-}
+  sprintf( output+strlen(output), "Colours : %d\n", camera->Colours() );
+  sprintf( output+strlen(output), "Subpixel Order : %d\n", camera->SubpixelOrder() );
+  sprintf( output+strlen(output), "Event Prefix : %s\n", event_prefix );
+  sprintf( output+strlen(output), "Label Format : %s\n", label_format );
+  sprintf( output+strlen(output), "Label Coord : %d,%d\n", label_coord.X(), label_coord.Y() );
+  sprintf( output+strlen(output), "Label Size : %d\n", label_size );
+  sprintf( output+strlen(output), "Image Buffer Count : %d\n", image_buffer_count );
+  sprintf( output+strlen(output), "Warmup Count : %d\n", warmup_count );
+  sprintf( output+strlen(output), "Pre Event Count : %d\n", pre_event_count );
+  sprintf( output+strlen(output), "Post Event Count : %d\n", post_event_count );
+  sprintf( output+strlen(output), "Stream Replay Buffer : %d\n", stream_replay_buffer );
+  sprintf( output+strlen(output), "Alarm Frame Count : %d\n", alarm_frame_count );
+  sprintf( output+strlen(output), "Section Length : %d\n", section_length );
+  sprintf( output+strlen(output), "Maximum FPS : %.2f\n", capture_delay?DT_PREC_3/capture_delay:0.0 );
+  sprintf( output+strlen(output), "Alarm Maximum FPS : %.2f\n", alarm_capture_delay?DT_PREC_3/alarm_capture_delay:0.0 );
+  sprintf( output+strlen(output), "Reference Blend %%ge : %d\n", ref_blend_perc );
+  sprintf( output+strlen(output), "Alarm Reference Blend %%ge : %d\n", alarm_ref_blend_perc );
+  sprintf( output+strlen(output), "Track Motion : %d\n", track_motion );
+  sprintf( output+strlen(output), "Function: %d - %s\n", function,
+    function==NONE?"None":(
+    function==MONITOR?"Monitor Only":(
+    function==MODECT?"Motion Detection":(
+    function==RECORD?"Continuous Record":(
+    function==MOCORD?"Continuous Record with Motion Detection":(
+    function==NODECT?"Externally Triggered only, no Motion Detection":"Unknown"
+  ))))));
+  sprintf( output+strlen(output), "Zones : %d\n", n_zones );
+  for ( int i = 0; i < n_zones; i++ )
+  {
+    zones[i]->DumpSettings( output+strlen(output), verbose );
+  }
+  return( true );
+} // bool Monitor::DumpSettings( char *output, bool verbose )
 
 bool MonitorStream::checkSwapPath( const char *path, bool create_path )
 {
-    uid_t uid = getuid();
-    gid_t gid = getgid();
+  uid_t uid = getuid();
+  gid_t gid = getgid();
 
-    struct stat stat_buf;
-    if ( stat( path, &stat_buf ) < 0 )
+  struct stat stat_buf;
+  if ( stat( path, &stat_buf ) < 0 )
+  {
+    if ( create_path && errno == ENOENT )
     {
-        if ( create_path && errno == ENOENT )
-        {
-            Debug( 3, "Swap path '%s' missing, creating", path );
-            if ( mkdir( path, 0755 ) )
-            {
-                Error( "Can't mkdir %s: %s", path, strerror(errno));
-                return( false );
-            }
-            if ( stat( path, &stat_buf ) < 0 )
-            {
-                Error( "Can't stat '%s': %s", path, strerror(errno) );
-                return( false );
-            }
-        }
-        else
-        {
-            Error( "Can't stat '%s': %s", path, strerror(errno) );
-            return( false );
-        }
-    }
-    if ( !S_ISDIR(stat_buf.st_mode) )
-    {
-        Error( "Swap image path '%s' is not a directory", path );
+      Debug( 3, "Swap path '%s' missing, creating", path );
+      if ( mkdir( path, 0755 ) )
+      {
+        Error( "Can't mkdir %s: %s", path, strerror(errno));
         return( false );
-    }
-
-    mode_t mask = 0;
-    if ( uid == stat_buf.st_uid )
-    {
-        // If we are the owner
-        mask = 00700;
-    }
-    else if ( gid == stat_buf.st_gid )
-    {
-        // If we are in the owner group
-        mask = 00070;
+      }
+      if ( stat( path, &stat_buf ) < 0 )
+      {
+        Error( "Can't stat '%s': %s", path, strerror(errno) );
+        return( false );
+      }
     }
     else
     {
-        // We are neither the owner nor in the group
-        mask = 00007;
+      Error( "Can't stat '%s': %s", path, strerror(errno) );
+      return( false );
     }
+  }
+  if ( !S_ISDIR(stat_buf.st_mode) )
+  {
+    Error( "Swap image path '%s' is not a directory", path );
+    return( false );
+  }
 
-    if ( (stat_buf.st_mode & mask) != mask )
-    {
-        Error( "Insufficient permissions on swap image path '%s'", path );
-        return( false );
-    }
-    return( true );
+  mode_t mask = 0;
+  if ( uid == stat_buf.st_uid )
+  {
+    // If we are the owner
+    mask = 00700;
+  }
+  else if ( gid == stat_buf.st_gid )
+  {
+    // If we are in the owner group
+    mask = 00070;
+  }
+  else
+  {
+    // We are neither the owner nor in the group
+    mask = 00007;
+  }
+
+  if ( (stat_buf.st_mode & mask) != mask )
+  {
+    Error( "Insufficient permissions on swap image path '%s'", path );
+    return( false );
+  }
+  return( true );
 }
 
 void MonitorStream::processCommand( const CmdMsg *msg )
 {
-    Debug( 2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0] );
-    // Check for incoming command
-    switch( (MsgCommand)msg->msg_data[0] )
+  Debug( 2, "Got message, type %d, msg %d", msg->msg_type, msg->msg_data[0] );
+  // Check for incoming command
+  switch( (MsgCommand)msg->msg_data[0] )
+  {
+    case CMD_PAUSE :
     {
-        case CMD_PAUSE :
-        {
-            Debug( 1, "Got PAUSE command" );
+      Debug( 1, "Got PAUSE command" );
 
-            // Set paused flag
-            paused = true;
-            // Set delayed flag
-            delayed = true;
-            last_frame_sent = TV_2_FLOAT( now );
-            break;
-        }
-        case CMD_PLAY :
-        {
-            Debug( 1, "Got PLAY command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-                // Set delayed_play flag
-                delayed = true;
-            }
-            replay_rate = ZM_RATE_BASE;
-            break;
-        }
-        case CMD_VARPLAY :
-        {
-            Debug( 1, "Got VARPLAY command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-                // Set delayed_play flag
-                delayed = true;
-            }
-            replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
-            break;
-        }
-        case CMD_STOP :
-        {
-            Debug( 1, "Got STOP command" );
+      // Set paused flag
+      paused = true;
+      // Set delayed flag
+      delayed = true;
+      last_frame_sent = TV_2_FLOAT( now );
+      break;
+    }
+    case CMD_PLAY :
+    {
+      Debug( 1, "Got PLAY command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+        // Set delayed_play flag
+        delayed = true;
+      }
+      replay_rate = ZM_RATE_BASE;
+      break;
+    }
+    case CMD_VARPLAY :
+    {
+      Debug( 1, "Got VARPLAY command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+        // Set delayed_play flag
+        delayed = true;
+      }
+      replay_rate = ntohs(((unsigned char)msg->msg_data[2]<<8)|(unsigned char)msg->msg_data[1])-32768;
+      break;
+    }
+    case CMD_STOP :
+    {
+      Debug( 1, "Got STOP command" );
 
-            // Clear paused flag
-            paused = false;
-            // Clear delayed_play flag
-            delayed = false;
-            break;
-        }
-        case CMD_FASTFWD :
-        {
-            Debug( 1, "Got FAST FWD command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-                // Set delayed_play flag
-                delayed = true;
-            }
-            // Set play rate
-            switch ( replay_rate )
-            {
-                case 2 * ZM_RATE_BASE :
-                    replay_rate = 5 * ZM_RATE_BASE;
-                    break;
-                case 5 * ZM_RATE_BASE :
-                    replay_rate = 10 * ZM_RATE_BASE;
-                    break;
-                case 10 * ZM_RATE_BASE :
-                    replay_rate = 25 * ZM_RATE_BASE;
-                    break;
-                case 25 * ZM_RATE_BASE :
-                case 50 * ZM_RATE_BASE :
-                    replay_rate = 50 * ZM_RATE_BASE;
-                    break;
-                default :
-                    replay_rate = 2 * ZM_RATE_BASE;
-                    break;
-            }
-            break;
-        }
-        case CMD_SLOWFWD :
-        {
-            Debug( 1, "Got SLOW FWD command" );
-            // Set paused flag
-            paused = true;
-            // Set delayed flag
-            delayed = true;
-            // Set play rate
-            replay_rate = ZM_RATE_BASE;
-            // Set step
-            step = 1;
-            break;
-        }
-        case CMD_SLOWREV :
-        {
-            Debug( 1, "Got SLOW REV command" );
-            // Set paused flag
-            paused = true;
-            // Set delayed flag
-            delayed = true;
-            // Set play rate
-            replay_rate = ZM_RATE_BASE;
-            // Set step
-            step = -1;
-            break;
-        }
-        case CMD_FASTREV :
-        {
-            Debug( 1, "Got FAST REV command" );
-            if ( paused )
-            {
-                // Clear paused flag
-                paused = false;
-                // Set delayed_play flag
-                delayed = true;
-            }
-            // Set play rate
-            switch ( replay_rate )
-            {
-                case -2 * ZM_RATE_BASE :
-                    replay_rate = -5 * ZM_RATE_BASE;
-                    break;
-                case -5 * ZM_RATE_BASE :
-                    replay_rate = -10 * ZM_RATE_BASE;
-                    break;
-                case -10 * ZM_RATE_BASE :
-                    replay_rate = -25 * ZM_RATE_BASE;
-                    break;
-                case -25 * ZM_RATE_BASE :
-                case -50 * ZM_RATE_BASE :
-                    replay_rate = -50 * ZM_RATE_BASE;
-                    break;
-                default :
-                    replay_rate = -2 * ZM_RATE_BASE;
-                    break;
-            }
-            break;
-        }
-        case CMD_ZOOMIN :
-        {
-            x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
-            y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-            Debug( 1, "Got ZOOM IN command, to %d,%d", x, y );
-            switch ( zoom )
-            {
-                case 100:
-                    zoom = 150;
-                    break;
-                case 150:
-                    zoom = 200;
-                    break;
-                case 200:
-                    zoom = 300;
-                    break;
-                case 300:
-                    zoom = 400;
-                    break;
-                case 400:
-                default :
-                    zoom = 500;
-                    break;
-            }
-            break;
-        }
-        case CMD_ZOOMOUT :
-        {
-            Debug( 1, "Got ZOOM OUT command" );
-            switch ( zoom )
-            {
-                case 500:
-                    zoom = 400;
-                    break;
-                case 400:
-                    zoom = 300;
-                    break;
-                case 300:
-                    zoom = 200;
-                    break;
-                case 200:
-                    zoom = 150;
-                    break;
-                case 150:
-                default :
-                    zoom = 100;
-                    break;
-            }
-            break;
-        }
-        case CMD_PAN :
-        {
-            x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
-            y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
-            Debug( 1, "Got PAN command, to %d,%d", x, y );
-            break;
-        }
-        case CMD_SCALE :
-        {
-            scale = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
-            Debug( 1, "Got SCALE command, to %d", scale );
-            break;
-        }
-	case CMD_QUIT :
-	{
-	   Info ("User initiated exit - CMD_QUIT");
-	   break;
-	}
-        case CMD_QUERY :
-        {
-            Debug( 1, "Got QUERY command, sending STATUS" );
-            break;
-        }
+      // Clear paused flag
+      paused = false;
+      // Clear delayed_play flag
+      delayed = false;
+      break;
+    }
+    case CMD_FASTFWD :
+    {
+      Debug( 1, "Got FAST FWD command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+        // Set delayed_play flag
+        delayed = true;
+      }
+      // Set play rate
+      switch ( replay_rate )
+      {
+        case 2 * ZM_RATE_BASE :
+          replay_rate = 5 * ZM_RATE_BASE;
+          break;
+        case 5 * ZM_RATE_BASE :
+          replay_rate = 10 * ZM_RATE_BASE;
+          break;
+        case 10 * ZM_RATE_BASE :
+          replay_rate = 25 * ZM_RATE_BASE;
+          break;
+        case 25 * ZM_RATE_BASE :
+        case 50 * ZM_RATE_BASE :
+          replay_rate = 50 * ZM_RATE_BASE;
+          break;
         default :
-        {
-            Error( "Got unexpected command %d", msg->msg_data[0] );
-            break;
-        }
+          replay_rate = 2 * ZM_RATE_BASE;
+          break;
+      }
+      break;
     }
-
-    struct {
-        int id;
-        int state;
-        double fps;
-        int buffer_level;
-        int rate;
-        double delay;
-        int zoom;
-        bool delayed;
-        bool paused;
-        bool enabled;
-        bool forced;
-    } status_data;
-
-    status_data.id = monitor->Id();
-    status_data.fps = monitor->GetFPS();
-    status_data.state = monitor->shared_data->state;
-    if ( playback_buffer > 0 )
-        status_data.buffer_level = (MOD_ADD( (temp_write_index-temp_read_index), 0, temp_image_buffer_count )*100)/temp_image_buffer_count;
-    else
-        status_data.buffer_level = 0;
-    status_data.delayed = delayed;
-    status_data.paused = paused;
-    status_data.rate = replay_rate;
-    status_data.delay = TV_2_FLOAT( now ) - TV_2_FLOAT( last_frame_timestamp );
-    status_data.zoom = zoom;
-    //status_data.enabled = monitor->shared_data->active;
-    status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
-    status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
-    Debug( 2, "L:%d, D:%d, P:%d, R:%d, d:%.3f, Z:%d, E:%d F:%d", 
-        status_data.buffer_level,
-        status_data.delayed,
-        status_data.paused,
-        status_data.rate,
-        status_data.delay,
-        status_data.zoom,
-        status_data.enabled,
-        status_data.forced
-    );
-
-    DataMsg status_msg;
-    status_msg.msg_type = MSG_DATA_WATCH;
-    memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) );
-    int nbytes = 0;
-    if ( (nbytes = sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) )) < 0 )
+    case CMD_SLOWFWD :
     {
-        //if ( errno != EAGAIN )
-        {
-            Error( "Can't sendto on sd %d: %s", sd, strerror(errno) );
-            //exit( -1 );
-        }
+      Debug( 1, "Got SLOW FWD command" );
+      // Set paused flag
+      paused = true;
+      // Set delayed flag
+      delayed = true;
+      // Set play rate
+      replay_rate = ZM_RATE_BASE;
+      // Set step
+      step = 1;
+      break;
     }
+    case CMD_SLOWREV :
+    {
+      Debug( 1, "Got SLOW REV command" );
+      // Set paused flag
+      paused = true;
+      // Set delayed flag
+      delayed = true;
+      // Set play rate
+      replay_rate = ZM_RATE_BASE;
+      // Set step
+      step = -1;
+      break;
+    }
+    case CMD_FASTREV :
+    {
+      Debug( 1, "Got FAST REV command" );
+      if ( paused )
+      {
+        // Clear paused flag
+        paused = false;
+        // Set delayed_play flag
+        delayed = true;
+      }
+      // Set play rate
+      switch ( replay_rate )
+      {
+        case -2 * ZM_RATE_BASE :
+          replay_rate = -5 * ZM_RATE_BASE;
+          break;
+        case -5 * ZM_RATE_BASE :
+          replay_rate = -10 * ZM_RATE_BASE;
+          break;
+        case -10 * ZM_RATE_BASE :
+          replay_rate = -25 * ZM_RATE_BASE;
+          break;
+        case -25 * ZM_RATE_BASE :
+        case -50 * ZM_RATE_BASE :
+          replay_rate = -50 * ZM_RATE_BASE;
+          break;
+        default :
+          replay_rate = -2 * ZM_RATE_BASE;
+          break;
+      }
+      break;
+    }
+    case CMD_ZOOMIN :
+    {
+      x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
+      y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
+      Debug( 1, "Got ZOOM IN command, to %d,%d", x, y );
+      switch ( zoom )
+      {
+        case 100:
+          zoom = 150;
+          break;
+        case 150:
+          zoom = 200;
+          break;
+        case 200:
+          zoom = 300;
+          break;
+        case 300:
+          zoom = 400;
+          break;
+        case 400:
+        default :
+          zoom = 500;
+          break;
+      }
+      break;
+    }
+    case CMD_ZOOMOUT :
+    {
+      Debug( 1, "Got ZOOM OUT command" );
+      switch ( zoom )
+      {
+        case 500:
+          zoom = 400;
+          break;
+        case 400:
+          zoom = 300;
+          break;
+        case 300:
+          zoom = 200;
+          break;
+        case 200:
+          zoom = 150;
+          break;
+        case 150:
+        default :
+          zoom = 100;
+          break;
+      }
+      break;
+    }
+    case CMD_PAN :
+    {
+      x = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
+      y = ((unsigned char)msg->msg_data[3]<<8)|(unsigned char)msg->msg_data[4];
+      Debug( 1, "Got PAN command, to %d,%d", x, y );
+      break;
+    }
+    case CMD_SCALE :
+    {
+      scale = ((unsigned char)msg->msg_data[1]<<8)|(unsigned char)msg->msg_data[2];
+      Debug( 1, "Got SCALE command, to %d", scale );
+      break;
+    }
+  case CMD_QUIT :
+  {
+     Info ("User initiated exit - CMD_QUIT");
+     break;
+  }
+    case CMD_QUERY :
+    {
+      Debug( 1, "Got QUERY command, sending STATUS" );
+      break;
+    }
+    default :
+    {
+      Error( "Got unexpected command %d", msg->msg_data[0] );
+      break;
+    }
+  }
 
-    // quit after sending a status, if this was a quit request
-    if ((MsgCommand)msg->msg_data[0]==CMD_QUIT)
-	exit(0);
+  struct {
+    int id;
+    int state;
+    double fps;
+    int buffer_level;
+    int rate;
+    double delay;
+    int zoom;
+    bool delayed;
+    bool paused;
+    bool enabled;
+    bool forced;
+  } status_data;
 
-    updateFrameRate( monitor->GetFPS() );
+  status_data.id = monitor->Id();
+  status_data.fps = monitor->GetFPS();
+  status_data.state = monitor->shared_data->state;
+  if ( playback_buffer > 0 )
+    status_data.buffer_level = (MOD_ADD( (temp_write_index-temp_read_index), 0, temp_image_buffer_count )*100)/temp_image_buffer_count;
+  else
+    status_data.buffer_level = 0;
+  status_data.delayed = delayed;
+  status_data.paused = paused;
+  status_data.rate = replay_rate;
+  status_data.delay = TV_2_FLOAT( now ) - TV_2_FLOAT( last_frame_timestamp );
+  status_data.zoom = zoom;
+  //status_data.enabled = monitor->shared_data->active;
+  status_data.enabled = monitor->trigger_data->trigger_state!=Monitor::TRIGGER_OFF;
+  status_data.forced = monitor->trigger_data->trigger_state==Monitor::TRIGGER_ON;
+  Debug( 2, "L:%d, D:%d, P:%d, R:%d, d:%.3f, Z:%d, E:%d F:%d", 
+    status_data.buffer_level,
+    status_data.delayed,
+    status_data.paused,
+    status_data.rate,
+    status_data.delay,
+    status_data.zoom,
+    status_data.enabled,
+    status_data.forced
+  );
+
+  DataMsg status_msg;
+  status_msg.msg_type = MSG_DATA_WATCH;
+  memcpy( &status_msg.msg_data, &status_data, sizeof(status_data) );
+  int nbytes = 0;
+  if ( (nbytes = sendto( sd, &status_msg, sizeof(status_msg), MSG_DONTWAIT, (sockaddr *)&rem_addr, sizeof(rem_addr) )) < 0 )
+  {
+    //if ( errno != EAGAIN )
+    {
+      Error( "Can't sendto on sd %d: %s", sd, strerror(errno) );
+      //exit( -1 );
+    }
+  }
+
+  // quit after sending a status, if this was a quit request
+  if ((MsgCommand)msg->msg_data[0]==CMD_QUIT)
+  exit(0);
+
+  updateFrameRate( monitor->GetFPS() );
 }
 
 bool MonitorStream::sendFrame( const char *filepath, struct timeval *timestamp )
 {
-    bool send_raw = ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE));
+  bool send_raw = ((scale>=ZM_SCALE_BASE)&&(zoom==ZM_SCALE_BASE));
 
-    if ( type != STREAM_JPEG )
-        send_raw = false;
-    if ( !config.timestamp_on_capture && timestamp )
-        send_raw = false;
+  if ( type != STREAM_JPEG )
+    send_raw = false;
+  if ( !config.timestamp_on_capture && timestamp )
+    send_raw = false;
 
-    if ( !send_raw )
+  if ( !send_raw )
+  {
+    Image temp_image( filepath );
+
+    return( sendFrame( &temp_image, timestamp ) );
+  }
+  else
+  {
+    int img_buffer_size = 0;
+    static unsigned char img_buffer[ZM_MAX_IMAGE_SIZE];
+
+    FILE *fdj = NULL;
+    if ( (fdj = fopen( filepath, "r" )) )
     {
-        Image temp_image( filepath );
-
-        return( sendFrame( &temp_image, timestamp ) );
+      img_buffer_size = fread( img_buffer, 1, sizeof(img_buffer), fdj );
+      fclose( fdj );
     }
     else
     {
-        int img_buffer_size = 0;
-        static unsigned char img_buffer[ZM_MAX_IMAGE_SIZE];
-
-        FILE *fdj = NULL;
-        if ( (fdj = fopen( filepath, "r" )) )
-        {
-            img_buffer_size = fread( img_buffer, 1, sizeof(img_buffer), fdj );
-            fclose( fdj );
-        }
-        else
-        {
-            Error( "Can't open %s: %s", filepath, strerror(errno) );
-            return( false );
-        }
-
-        // Calculate how long it takes to actually send the frame
-        struct timeval frameStartTime;
-        gettimeofday( &frameStartTime, NULL );
-        
-        fprintf( stdout, "--ZoneMinderFrame\r\n" );
-        fprintf( stdout, "Content-Length: %d\r\n", img_buffer_size );
-        fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
-        if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 )
-        {
-            if ( !zm_terminate )
-                Error( "Unable to send stream frame: %s", strerror(errno) );
-            return( false );
-        }
-        fprintf( stdout, "\r\n\r\n" );
-        fflush( stdout );
-
-        struct timeval frameEndTime;
-        gettimeofday( &frameEndTime, NULL );
-
-        int frameSendTime = tvDiffMsec( frameStartTime, frameEndTime );
-        if ( frameSendTime > 1000/maxfps )
-        {
-            maxfps /= 2;
-            Error( "Frame send time %d msec too slow, throttling maxfps to %.2f", frameSendTime, maxfps );
-        }
-
-        last_frame_sent = TV_2_FLOAT( now );
-
-        return( true );
+      Error( "Can't open %s: %s", filepath, strerror(errno) );
+      return( false );
     }
-    return( false );
+
+    // Calculate how long it takes to actually send the frame
+    struct timeval frameStartTime;
+    gettimeofday( &frameStartTime, NULL );
+    
+    fprintf( stdout, "--ZoneMinderFrame\r\n" );
+    fprintf( stdout, "Content-Length: %d\r\n", img_buffer_size );
+    fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+    if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 )
+    {
+      if ( !zm_terminate )
+        Error( "Unable to send stream frame: %s", strerror(errno) );
+      return( false );
+    }
+    fprintf( stdout, "\r\n\r\n" );
+    fflush( stdout );
+
+    struct timeval frameEndTime;
+    gettimeofday( &frameEndTime, NULL );
+
+    int frameSendTime = tvDiffMsec( frameStartTime, frameEndTime );
+    if ( frameSendTime > 1000/maxfps )
+    {
+      maxfps /= 2;
+      Error( "Frame send time %d msec too slow, throttling maxfps to %.2f", frameSendTime, maxfps );
+    }
+
+    last_frame_sent = TV_2_FLOAT( now );
+
+    return( true );
+  }
+  return( false );
 }
 
 bool MonitorStream::sendFrame( Image *image, struct timeval *timestamp )
 {
-    Image *send_image = prepareImage( image );
-    if ( !config.timestamp_on_capture && timestamp )
-        monitor->TimestampImage( send_image, timestamp );
+  Image *send_image = prepareImage( image );
+  if ( !config.timestamp_on_capture && timestamp )
+    monitor->TimestampImage( send_image, timestamp );
 
 #if HAVE_LIBAVCODEC
-    if ( type == STREAM_MPEG )
+  if ( type == STREAM_MPEG )
+  {
+    if ( !vid_stream )
     {
-        if ( !vid_stream )
-        {
-            vid_stream = new VideoStream( "pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height() );
-            fprintf( stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType() );
-            vid_stream->OpenStream();
-        }
-        static struct timeval base_time;
-        struct DeltaTimeval delta_time;
-        if ( !frame_count )
-            base_time = *timestamp;
-        DELTA_TIMEVAL( delta_time, *timestamp, base_time, DT_PREC_3 );
-        /* double pts = */ vid_stream->EncodeFrame( send_image->Buffer(), send_image->Size(), config.mpeg_timed_frames, delta_time.delta );
+      vid_stream = new VideoStream( "pipe:", format, bitrate, effective_fps, send_image->Colours(), send_image->SubpixelOrder(), send_image->Width(), send_image->Height() );
+      fprintf( stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType() );
+      vid_stream->OpenStream();
     }
-    else
+    static struct timeval base_time;
+    struct DeltaTimeval delta_time;
+    if ( !frame_count )
+      base_time = *timestamp;
+    DELTA_TIMEVAL( delta_time, *timestamp, base_time, DT_PREC_3 );
+    /* double pts = */ vid_stream->EncodeFrame( send_image->Buffer(), send_image->Size(), config.mpeg_timed_frames, delta_time.delta );
+  }
+  else
 #endif // HAVE_LIBAVCODEC
+  {
+    static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
+
+    int img_buffer_size = 0;
+    unsigned char *img_buffer = temp_img_buffer;
+
+    // Calculate how long it takes to actually send the frame
+    struct timeval frameStartTime;
+    gettimeofday( &frameStartTime, NULL );
+    
+    fprintf( stdout, "--ZoneMinderFrame\r\n" );
+    switch( type )
     {
-        static unsigned char temp_img_buffer[ZM_MAX_IMAGE_SIZE];
-
-        int img_buffer_size = 0;
-        unsigned char *img_buffer = temp_img_buffer;
-
-        // Calculate how long it takes to actually send the frame
-        struct timeval frameStartTime;
-        gettimeofday( &frameStartTime, NULL );
-        
-        fprintf( stdout, "--ZoneMinderFrame\r\n" );
-        switch( type )
-        {
-            case STREAM_JPEG :
-                send_image->EncodeJpeg( img_buffer, &img_buffer_size );
-                fprintf( stdout, "Content-Type: image/jpeg\r\n" );
-                break;
-            case STREAM_RAW :
-                fprintf( stdout, "Content-Type: image/x-rgb\r\n" );
-                img_buffer = (uint8_t*)send_image->Buffer();
-                img_buffer_size = send_image->Size();
-                break;
-            case STREAM_ZIP :
-                fprintf( stdout, "Content-Type: image/x-rgbz\r\n" );
-                unsigned long zip_buffer_size;
-                send_image->Zip( img_buffer, &zip_buffer_size );
-                img_buffer_size = zip_buffer_size;
-                break;
-            default :
-                Fatal( "Unexpected frame type %d", type );
-                break;
-        }
-        fprintf( stdout, "Content-Length: %d\r\n\r\n", img_buffer_size );
-        if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 )
-        {
-            if ( !zm_terminate )
-                Error( "Unable to send stream frame: %s", strerror(errno) );
-            return( false );
-        }
-        fprintf( stdout, "\r\n\r\n" );
-        fflush( stdout );
-
-        struct timeval frameEndTime;
-        gettimeofday( &frameEndTime, NULL );
-
-        int frameSendTime = tvDiffMsec( frameStartTime, frameEndTime );
-        if ( frameSendTime > 1000/maxfps )
-        {
-            maxfps /= 1.5;
-            Error( "Frame send time %d msec too slow, throttling maxfps to %.2f", frameSendTime, maxfps );
-        }
+      case STREAM_JPEG :
+        send_image->EncodeJpeg( img_buffer, &img_buffer_size );
+        fprintf( stdout, "Content-Type: image/jpeg\r\n" );
+        break;
+      case STREAM_RAW :
+        fprintf( stdout, "Content-Type: image/x-rgb\r\n" );
+        img_buffer = (uint8_t*)send_image->Buffer();
+        img_buffer_size = send_image->Size();
+        break;
+      case STREAM_ZIP :
+        fprintf( stdout, "Content-Type: image/x-rgbz\r\n" );
+        unsigned long zip_buffer_size;
+        send_image->Zip( img_buffer, &zip_buffer_size );
+        img_buffer_size = zip_buffer_size;
+        break;
+      default :
+        Fatal( "Unexpected frame type %d", type );
+        break;
     }
-    last_frame_sent = TV_2_FLOAT( now );
-    return( true );
+    fprintf( stdout, "Content-Length: %d\r\n\r\n", img_buffer_size );
+    if ( fwrite( img_buffer, img_buffer_size, 1, stdout ) != 1 )
+    {
+      if ( !zm_terminate )
+        Error( "Unable to send stream frame: %s", strerror(errno) );
+      return( false );
+    }
+    fprintf( stdout, "\r\n\r\n" );
+    fflush( stdout );
+
+    struct timeval frameEndTime;
+    gettimeofday( &frameEndTime, NULL );
+
+    int frameSendTime = tvDiffMsec( frameStartTime, frameEndTime );
+    if ( frameSendTime > 1000/maxfps )
+    {
+      maxfps /= 1.5;
+      Error( "Frame send time %d msec too slow, throttling maxfps to %.2f", frameSendTime, maxfps );
+    }
+  }
+  last_frame_sent = TV_2_FLOAT( now );
+  return( true );
 }
 
 void MonitorStream::runStream()
 {
-    if ( type == STREAM_SINGLE )
+  if ( type == STREAM_SINGLE )
+  {
+    // Not yet migrated over to stream class
+    monitor->SingleImage( scale );
+    return;
+  }
+
+  openComms();
+
+  checkInitialised();
+
+  updateFrameRate( monitor->GetFPS() );
+
+  if ( type == STREAM_JPEG )
+    fprintf( stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n" );
+
+  int last_read_index = monitor->image_buffer_count;
+
+  time_t stream_start_time;
+  time( &stream_start_time );
+
+  frame_count = 0;
+
+  temp_image_buffer = 0;
+  temp_image_buffer_count = playback_buffer;
+  temp_read_index = temp_image_buffer_count;
+  temp_write_index = temp_image_buffer_count;
+
+  char *swap_path = 0;
+  bool buffered_playback = false;
+
+  // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id
+  const int max_swap_len_suffix = 15; 
+
+  int swap_path_length = strlen(config.path_swap)+1; // +1 for NULL terminator
+
+  if ( connkey && playback_buffer > 0 ) {
+
+    if ( swap_path_length + max_swap_len_suffix > PATH_MAX ) {
+      Error( "Swap Path is too long. %d > %d ", swap_path_length+max_swap_len_suffix, PATH_MAX );
+    } else {
+      swap_path = (char *)malloc( swap_path_length+max_swap_len_suffix );
+      Debug( 3, "Checking swap image path %s", config.path_swap );
+      strncpy( swap_path, config.path_swap, swap_path_length );
+      if ( checkSwapPath( swap_path, false ) ) {
+        snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-m%d", monitor->Id() );
+        if ( checkSwapPath( swap_path, true ) ) {
+          snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-q%06d", connkey );
+          if ( checkSwapPath( swap_path, true ) ) {
+            buffered_playback = true;
+          }
+        }
+      }
+
+      if ( !buffered_playback ) {
+        Error( "Unable to validate swap image path, disabling buffered playback" );
+      } else {
+        Debug( 2, "Assigning temporary buffer" );
+        temp_image_buffer = new SwapImage[temp_image_buffer_count];
+        memset( temp_image_buffer, 0, sizeof(*temp_image_buffer)*temp_image_buffer_count );
+        Debug( 2, "Assigned temporary buffer" );
+      }
+    }
+  }
+
+  float max_secs_since_last_sent_frame = 10.0; //should be > keep alive amount (5 secs)
+  while ( !zm_terminate )
+  {
+    bool got_command = false;
+    if ( feof( stdout ) || ferror( stdout ) || !monitor->ShmValid() )
     {
-        // Not yet migrated over to stream class
-        monitor->SingleImage( scale );
-        return;
+      break;
     }
 
-    openComms();
+    gettimeofday( &now, NULL );
 
-    checkInitialised();
-
-    updateFrameRate( monitor->GetFPS() );
-
-    if ( type == STREAM_JPEG )
-        fprintf( stdout, "Content-Type: multipart/x-mixed-replace;boundary=ZoneMinderFrame\r\n\r\n" );
-
-    int last_read_index = monitor->image_buffer_count;
-
-    time_t stream_start_time;
-    time( &stream_start_time );
-
-    frame_count = 0;
-
-    temp_image_buffer = 0;
-    temp_image_buffer_count = playback_buffer;
-    temp_read_index = temp_image_buffer_count;
-    temp_write_index = temp_image_buffer_count;
-
-    char *swap_path = 0;
-    bool buffered_playback = false;
-
-    // 15 is the max length for the swap path suffix, /zmswap-whatever, assuming max 6 digits for monitor id
-    const int max_swap_len_suffix = 15; 
-
-	int swap_path_length = strlen(config.path_swap)+1; // +1 for NULL terminator
-
-	if ( connkey && playback_buffer > 0 ) {
-
-		if ( swap_path_length + max_swap_len_suffix > PATH_MAX ) {
-			Error( "Swap Path is too long. %d > %d ", swap_path_length+max_swap_len_suffix, PATH_MAX );
-		} else {
-			swap_path = (char *)malloc( swap_path_length+max_swap_len_suffix );
-			Debug( 3, "Checking swap image path %s", config.path_swap );
-			strncpy( swap_path, config.path_swap, swap_path_length );
-			if ( checkSwapPath( swap_path, false ) ) {
-				snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-m%d", monitor->Id() );
-				if ( checkSwapPath( swap_path, true ) ) {
-					snprintf( &(swap_path[swap_path_length]), max_swap_len_suffix, "/zmswap-q%06d", connkey );
-					if ( checkSwapPath( swap_path, true ) ) {
-						buffered_playback = true;
-					}
-				}
-			}
-
-			if ( !buffered_playback ) {
-				Error( "Unable to validate swap image path, disabling buffered playback" );
-			} else {
-				Debug( 2, "Assigning temporary buffer" );
-				temp_image_buffer = new SwapImage[temp_image_buffer_count];
-				memset( temp_image_buffer, 0, sizeof(*temp_image_buffer)*temp_image_buffer_count );
-				Debug( 2, "Assigned temporary buffer" );
-			}
-		}
+    if ( connkey )
+    {
+      while(checkCommandQueue()) {
+        got_command = true;
+      }
     }
 
-    float max_secs_since_last_sent_frame = 10.0; //should be > keep alive amount (5 secs)
-    while ( !zm_terminate )
+    //bool frame_sent = false;
+    if ( buffered_playback && delayed )
     {
-        bool got_command = false;
-        if ( feof( stdout ) || ferror( stdout ) || !monitor->ShmValid() )
+      if ( temp_read_index == temp_write_index )
+      {
+        // Go back to live viewing
+        Debug( 1, "Exceeded temporary streaming buffer" );
+        // Clear paused flag
+        paused = false;
+        // Clear delayed_play flag
+        delayed = false;
+        replay_rate = ZM_RATE_BASE;
+      }
+      else
+      {
+        if ( !paused )
         {
-            break;
-        }
+          int temp_index = MOD_ADD( temp_read_index, 0, temp_image_buffer_count );
+          //Debug( 3, "tri: %d, ti: %d", temp_read_index, temp_index );
+          SwapImage *swap_image = &temp_image_buffer[temp_index];
 
-        gettimeofday( &now, NULL );
+          if ( !swap_image->valid )
+          {
+            paused = true;
+            delayed = true;
+            temp_read_index = MOD_ADD( temp_read_index, (replay_rate>=0?-1:1), temp_image_buffer_count );
+          }
+          else
+          {
+            //Debug( 3, "siT: %f, lfT: %f", TV_2_FLOAT( swap_image->timestamp ), TV_2_FLOAT( last_frame_timestamp ) );
+            double expected_delta_time = ((TV_2_FLOAT( swap_image->timestamp ) - TV_2_FLOAT( last_frame_timestamp )) * ZM_RATE_BASE)/replay_rate;
+            double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
 
-        if ( connkey )
-        {
-            while(checkCommandQueue()) {
-                got_command = true;
-            }
-        }
-
-        //bool frame_sent = false;
-        if ( buffered_playback && delayed )
-        {
-            if ( temp_read_index == temp_write_index )
+            //Debug( 3, "eDT: %.3lf, aDT: %.3f, lFS:%.3f, NOW:%.3f", expected_delta_time, actual_delta_time, last_frame_sent, TV_2_FLOAT( now ) );
+            // If the next frame is due
+            if ( actual_delta_time > expected_delta_time )
             {
-                // Go back to live viewing
-                Debug( 1, "Exceeded temporary streaming buffer" );
-                // Clear paused flag
-                paused = false;
-                // Clear delayed_play flag
-                delayed = false;
-                replay_rate = ZM_RATE_BASE;
-            }
-            else
-            {
-                if ( !paused )
-                {
-                    int temp_index = MOD_ADD( temp_read_index, 0, temp_image_buffer_count );
-                    //Debug( 3, "tri: %d, ti: %d", temp_read_index, temp_index );
-                    SwapImage *swap_image = &temp_image_buffer[temp_index];
-
-                    if ( !swap_image->valid )
-                    {
-                        paused = true;
-                        delayed = true;
-                        temp_read_index = MOD_ADD( temp_read_index, (replay_rate>=0?-1:1), temp_image_buffer_count );
-                    }
-                    else
-                    {
-                        //Debug( 3, "siT: %f, lfT: %f", TV_2_FLOAT( swap_image->timestamp ), TV_2_FLOAT( last_frame_timestamp ) );
-                        double expected_delta_time = ((TV_2_FLOAT( swap_image->timestamp ) - TV_2_FLOAT( last_frame_timestamp )) * ZM_RATE_BASE)/replay_rate;
-                        double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
-
-                        //Debug( 3, "eDT: %.3lf, aDT: %.3f, lFS:%.3f, NOW:%.3f", expected_delta_time, actual_delta_time, last_frame_sent, TV_2_FLOAT( now ) );
-                        // If the next frame is due
-                        if ( actual_delta_time > expected_delta_time )
-                        {
-                            //Debug( 2, "eDT: %.3lf, aDT: %.3f", expected_delta_time, actual_delta_time );
-                            if ( temp_index%frame_mod == 0 )
-                            {
-                                Debug( 2, "Sending delayed frame %d", temp_index );
-                                // Send the next frame
-                                if ( !sendFrame( temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp ) )
-                                    zm_terminate = true;
-                                memcpy( &last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp) );
-                                //frame_sent = true;
-                            }
-                            temp_read_index = MOD_ADD( temp_read_index, (replay_rate>0?1:-1), temp_image_buffer_count );
-                        }
-                    }
-                }
-                else if ( step != 0 )
-                {
-                    temp_read_index = MOD_ADD( temp_read_index, (step>0?1:-1), temp_image_buffer_count );
-
-                    SwapImage *swap_image = &temp_image_buffer[temp_read_index];
-
-                    // Send the next frame
-                    if ( !sendFrame( temp_image_buffer[temp_read_index].file_name, &temp_image_buffer[temp_read_index].timestamp ) )
-                        zm_terminate = true;
-                    memcpy( &last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp) );
-                    //frame_sent = true;
-                    step = 0;
-                }
-                else
-                {
-                    int temp_index = MOD_ADD( temp_read_index, 0, temp_image_buffer_count );
-
-                     double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
-                     if ( got_command || actual_delta_time > 5 )
-                     {
-                        // Send keepalive
-                        Debug( 2, "Sending keepalive frame %d", temp_index );
-                        // Send the next frame
-                        if ( !sendFrame( temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp ) )
-                            zm_terminate = true;
-                        //frame_sent = true;
-                    }
-                }
-            }
-            if ( temp_read_index == temp_write_index )
-            {
-                // Go back to live viewing
-                Warning( "Rewound over write index, resuming live play" );
-                // Clear paused flag
-                paused = false;
-                // Clear delayed_play flag
-                delayed = false;
-                replay_rate = ZM_RATE_BASE;
+              //Debug( 2, "eDT: %.3lf, aDT: %.3f", expected_delta_time, actual_delta_time );
+              if ( temp_index%frame_mod == 0 )
+              {
+                Debug( 2, "Sending delayed frame %d", temp_index );
+                // Send the next frame
+                if ( !sendFrame( temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp ) )
+                  zm_terminate = true;
+                memcpy( &last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp) );
+                //frame_sent = true;
+              }
+              temp_read_index = MOD_ADD( temp_read_index, (replay_rate>0?1:-1), temp_image_buffer_count );
             }
+          }
         }
-        if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
+        else if ( step != 0 )
         {
-            int index = monitor->shared_data->last_write_index%monitor->image_buffer_count;
-            last_read_index = monitor->shared_data->last_write_index;
-            //Debug( 1, "%d: %x - %x", index, image_buffer[index].image, image_buffer[index].image->buffer );
-            if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) )
-            {
-                if ( !paused && !delayed )
-                {
-                    // Send the next frame
-                    Monitor::Snapshot *snap = &monitor->image_buffer[index];
+          temp_read_index = MOD_ADD( temp_read_index, (step>0?1:-1), temp_image_buffer_count );
 
-                    if ( !sendFrame( snap->image, snap->timestamp ) )
-                        zm_terminate = true;
-                    memcpy( &last_frame_timestamp, snap->timestamp, sizeof(last_frame_timestamp) );
-                    //frame_sent = true;
+          SwapImage *swap_image = &temp_image_buffer[temp_read_index];
 
-                    temp_read_index = temp_write_index;
-                }
-            }
-            if ( buffered_playback )
-            {
-                if ( monitor->shared_data->valid )
-                {
-                    if ( monitor->image_buffer[index].timestamp->tv_sec )
-                    {
-                        int temp_index = temp_write_index%temp_image_buffer_count;
-                        Debug( 2, "Storing frame %d", temp_index );
-                        if ( !temp_image_buffer[temp_index].valid )
-                        {
-                            snprintf( temp_image_buffer[temp_index].file_name, sizeof(temp_image_buffer[0].file_name), "%s/zmswap-i%05d.jpg", swap_path, temp_index );
-                            temp_image_buffer[temp_index].valid = true;
-                        }
-                        memcpy( &(temp_image_buffer[temp_index].timestamp), monitor->image_buffer[index].timestamp, sizeof(temp_image_buffer[0].timestamp) );
-                        monitor->image_buffer[index].image->WriteJpeg( temp_image_buffer[temp_index].file_name, config.jpeg_file_quality );
-                        temp_write_index = MOD_ADD( temp_write_index, 1, temp_image_buffer_count );
-                        if ( temp_write_index == temp_read_index )
-                        {
-                            // Go back to live viewing
-                            Warning( "Exceeded temporary buffer, resuming live play" );
-                            // Clear paused flag
-                            paused = false;
-                            // Clear delayed_play flag
-                            delayed = false;
-                            replay_rate = ZM_RATE_BASE;
-                        }
-                    }
-                    else
-                    {
-                        Warning( "Unable to store frame as timestamp invalid" );
-                    }
-                }
-                else
-                {
-                    Warning( "Unable to store frame as shared memory invalid" );
-                }
-            }
-            frame_count++;
-        }
-        usleep( (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))) );
-        if ( ttl )
-        {
-            if ( (now.tv_sec - stream_start_time) > ttl )
-            {
-                break;
-            }
-        }
-        if ( (TV_2_FLOAT( now ) - last_frame_sent) > max_secs_since_last_sent_frame )
-        {
-            Error( "Terminating, last frame sent time %f secs more than maximum of %f", TV_2_FLOAT( now ) - last_frame_sent, max_secs_since_last_sent_frame );
-            break;
-        }
-    }
-    if ( buffered_playback )
-    {
-        char swap_path[PATH_MAX] = "";
-
-        snprintf( swap_path, sizeof(swap_path), "%s/zmswap-m%d/zmswap-q%06d", config.path_swap, monitor->Id(), connkey );
-        Debug( 1, "Cleaning swap files from %s", swap_path );
-        struct stat stat_buf;
-        if ( stat( swap_path, &stat_buf ) < 0 )
-        {
-            if ( errno != ENOENT )
-            {
-                Error( "Can't stat '%s': %s", swap_path, strerror(errno) );
-            }
-        }
-        else if ( !S_ISDIR(stat_buf.st_mode) )
-        {
-            Error( "Swap image path '%s' is not a directory", swap_path );
+          // Send the next frame
+          if ( !sendFrame( temp_image_buffer[temp_read_index].file_name, &temp_image_buffer[temp_read_index].timestamp ) )
+            zm_terminate = true;
+          memcpy( &last_frame_timestamp, &(swap_image->timestamp), sizeof(last_frame_timestamp) );
+          //frame_sent = true;
+          step = 0;
         }
         else
         {
-            char glob_pattern[PATH_MAX] = "";
+          int temp_index = MOD_ADD( temp_read_index, 0, temp_image_buffer_count );
 
-            snprintf( glob_pattern, sizeof(glob_pattern), "%s/*.*", swap_path );
-            glob_t pglob;
-            int glob_status = glob( glob_pattern, 0, 0, &pglob );
-            if ( glob_status != 0 )
-            {
-                if ( glob_status < 0 )
-                {
-                    Error( "Can't glob '%s': %s", glob_pattern, strerror(errno) );
-                }
-                else
-                {
-                    Debug( 1, "Can't glob '%s': %d", glob_pattern, glob_status );
-                }
-            }
-            else
-            {
-                for ( unsigned int i = 0; i < pglob.gl_pathc; i++ )
-                {
-                    if ( unlink( pglob.gl_pathv[i] ) < 0 )
-                    {
-                        Error( "Can't unlink '%s': %s", pglob.gl_pathv[i], strerror(errno) );
-                    }
-                }
-            }
-            globfree( &pglob );
-            if ( rmdir( swap_path ) < 0 )
-            {
-                Error( "Can't rmdir '%s': %s", swap_path, strerror(errno) );
-            }
+           double actual_delta_time = TV_2_FLOAT( now ) - last_frame_sent;
+           if ( got_command || actual_delta_time > 5 )
+           {
+            // Send keepalive
+            Debug( 2, "Sending keepalive frame %d", temp_index );
+            // Send the next frame
+            if ( !sendFrame( temp_image_buffer[temp_index].file_name, &temp_image_buffer[temp_index].timestamp ) )
+              zm_terminate = true;
+            //frame_sent = true;
+          }
         }
+      }
+      if ( temp_read_index == temp_write_index )
+      {
+        // Go back to live viewing
+        Warning( "Rewound over write index, resuming live play" );
+        // Clear paused flag
+        paused = false;
+        // Clear delayed_play flag
+        delayed = false;
+        replay_rate = ZM_RATE_BASE;
+      }
     }
-    if ( swap_path ) free( swap_path );
-    closeComms();
+    if ( (unsigned int)last_read_index != monitor->shared_data->last_write_index )
+    {
+      int index = monitor->shared_data->last_write_index%monitor->image_buffer_count;
+      last_read_index = monitor->shared_data->last_write_index;
+      //Debug( 1, "%d: %x - %x", index, image_buffer[index].image, image_buffer[index].image->buffer );
+      if ( (frame_mod == 1) || ((frame_count%frame_mod) == 0) )
+      {
+        if ( !paused && !delayed )
+        {
+          // Send the next frame
+          Monitor::Snapshot *snap = &monitor->image_buffer[index];
+
+          if ( !sendFrame( snap->image, snap->timestamp ) )
+            zm_terminate = true;
+          memcpy( &last_frame_timestamp, snap->timestamp, sizeof(last_frame_timestamp) );
+          //frame_sent = true;
+
+          temp_read_index = temp_write_index;
+        }
+      }
+      if ( buffered_playback )
+      {
+        if ( monitor->shared_data->valid )
+        {
+          if ( monitor->image_buffer[index].timestamp->tv_sec )
+          {
+            int temp_index = temp_write_index%temp_image_buffer_count;
+            Debug( 2, "Storing frame %d", temp_index );
+            if ( !temp_image_buffer[temp_index].valid )
+            {
+              snprintf( temp_image_buffer[temp_index].file_name, sizeof(temp_image_buffer[0].file_name), "%s/zmswap-i%05d.jpg", swap_path, temp_index );
+              temp_image_buffer[temp_index].valid = true;
+            }
+            memcpy( &(temp_image_buffer[temp_index].timestamp), monitor->image_buffer[index].timestamp, sizeof(temp_image_buffer[0].timestamp) );
+            monitor->image_buffer[index].image->WriteJpeg( temp_image_buffer[temp_index].file_name, config.jpeg_file_quality );
+            temp_write_index = MOD_ADD( temp_write_index, 1, temp_image_buffer_count );
+            if ( temp_write_index == temp_read_index )
+            {
+              // Go back to live viewing
+              Warning( "Exceeded temporary buffer, resuming live play" );
+              // Clear paused flag
+              paused = false;
+              // Clear delayed_play flag
+              delayed = false;
+              replay_rate = ZM_RATE_BASE;
+            }
+          }
+          else
+          {
+            Warning( "Unable to store frame as timestamp invalid" );
+          }
+        }
+        else
+        {
+          Warning( "Unable to store frame as shared memory invalid" );
+        }
+      }
+      frame_count++;
+    }
+    usleep( (unsigned long)((1000000 * ZM_RATE_BASE)/((base_fps?base_fps:1)*abs(replay_rate*2))) );
+    if ( ttl )
+    {
+      if ( (now.tv_sec - stream_start_time) > ttl )
+      {
+        break;
+      }
+    }
+    if ( (TV_2_FLOAT( now ) - last_frame_sent) > max_secs_since_last_sent_frame )
+    {
+      Error( "Terminating, last frame sent time %f secs more than maximum of %f", TV_2_FLOAT( now ) - last_frame_sent, max_secs_since_last_sent_frame );
+      break;
+    }
+  }
+  if ( buffered_playback )
+  {
+    char swap_path[PATH_MAX] = "";
+
+    snprintf( swap_path, sizeof(swap_path), "%s/zmswap-m%d/zmswap-q%06d", config.path_swap, monitor->Id(), connkey );
+    Debug( 1, "Cleaning swap files from %s", swap_path );
+    struct stat stat_buf;
+    if ( stat( swap_path, &stat_buf ) < 0 )
+    {
+      if ( errno != ENOENT )
+      {
+        Error( "Can't stat '%s': %s", swap_path, strerror(errno) );
+      }
+    }
+    else if ( !S_ISDIR(stat_buf.st_mode) )
+    {
+      Error( "Swap image path '%s' is not a directory", swap_path );
+    }
+    else
+    {
+      char glob_pattern[PATH_MAX] = "";
+
+      snprintf( glob_pattern, sizeof(glob_pattern), "%s/*.*", swap_path );
+      glob_t pglob;
+      int glob_status = glob( glob_pattern, 0, 0, &pglob );
+      if ( glob_status != 0 )
+      {
+        if ( glob_status < 0 )
+        {
+          Error( "Can't glob '%s': %s", glob_pattern, strerror(errno) );
+        }
+        else
+        {
+          Debug( 1, "Can't glob '%s': %d", glob_pattern, glob_status );
+        }
+      }
+      else
+      {
+        for ( unsigned int i = 0; i < pglob.gl_pathc; i++ )
+        {
+          if ( unlink( pglob.gl_pathv[i] ) < 0 )
+          {
+            Error( "Can't unlink '%s': %s", pglob.gl_pathv[i], strerror(errno) );
+          }
+        }
+      }
+      globfree( &pglob );
+      if ( rmdir( swap_path ) < 0 )
+      {
+        Error( "Can't rmdir '%s': %s", swap_path, strerror(errno) );
+      }
+    }
+  }
+  if ( swap_path ) free( swap_path );
+  closeComms();
 }
 
 void Monitor::SingleImage( int scale)
 {
-    int img_buffer_size = 0;
-    static JOCTET img_buffer[ZM_MAX_IMAGE_SIZE];
-    Image scaled_image;
-    int index = shared_data->last_write_index%image_buffer_count;
-    Snapshot *snap = &image_buffer[index];
-    Image *snap_image = snap->image;
+  int img_buffer_size = 0;
+  static JOCTET img_buffer[ZM_MAX_IMAGE_SIZE];
+  Image scaled_image;
+  int index = shared_data->last_write_index%image_buffer_count;
+  Snapshot *snap = &image_buffer[index];
+  Image *snap_image = snap->image;
 
-    if ( scale != ZM_SCALE_BASE )
-    {
-        scaled_image.Assign( *snap_image );
-        scaled_image.Scale( scale );
-        snap_image = &scaled_image;
-    }
-    if ( !config.timestamp_on_capture )
-    {
-        TimestampImage( snap_image, snap->timestamp );
-    }
-    snap_image->EncodeJpeg( img_buffer, &img_buffer_size );
-    
-    fprintf( stdout, "Content-Length: %d\r\n", img_buffer_size );
-    fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
-    fwrite( img_buffer, img_buffer_size, 1, stdout );
+  if ( scale != ZM_SCALE_BASE )
+  {
+    scaled_image.Assign( *snap_image );
+    scaled_image.Scale( scale );
+    snap_image = &scaled_image;
+  }
+  if ( !config.timestamp_on_capture )
+  {
+    TimestampImage( snap_image, snap->timestamp );
+  }
+  snap_image->EncodeJpeg( img_buffer, &img_buffer_size );
+  
+  fprintf( stdout, "Content-Length: %d\r\n", img_buffer_size );
+  fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+  fwrite( img_buffer, img_buffer_size, 1, stdout );
 }
 
 void Monitor::SingleImageRaw( int scale)
 {
-    Image scaled_image;
-    int index = shared_data->last_write_index%image_buffer_count;
-    Snapshot *snap = &image_buffer[index];
-    Image *snap_image = snap->image;
+  Image scaled_image;
+  int index = shared_data->last_write_index%image_buffer_count;
+  Snapshot *snap = &image_buffer[index];
+  Image *snap_image = snap->image;
 
-    if ( scale != ZM_SCALE_BASE )
-    {
-        scaled_image.Assign( *snap_image );
-        scaled_image.Scale( scale );
-        snap_image = &scaled_image;
-    }
-    if ( !config.timestamp_on_capture )
-    {
-        TimestampImage( snap_image, snap->timestamp );
-    }
-    
-    fprintf( stdout, "Content-Length: %d\r\n", snap_image->Size() );
-    fprintf( stdout, "Content-Type: image/x-rgb\r\n\r\n" );
-    fwrite( snap_image->Buffer(), snap_image->Size(), 1, stdout );
+  if ( scale != ZM_SCALE_BASE )
+  {
+    scaled_image.Assign( *snap_image );
+    scaled_image.Scale( scale );
+    snap_image = &scaled_image;
+  }
+  if ( !config.timestamp_on_capture )
+  {
+    TimestampImage( snap_image, snap->timestamp );
+  }
+  
+  fprintf( stdout, "Content-Length: %d\r\n", snap_image->Size() );
+  fprintf( stdout, "Content-Type: image/x-rgb\r\n\r\n" );
+  fwrite( snap_image->Buffer(), snap_image->Size(), 1, stdout );
 }
 
 void Monitor::SingleImageZip( int scale)
 {
-    unsigned long img_buffer_size = 0;
-    static Bytef img_buffer[ZM_MAX_IMAGE_SIZE];
-    Image scaled_image;
-    int index = shared_data->last_write_index%image_buffer_count;
-    Snapshot *snap = &image_buffer[index];
-    Image *snap_image = snap->image;
+  unsigned long img_buffer_size = 0;
+  static Bytef img_buffer[ZM_MAX_IMAGE_SIZE];
+  Image scaled_image;
+  int index = shared_data->last_write_index%image_buffer_count;
+  Snapshot *snap = &image_buffer[index];
+  Image *snap_image = snap->image;
 
-    if ( scale != ZM_SCALE_BASE )
-    {
-        scaled_image.Assign( *snap_image );
-        scaled_image.Scale( scale );
-        snap_image = &scaled_image;
-    }
-    if ( !config.timestamp_on_capture )
-    {
-        TimestampImage( snap_image, snap->timestamp );
-    }
-    snap_image->Zip( img_buffer, &img_buffer_size );
-    
-    fprintf( stdout, "Content-Length: %ld\r\n", img_buffer_size );
-    fprintf( stdout, "Content-Type: image/x-rgbz\r\n\r\n" );
-    fwrite( img_buffer, img_buffer_size, 1, stdout );
+  if ( scale != ZM_SCALE_BASE )
+  {
+    scaled_image.Assign( *snap_image );
+    scaled_image.Scale( scale );
+    snap_image = &scaled_image;
+  }
+  if ( !config.timestamp_on_capture )
+  {
+    TimestampImage( snap_image, snap->timestamp );
+  }
+  snap_image->Zip( img_buffer, &img_buffer_size );
+  
+  fprintf( stdout, "Content-Length: %ld\r\n", img_buffer_size );
+  fprintf( stdout, "Content-Type: image/x-rgbz\r\n\r\n" );
+  fwrite( img_buffer, img_buffer_size, 1, stdout );
 }
diff --git a/src/zm_monitor.h b/src/zm_monitor.h
index 9c59a112e..cf27e1b0a 100644
--- a/src/zm_monitor.h
+++ b/src/zm_monitor.h
@@ -50,424 +50,461 @@ class Monitor
 friend class MonitorStream;
 
 public:
-	typedef enum
-	{
-		QUERY=0,
-		CAPTURE,
-		ANALYSIS
-	} Purpose;
+  typedef enum
+  {
+    QUERY=0,
+    CAPTURE,
+    ANALYSIS
+  } Purpose;
 
-	typedef enum
-	{
-		NONE=1,
-		MONITOR,
-		MODECT,
-		RECORD,
-		MOCORD,
-		NODECT
-	} Function;
+  typedef enum
+  {
+    NONE=1,
+    MONITOR,
+    MODECT,
+    RECORD,
+    MOCORD,
+    NODECT
+  } Function;
 
-	typedef enum
-	{ 
-		ROTATE_0=1,
-		ROTATE_90,
-		ROTATE_180,
-		ROTATE_270,
-		FLIP_HORI,
-		FLIP_VERT
-	} Orientation;
+  typedef enum
+  { 
+    ROTATE_0=1,
+    ROTATE_90,
+    ROTATE_180,
+    ROTATE_270,
+    FLIP_HORI,
+    FLIP_VERT
+  } Orientation;
 
-	typedef enum
-	{
-		IDLE,
-		PREALARM,
-		ALARM,
-		ALERT,
-		TAPE
-	} State;
+  typedef enum
+  {
+    IDLE,
+    PREALARM,
+    ALARM,
+    ALERT,
+    TAPE
+  } State;
 
 protected:
-    typedef std::set<Zone *> ZoneSet;
+  typedef std::set<Zone *> ZoneSet;
 
-	typedef enum { GET_SETTINGS=0x1, SET_SETTINGS=0x2, RELOAD=0x4, SUSPEND=0x10, RESUME=0x20 } Action;
+  typedef enum { GET_SETTINGS=0x1, SET_SETTINGS=0x2, RELOAD=0x4, SUSPEND=0x10, RESUME=0x20 } Action;
 
-	typedef enum { CLOSE_TIME, CLOSE_IDLE, CLOSE_ALARM } EventCloseMode;
+  typedef enum { CLOSE_TIME, CLOSE_IDLE, CLOSE_ALARM } EventCloseMode;
 
-	/* sizeof(SharedData) expected to be 336 bytes on 32bit and 64bit */
-	typedef struct
-	{
-		uint32_t size;             	/* +0    */
-		uint32_t last_write_index; 	/* +4    */ 
-		uint32_t last_read_index;  	/* +8    */
-		uint32_t state;            	/* +12   */
-		uint32_t last_event;       	/* +16   */
-		uint32_t action;           	/* +20   */
-		int32_t brightness;        	/* +24   */
-		int32_t hue;               	/* +28   */
-		int32_t colour;            	/* +32   */
-		int32_t contrast;          	/* +36   */
-		int32_t alarm_x;           	/* +40   */
-		int32_t alarm_y;           	/* +44   */
-		uint8_t valid;             	/* +48   */
-		uint8_t active;            	/* +49   */
-		uint8_t signal;            	/* +50   */
-		uint8_t format;            	/* +51   */
-		uint32_t imagesize;        	/* +52   */
-		uint32_t epadding1;        	/* +56   */
-		uint32_t epadding2;        	/* +60   */
-		/* 
-		** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038.
-		** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16.
-		*/	
-		union {                    	/* +64    */
-		      time_t last_write_time;
-		      uint64_t extrapad1;
-		};
-		union {                    	/* +72   */
-		      time_t last_read_time;
-		      uint64_t extrapad2;
-		};
-		uint8_t control_state[256];	/* +80   */
-		
-	} SharedData;
+  /* sizeof(SharedData) expected to be 336 bytes on 32bit and 64bit */
+  typedef struct
+  {
+    uint32_t size;         /* +0  */
+    uint32_t last_write_index;   /* +4  */ 
+    uint32_t last_read_index;    /* +8  */
+    uint32_t state;        /* +12   */
+    uint32_t last_event;       /* +16   */
+    uint32_t action;         /* +20   */
+    int32_t brightness;      /* +24   */
+    int32_t hue;           /* +28   */
+    int32_t colour;        /* +32   */
+    int32_t contrast;        /* +36   */
+    int32_t alarm_x;         /* +40   */
+    int32_t alarm_y;         /* +44   */
+    uint8_t valid;         /* +48   */
+    uint8_t active;        /* +49   */
+    uint8_t signal;        /* +50   */
+    uint8_t format;        /* +51   */
+    uint32_t imagesize;      /* +52   */
+    uint32_t epadding1;      /* +56   */
+    uint32_t epadding2;      /* +60   */
+    /* 
+    ** This keeps 32bit time_t and 64bit time_t identical and compatible as long as time is before 2038.
+    ** Shared memory layout should be identical for both 32bit and 64bit and is multiples of 16.
+    */  
+    union {            /* +64  */
+        time_t last_write_time;
+        uint64_t extrapad1;
+    };
+    union {            /* +72   */
+        time_t last_read_time;
+        uint64_t extrapad2;
+    };
+    uint8_t control_state[256];  /* +80   */
+    
+  } SharedData;
 
-	typedef enum { TRIGGER_CANCEL, TRIGGER_ON, TRIGGER_OFF } TriggerState;
-	
-	/* sizeof(TriggerData) expected to be 560 on 32bit & and 64bit */
-	typedef struct
-	{
-		uint32_t size;
-		uint32_t trigger_state;
-		uint32_t trigger_score;
-		uint32_t padding;
-		char trigger_cause[32];
-		char trigger_text[256];
-		char trigger_showtext[256];
-	} TriggerData;
+  typedef enum { TRIGGER_CANCEL, TRIGGER_ON, TRIGGER_OFF } TriggerState;
+  
+  /* sizeof(TriggerData) expected to be 560 on 32bit & and 64bit */
+  typedef struct
+  {
+    uint32_t size;
+    uint32_t trigger_state;
+    uint32_t trigger_score;
+    uint32_t padding;
+    char trigger_cause[32];
+    char trigger_text[256];
+    char trigger_showtext[256];
+  } TriggerData;
 
-	/* sizeof(Snapshot) expected to be 16 bytes on 32bit and 32 bytes on 64bit */
-	struct Snapshot
-	{
-		struct timeval	*timestamp;
-		Image	*image;
-		void* padding;
-	};
+  /* sizeof(Snapshot) expected to be 16 bytes on 32bit and 32 bytes on 64bit */
+  struct Snapshot
+  {
+    struct timeval  *timestamp;
+    Image  *image;
+    void* padding;
+  };
 
     //TODO: Technically we can't exclude this struct when people don't have avformat as the Memory.pm module doesn't know about avformat
 #if 1
     //sizeOf(VideoStoreData) expected to be 4104 bytes on 32bit and 64bit
-	typedef struct
+    typedef struct
     {
         uint32_t size;
         char event_file[4096];
         uint32_t recording; //bool arch dependent so use uint32 instead
         //uint32_t frameNumber;
-    
     } VideoStoreData;
-    
+
 #endif // HAVE_LIBAVFORMAT
 
-	class MonitorLink
-	{
-	protected:
-		unsigned int	id;
-		char			name[64];
+  class MonitorLink
+  {
+  protected:
+    unsigned int  id;
+    char      name[64];
 
-		bool			connected;
-		time_t			last_connect_time;
+    bool      connected;
+    time_t      last_connect_time;
 
 #if ZM_MEM_MAPPED
-		int				map_fd;
-        char            mem_file[PATH_MAX];
+    int        map_fd;
+    char      mem_file[PATH_MAX];
 #else // ZM_MEM_MAPPED
-        int             shm_id;
+    int       shm_id;
 #endif // ZM_MEM_MAPPED
-		off_t	mem_size;
-		unsigned char	*mem_ptr;
+    off_t  mem_size;
+    unsigned char  *mem_ptr;
 
-		volatile SharedData	*shared_data;
-		volatile TriggerData	*trigger_data;
-        volatile VideoStoreData *video_store_data;
+    volatile SharedData  *shared_data;
+    volatile TriggerData  *trigger_data;
+    volatile VideoStoreData *video_store_data;
 
-		int				last_state;
-		int				last_event;
+    int        last_state;
+    int        last_event;
 
-	public:
-		MonitorLink( int p_id, const char *p_name );
-		~MonitorLink();
+  public:
+    MonitorLink( int p_id, const char *p_name );
+    ~MonitorLink();
 
-		inline int Id() const
-		{
-			return( id );
-		}
-		inline const char *Name() const
-		{
-			return( name );
-		}
+    inline int Id() const
+    {
+      return( id );
+    }
+    inline const char *Name() const
+    {
+      return( name );
+    }
 
-		inline bool isConnected() const
-		{   
-			return( connected );
-		}
-		inline time_t getLastConnectTime() const
-		{
-			return( last_connect_time );
-		}
+    inline bool isConnected() const
+    {   
+      return( connected );
+    }
+    inline time_t getLastConnectTime() const
+    {
+      return( last_connect_time );
+    }
 
-		bool connect();
-		bool disconnect();
+    bool connect();
+    bool disconnect();
 
-		bool isAlarmed();
-		bool inAlarm();
-		bool hasAlarmed();
-	};
+    bool isAlarmed();
+    bool inAlarm();
+    bool hasAlarmed();
+  };
 
 protected:
-	// These are read from the DB and thereafter remain unchanged
-	unsigned int	id;
-	char			name[64];
-	unsigned int	server_id;
-	Function		function;			    // What the monitor is doing
-	bool			enabled;			    // Whether the monitor is enabled or asleep
-	unsigned int    width;				    // Normally the same as the camera, but not if partly rotated
-	unsigned int    height;				    // Normally the same as the camera, but not if partly rotated
-	bool			v4l_multi_buffer;
-	unsigned int	v4l_captures_per_frame;
-	Orientation		orientation;		    // Whether the image has to be rotated at all
-	unsigned int	deinterlacing;
+  // These are read from the DB and thereafter remain unchanged
+  unsigned int  id;
+  char      name[64];
+  unsigned int  server_id;
+  Function    function;        // What the monitor is doing
+  bool      enabled;        // Whether the monitor is enabled or asleep
+  unsigned int  width;          // Normally the same as the camera, but not if partly rotated
+  unsigned int  height;          // Normally the same as the camera, but not if partly rotated
+  bool      v4l_multi_buffer;
+  unsigned int  v4l_captures_per_frame;
+  Orientation    orientation;      // Whether the image has to be rotated at all
+  unsigned int  deinterlacing;
 
-	int savejpegspref;
-	int videowriterpref;
-	std::string encoderparams;
-	std::vector<EncoderParameter_t> encoderparamsvec;
+  int savejpegspref;
+  int videowriterpref;
+  std::string encoderparams;
+  std::vector<EncoderParameter_t> encoderparamsvec;
+  bool      record_audio;     // Whether to store the audio that we receive
 
-	int				brightness;			    // The statically saved brightness of the camera
-	int				contrast;			    // The statically saved contrast of the camera
-	int				hue;				    // The statically saved hue of the camera
-	int				colour;				    // The statically saved colour of the camera
-	char			event_prefix[64];	    // The prefix applied to event names as they are created
-	char			label_format[64];	    // The format of the timestamp on the images
-	Coord			label_coord;		    // The coordinates of the timestamp on the images
-	int			label_size;                 // Size of the timestamp on the images
-	int				image_buffer_count;     // Size of circular image buffer, at least twice the size of the pre_event_count
-	int				pre_event_buffer_count;     // Size of dedicated circular pre event buffer used when analysis is not performed at capturing framerate,
-                                                                    // value is pre_event_count + alarm_frame_count - 1
-	int				warmup_count;		    // How many images to process before looking for events
-	int				pre_event_count;	    // How many images to hold and prepend to an alarm event
-	int				post_event_count;	    // How many unalarmed images must occur before the alarm state is reset
-	int				stream_replay_buffer;   // How many frames to store to support DVR functions, IGNORED from this object, passed directly into zms now
-	int				section_length;		    // How long events should last in continuous modes
-	bool				adaptive_skip;              // Whether to use the newer adaptive algorithm for this monitor
-	int				frame_skip;			    // How many frames to skip in continuous modes
-	int				motion_frame_skip;		    // How many frames to skip in motion detection
-	double				analysis_fps;    // Target framerate for video analysis
-	unsigned int			analysis_update_delay;    //  How long we wait before updating analysis parameters
-	int				capture_delay;		    // How long we wait between capture frames
-	int				alarm_capture_delay;    // How long we wait between capture frames when in alarm state
-	int				alarm_frame_count;	    // How many alarm frames are required before an event is triggered
-	int				fps_report_interval;    // How many images should be captured/processed between reporting the current FPS
-	int				ref_blend_perc;		    // Percentage of new image going into reference image.
-	int				alarm_ref_blend_perc;		    // Percentage of new image going into reference image during alarm.
-	bool			track_motion;		    // Whether this monitor tries to track detected motion 
-    Rgb             signal_check_colour;    // The colour that the camera will emit when no video signal detected
-        bool                            embed_exif; // Whether to embed Exif data into each image frame or not
+  int        brightness;        // The statically saved brightness of the camera
+  int        contrast;        // The statically saved contrast of the camera
+  int        hue;          // The statically saved hue of the camera
+  int        colour;          // The statically saved colour of the camera
+  char      event_prefix[64];    // The prefix applied to event names as they are created
+  char      label_format[64];    // The format of the timestamp on the images
+  Coord      label_coord;      // The coordinates of the timestamp on the images
+  int      label_size;         // Size of the timestamp on the images
+  int        image_buffer_count;   // Size of circular image buffer, at least twice the size of the pre_event_count
+  int        pre_event_buffer_count;   // Size of dedicated circular pre event buffer used when analysis is not performed at capturing framerate,
+                                  // value is pre_event_count + alarm_frame_count - 1
+  int        warmup_count;      // How many images to process before looking for events
+  int        pre_event_count;    // How many images to hold and prepend to an alarm event
+  int        post_event_count;    // How many unalarmed images must occur before the alarm state is reset
+  int        stream_replay_buffer;   // How many frames to store to support DVR functions, IGNORED from this object, passed directly into zms now
+  int        section_length;      // How long events should last in continuous modes
+  bool        adaptive_skip;        // Whether to use the newer adaptive algorithm for this monitor
+  int        frame_skip;        // How many frames to skip in continuous modes
+  int        motion_frame_skip;      // How many frames to skip in motion detection
+  double        analysis_fps;  // Target framerate for video analysis
+  unsigned int      analysis_update_delay;  //  How long we wait before updating analysis parameters
+  int        capture_delay;      // How long we wait between capture frames
+  int        alarm_capture_delay;  // How long we wait between capture frames when in alarm state
+  int        alarm_frame_count;    // How many alarm frames are required before an event is triggered
+  int        fps_report_interval;  // How many images should be captured/processed between reporting the current FPS
+  int        ref_blend_perc;      // Percentage of new image going into reference image.
+  int        alarm_ref_blend_perc;      // Percentage of new image going into reference image during alarm.
+  bool      track_motion;      // Whether this monitor tries to track detected motion 
+  Rgb       signal_check_colour;  // The colour that the camera will emit when no video signal detected
+    bool              embed_exif; // Whether to embed Exif data into each image frame or not
 
-	double			fps;
-	Image			delta_image;
-	Image			ref_image;
-    Image           alarm_image;    // Used in creating analysis images, will be initialized in Analysis
-    Image           write_image;        // Used when creating snapshot images
+  double      fps;
+  Image      delta_image;
+  Image      ref_image;
+  Image       alarm_image;  // Used in creating analysis images, will be initialized in Analysis
+  Image       write_image;    // Used when creating snapshot images
 
-	Purpose			purpose;			    // What this monitor has been created to do
-	int				event_count;
-	int				image_count;
-	int				ready_count;
-	int				first_alarm_count;
-	int				last_alarm_count;
-	int				buffer_count;
-	int				prealarm_count;
-	State			state;
-	time_t			start_time;
-	time_t			last_fps_time;
-	time_t			auto_resume_time;
-        unsigned int            last_motion_score;
+  Purpose      purpose;        // What this monitor has been created to do
+  int        event_count;
+  int        image_count;
+  int        ready_count;
+  int        first_alarm_count;
+  int        last_alarm_count;
+  int        buffer_count;
+  int        prealarm_count;
+  State      state;
+  time_t      start_time;
+  time_t      last_fps_time;
+  time_t      auto_resume_time;
+    unsigned int      last_motion_score;
 
-    EventCloseMode  event_close_mode;
+  EventCloseMode  event_close_mode;
 
 #if ZM_MEM_MAPPED
-	int				map_fd;
-    char            mem_file[PATH_MAX];
+  int        map_fd;
+  char      mem_file[PATH_MAX];
 #else // ZM_MEM_MAPPED
-    int             shm_id;
+  int       shm_id;
 #endif // ZM_MEM_MAPPED
-	off_t				mem_size;
-	unsigned char	*mem_ptr;
+  off_t        mem_size;
+  unsigned char  *mem_ptr;
 
-	SharedData		*shared_data;
-	TriggerData		*trigger_data;
-    VideoStoreData  *video_store_data;
+  SharedData    *shared_data;
+  TriggerData    *trigger_data;
+  VideoStoreData  *video_store_data;
 
-	Snapshot		*image_buffer;
-	Snapshot		next_buffer; /* Used by four field deinterlacing */
-	Snapshot		*pre_event_buffer;
+  Snapshot    *image_buffer;
+  Snapshot    next_buffer; /* Used by four field deinterlacing */
+  Snapshot    *pre_event_buffer;
 
-	Camera			*camera;
+  Camera      *camera;
 
-	Event			*event;
+  Event      *event;
 
-	int			n_zones;
-	Zone			**zones;
+  int      n_zones;
+  Zone      **zones;
 
-	struct timeval		**timestamps;
-	Image			**images;
+  struct timeval    **timestamps;
+  Image      **images;
 
-	const unsigned char	*privacy_bitmask;
+  const unsigned char  *privacy_bitmask;
 
-
-	int			iDoNativeMotDet;
-
-	int			n_linked_monitors;
-	MonitorLink		**linked_monitors;
+  int      n_linked_monitors;
+  MonitorLink    **linked_monitors;
 
 public:
 // OurCheckAlarms seems to be unused. Check it on zm_monitor.cpp for more info.
 //bool OurCheckAlarms( Zone *zone, const Image *pImage );
-	Monitor( int p_id, const char *p_name, unsigned int p_server_id, int p_function, bool p_enabled, const char *p_linked_monitors, Camera *p_camera, int p_orientation, unsigned int p_deinterlacing, int p_savejpegs, int p_videowriter, std::string p_encoderparams, const char *p_event_prefix, const char *p_label_format, const Coord &p_label_coord, int label_size, int p_image_buffer_count, int p_warmup_count, int p_pre_event_count, int p_post_event_count, int p_stream_replay_buffer, int p_alarm_frame_count, int p_section_length, int p_frame_skip, int p_motion_frame_skip, double p_analysis_fps, unsigned int p_analysis_update_delay, int p_capture_delay, int p_alarm_capture_delay, int p_fps_report_interval, int p_ref_blend_perc, int p_alarm_ref_blend_perc, bool p_track_motion, Rgb p_signal_check_colour, bool p_embed_exif, Purpose p_purpose, int p_n_zones=0, Zone *p_zones[]=0 );
-	~Monitor();
+  Monitor(
+    int p_id,
+    const char *p_name,
+    unsigned int p_server_id,
+    int p_function,
+    bool p_enabled,
+    const char *p_linked_monitors,
+    Camera *p_camera,
+    int p_orientation,
+    unsigned int p_deinterlacing,
+    int p_savejpegs,
+    int p_videowriter,
+    std::string p_encoderparams,
+    bool	p_record_audio,
+    const char *p_event_prefix,
+    const char *p_label_format,
+    const Coord &p_label_coord,
+    int label_size,
+    int p_image_buffer_count,
+    int p_warmup_count,
+    int p_pre_event_count,
+    int p_post_event_count,
+    int p_stream_replay_buffer,
+    int p_alarm_frame_count,
+    int p_section_length,
+    int p_frame_skip,
+    int p_motion_frame_skip,
+    double p_analysis_fps,
+    unsigned int p_analysis_update_delay,
+    int p_capture_delay,
+    int p_alarm_capture_delay,
+    int p_fps_report_interval,
+    int p_ref_blend_perc,
+    int p_alarm_ref_blend_perc,
+    bool p_track_motion,
+    Rgb p_signal_check_colour,
+    bool p_embed_exif,
+    Purpose p_purpose,
+    int p_n_zones=0,
+    Zone *p_zones[]=0
+  );
+  ~Monitor();
 
-	void AddZones( int p_n_zones, Zone *p_zones[] );
-	void AddPrivacyBitmask( Zone *p_zones[] );
+  void AddZones( int p_n_zones, Zone *p_zones[] );
+  void AddPrivacyBitmask( Zone *p_zones[] );
 
-	bool connect();
-	inline int ShmValid() const
-	{
-		return( shared_data->valid );
-	}
+  bool connect();
+  inline int ShmValid() const
+  {
+    return( shared_data->valid );
+  }
 
-	inline int Id() const
-	{
-		return( id );
-	}
-	inline const char *Name() const
-	{
-		return( name );
-	}
-	inline Function GetFunction() const
-	{
-		return( function );
-	}
-	inline bool Enabled()
-	{
-		if ( function <= MONITOR )
-			return( false );
-		return( enabled );
-	}
-	inline const char *EventPrefix() const
-	{
-		return( event_prefix );
-	}
-	inline bool Ready()
-	{
-		if ( function <= MONITOR )
-			return( false );
-		return( image_count > ready_count );
-	}
-	inline bool Active()
-	{
-		if ( function <= MONITOR )
-			return( false );
-		return( enabled && shared_data->active );
-	}
-	inline bool Exif()
-	{
-		return( embed_exif );
-	}
+  inline int Id() const
+  {
+    return( id );
+  }
+  inline const char *Name() const
+  {
+    return( name );
+  }
+  inline Function GetFunction() const
+  {
+    return( function );
+  }
+  inline bool Enabled()
+  {
+    if ( function <= MONITOR )
+      return( false );
+    return( enabled );
+  }
+  inline const char *EventPrefix() const
+  {
+    return( event_prefix );
+  }
+  inline bool Ready()
+  {
+    if ( function <= MONITOR )
+      return( false );
+    return( image_count > ready_count );
+  }
+  inline bool Active()
+  {
+    if ( function <= MONITOR )
+      return( false );
+    return( enabled && shared_data->active );
+  }
+  inline bool Exif()
+  {
+    return( embed_exif );
+  }
 
-	unsigned int Width() const { return( width ); }
-	unsigned int Height() const { return( height ); }
-	unsigned int Colours() const { return( camera->Colours() ); }
-	unsigned int SubpixelOrder() const { return( camera->SubpixelOrder() ); }
-
-	int GetOptSaveJPEGs() const { return( savejpegspref ); }
-	int GetOptVideoWriter() const { return( videowriterpref ); }
-	const std::vector<EncoderParameter_t>* GetOptEncoderParams() const { return( &encoderparamsvec ); }      
+  unsigned int Width() const { return( width ); }
+  unsigned int Height() const { return( height ); }
+  unsigned int Colours() const { return( camera->Colours() ); }
+  unsigned int SubpixelOrder() const { return( camera->SubpixelOrder() ); }
+    
+  int GetOptSaveJPEGs() const { return( savejpegspref ); }
+  int GetOptVideoWriter() const { return( videowriterpref ); }
+  const std::vector<EncoderParameter_t>* GetOptEncoderParams() const { return( &encoderparamsvec ); }	  
  
-	State GetState() const;
-	int GetImage( int index=-1, int scale=100 );
-	struct timeval GetTimestamp( int index=-1 ) const;
-	void UpdateAdaptiveSkip();
-	useconds_t GetAnalysisRate();
-	unsigned int GetAnalysisUpdateDelay() const { return( analysis_update_delay ); }
-	int GetCaptureDelay() const { return( capture_delay ); }
-	int GetAlarmCaptureDelay() const { return( alarm_capture_delay ); }
-	unsigned int GetLastReadIndex() const;
-	unsigned int GetLastWriteIndex() const;
-	unsigned int GetLastEvent() const;
-	double GetFPS() const;
-	void ForceAlarmOn( int force_score, const char *force_case, const char *force_text="" );
-	void ForceAlarmOff();
-	void CancelForced();
-	TriggerState GetTriggerState() const { return( (TriggerState)(trigger_data?trigger_data->trigger_state:TRIGGER_CANCEL )); }
+  State GetState() const;
+  int GetImage( int index=-1, int scale=100 );
+  struct timeval GetTimestamp( int index=-1 ) const;
+  void UpdateAdaptiveSkip();
+  useconds_t GetAnalysisRate();
+  unsigned int GetAnalysisUpdateDelay() const { return( analysis_update_delay ); }
+  int GetCaptureDelay() const { return( capture_delay ); }
+  int GetAlarmCaptureDelay() const { return( alarm_capture_delay ); }
+  unsigned int GetLastReadIndex() const;
+  unsigned int GetLastWriteIndex() const;
+  unsigned int GetLastEvent() const;
+  double GetFPS() const;
+  void ForceAlarmOn( int force_score, const char *force_case, const char *force_text="" );
+  void ForceAlarmOff();
+  void CancelForced();
+  TriggerState GetTriggerState() const { return( (TriggerState)(trigger_data?trigger_data->trigger_state:TRIGGER_CANCEL )); }
 
-	void actionReload();
-	void actionEnable();
-	void actionDisable();
-	void actionSuspend();
-	void actionResume();
+  void actionReload();
+  void actionEnable();
+  void actionDisable();
+  void actionSuspend();
+  void actionResume();
 
-	int actionBrightness( int p_brightness=-1 );
-	int actionHue( int p_hue=-1 );
-	int actionColour( int p_colour=-1 );
-	int actionContrast( int p_contrast=-1 );
+  int actionBrightness( int p_brightness=-1 );
+  int actionHue( int p_hue=-1 );
+  int actionColour( int p_colour=-1 );
+  int actionContrast( int p_contrast=-1 );
 
-	inline int PrimeCapture()
-	{
-		return( camera->PrimeCapture() );
-	}
-	inline int PreCapture()
-	{
-		return( camera->PreCapture() );
-	}
-	int Capture();
-	int PostCapture()
-	{
-		return( camera->PostCapture() );
-	}
+  inline int PrimeCapture()
+  {
+    return( camera->PrimeCapture() );
+  }
+  inline int PreCapture()
+  {
+    return( camera->PreCapture() );
+  }
+  int Capture();
+  int PostCapture()
+  {
+    return( camera->PostCapture() );
+  }
 
-	unsigned int DetectMotion( const Image &comp_image, Event::StringSet &zoneSet );
+  unsigned int DetectMotion( const Image &comp_image, Event::StringSet &zoneSet );
    // DetectBlack seems to be unused. Check it on zm_monitor.cpp for more info.
    //unsigned int DetectBlack( const Image &comp_image, Event::StringSet &zoneSet );
-	bool CheckSignal( const Image *image );
-	bool Analyse();
-	void DumpImage( Image *dump_image ) const;
-	void TimestampImage( Image *ts_image, const struct timeval *ts_time ) const;
-	bool closeEvent();
+  bool CheckSignal( const Image *image );
+  bool Analyse();
+  void DumpImage( Image *dump_image ) const;
+  void TimestampImage( Image *ts_image, const struct timeval *ts_time ) const;
+  bool closeEvent();
 
-	void Reload();
-	void ReloadZones();
-	void ReloadLinkedMonitors( const char * );
+  void Reload();
+  void ReloadZones();
+  void ReloadLinkedMonitors( const char * );
 
-	bool DumpSettings( char *output, bool verbose );
-	void DumpZoneImage( const char *zone_string=0 );
+  bool DumpSettings( char *output, bool verbose );
+  void DumpZoneImage( const char *zone_string=0 );
 
 #if ZM_HAS_V4L
-	static int LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose );
+  static int LoadLocalMonitors( const char *device, Monitor **&monitors, Purpose purpose );
 #endif // ZM_HAS_V4L
-	static int LoadRemoteMonitors( const char *protocol, const char *host, const char*port, const char*path, Monitor **&monitors, Purpose purpose );
-	static int LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose );
+  static int LoadRemoteMonitors( const char *protocol, const char *host, const char*port, const char*path, Monitor **&monitors, Purpose purpose );
+  static int LoadFileMonitors( const char *file, Monitor **&monitors, Purpose purpose );
 #if HAVE_LIBAVFORMAT
-	static int LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose );
+  static int LoadFfmpegMonitors( const char *file, Monitor **&monitors, Purpose purpose );
 #endif // HAVE_LIBAVFORMAT
-	static Monitor *Load( unsigned int id, bool load_zones, Purpose purpose );
-    //void writeStreamImage( Image *image, struct timeval *timestamp, int scale, int mag, int x, int y );
-	//void StreamImages( int scale=100, int maxfps=10, time_t ttl=0, int msq_id=0 );
-	//void StreamImagesRaw( int scale=100, int maxfps=10, time_t ttl=0 );
-	//void StreamImagesZip( int scale=100, int maxfps=10, time_t ttl=0 );
-	void SingleImage( int scale=100 );
-	void SingleImageRaw( int scale=100 );
-	void SingleImageZip( int scale=100 );
+  static Monitor *Load( unsigned int id, bool load_zones, Purpose purpose );
+  //void writeStreamImage( Image *image, struct timeval *timestamp, int scale, int mag, int x, int y );
+  //void StreamImages( int scale=100, int maxfps=10, time_t ttl=0, int msq_id=0 );
+  //void StreamImagesRaw( int scale=100, int maxfps=10, time_t ttl=0 );
+  //void StreamImagesZip( int scale=100, int maxfps=10, time_t ttl=0 );
+  void SingleImage( int scale=100 );
+  void SingleImageRaw( int scale=100 );
+  void SingleImageZip( int scale=100 );
 #if HAVE_LIBAVCODEC
-	//void StreamMpeg( const char *format, int scale=100, int maxfps=10, int bitrate=100000 );
+  //void StreamMpeg( const char *format, int scale=100, int maxfps=10, int bitrate=100000 );
 #endif // HAVE_LIBAVCODEC
 };
 
@@ -476,51 +513,51 @@ public:
 class MonitorStream : public StreamBase
 {
 protected:
-    typedef struct SwapImage {
-        bool            valid;
-        struct timeval  timestamp;
-        char            file_name[PATH_MAX];
-    } SwapImage;
+  typedef struct SwapImage {
+    bool      valid;
+    struct timeval  timestamp;
+    char      file_name[PATH_MAX];
+  } SwapImage;
 
 private:
-    SwapImage *temp_image_buffer;
-    int temp_image_buffer_count;
-    int temp_read_index;
-    int temp_write_index;
+  SwapImage *temp_image_buffer;
+  int temp_image_buffer_count;
+  int temp_read_index;
+  int temp_write_index;
 
 protected:
-    time_t ttl;
+  time_t ttl;
 
 protected:
-    int playback_buffer;
-    bool delayed;
+  int playback_buffer;
+  bool delayed;
 
-    int frame_count;
+  int frame_count;
 
 protected:
-    bool checkSwapPath( const char *path, bool create_path );
+  bool checkSwapPath( const char *path, bool create_path );
 
-    bool sendFrame( const char *filepath, struct timeval *timestamp );
-    bool sendFrame( Image *image, struct timeval *timestamp );
-    void processCommand( const CmdMsg *msg );
+  bool sendFrame( const char *filepath, struct timeval *timestamp );
+  bool sendFrame( Image *image, struct timeval *timestamp );
+  void processCommand( const CmdMsg *msg );
 
 public:
-    MonitorStream() : playback_buffer( 0 ), delayed( false ), frame_count( 0 )
-    {
-    }
-    void setStreamBuffer( int p_playback_buffer )
-    {
-        playback_buffer = p_playback_buffer;
-    }
-    void setStreamTTL( time_t p_ttl )
-    {
-        ttl = p_ttl;
-    }
-    bool setStreamStart( int monitor_id )
-    {
-        return loadMonitor( monitor_id );
-    }
-	void runStream();
+  MonitorStream() : playback_buffer( 0 ), delayed( false ), frame_count( 0 )
+  {
+  }
+  void setStreamBuffer( int p_playback_buffer )
+  {
+    playback_buffer = p_playback_buffer;
+  }
+  void setStreamTTL( time_t p_ttl )
+  {
+    ttl = p_ttl;
+  }
+  bool setStreamStart( int monitor_id )
+  {
+    return loadMonitor( monitor_id );
+  }
+  void runStream();
 };
 
 #endif // ZM_MONITOR_H
diff --git a/src/zm_mpeg.cpp b/src/zm_mpeg.cpp
index 01f9006b8..69ca89379 100644
--- a/src/zm_mpeg.cpp
+++ b/src/zm_mpeg.cpp
@@ -34,242 +34,242 @@ extern "C"
 bool VideoStream::initialised = false;
 
 VideoStream::MimeData VideoStream::mime_data[] = {
-	{ "asf", "video/x-ms-asf" },
-	{ "swf", "application/x-shockwave-flash" },
-	{ "flv", "video/x-flv" },
-	{ "mov", "video/quicktime" }
+  { "asf", "video/x-ms-asf" },
+  { "swf", "application/x-shockwave-flash" },
+  { "flv", "video/x-flv" },
+  { "mov", "video/quicktime" }
 };
 
 void VideoStream::Initialise( )
 {
-	if ( logDebugging() )
-        av_log_set_level( AV_LOG_DEBUG );
-    else
-        av_log_set_level( AV_LOG_QUIET );
+  if ( logDebugging() )
+    av_log_set_level( AV_LOG_DEBUG );
+  else
+    av_log_set_level( AV_LOG_QUIET );
 
-	av_register_all( );
+  av_register_all( );
 #if LIBAVFORMAT_VERSION_CHECK(53, 13, 0, 19, 0)
-	avformat_network_init();
+  avformat_network_init();
 #endif
-	initialised = true;
+  initialised = true;
 }
 
 void VideoStream::SetupFormat( )
 {
-	/* allocate the output media context */
-	ofc = NULL;
+  /* allocate the output media context */
+  ofc = NULL;
 #if (LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 2, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-	avformat_alloc_output_context2( &ofc, NULL, format, filename );
+  avformat_alloc_output_context2( &ofc, NULL, format, filename );
 #else
-	AVFormatContext *s= avformat_alloc_context();
-	if(!s)
-	{
-		Fatal( "avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc) );
-	}
+  AVFormatContext *s= avformat_alloc_context();
+  if(!s)
+  {
+    Fatal( "avformat_alloc_context failed %d \"%s\"", (size_t)ofc, av_err2str((size_t)ofc) );
+  }
 
-	AVOutputFormat *oformat;
-	if (format) {
+  AVOutputFormat *oformat;
+  if (format) {
 #if LIBAVFORMAT_VERSION_CHECK(52, 45, 0, 45, 0)
-		oformat = av_guess_format(format, NULL, NULL);
+    oformat = av_guess_format(format, NULL, NULL);
 #else
-		oformat = guess_format(format, NULL, NULL);
+    oformat = guess_format(format, NULL, NULL);
 #endif
-		if (!oformat) {
-			Fatal( "Requested output format '%s' is not a suitable output format", format );
-		}
-	} else {
+    if (!oformat) {
+      Fatal( "Requested output format '%s' is not a suitable output format", format );
+    }
+  } else {
 #if LIBAVFORMAT_VERSION_CHECK(52, 45, 0, 45, 0)
-		oformat = av_guess_format(NULL, filename, NULL);
+    oformat = av_guess_format(NULL, filename, NULL);
 #else
-		oformat = guess_format(NULL, filename, NULL);
+    oformat = guess_format(NULL, filename, NULL);
 #endif
-		if (!oformat) {
-			Fatal( "Unable to find a suitable output format for '%s'", format );
-		}
-	}
-	s->oformat = oformat;
-	
-	if (s->oformat->priv_data_size > 0) {
-		s->priv_data = av_mallocz(s->oformat->priv_data_size);
-		if (!s->priv_data)
-		{
-			Fatal( "Could not allocate private data for output format." );
-		}
+    if (!oformat) {
+      Fatal( "Unable to find a suitable output format for '%s'", format );
+    }
+  }
+  s->oformat = oformat;
+  
+  if (s->oformat->priv_data_size > 0) {
+    s->priv_data = av_mallocz(s->oformat->priv_data_size);
+    if (!s->priv_data)
+    {
+      Fatal( "Could not allocate private data for output format." );
+    }
 #if LIBAVFORMAT_VERSION_CHECK(52, 92, 0, 92, 0)
-		if (s->oformat->priv_class) {
-			*(const AVClass**)s->priv_data = s->oformat->priv_class;
-			av_opt_set_defaults(s->priv_data);
-		}
+    if (s->oformat->priv_class) {
+      *(const AVClass**)s->priv_data = s->oformat->priv_class;
+      av_opt_set_defaults(s->priv_data);
+    }
 #endif
-	} 
-	else
-	{
-		s->priv_data = NULL;
-	}
-	
-	if(filename)
-	{
-		snprintf( s->filename, sizeof(s->filename), "%s", filename );
-	}
-	
-	ofc = s;
+  } 
+  else
+  {
+    s->priv_data = NULL;
+  }
+  
+  if(filename)
+  {
+    snprintf( s->filename, sizeof(s->filename), "%s", filename );
+  }
+  
+  ofc = s;
 #endif
-	if ( !ofc )
-	{
-		Fatal( "avformat_alloc_..._context failed: %d", ofc );
-	}
+  if ( !ofc )
+  {
+    Fatal( "avformat_alloc_..._context failed: %d", ofc );
+  }
 
-	of = ofc->oformat;
-	Debug( 1, "Using output format: %s (%s)", of->name, of->long_name );
+  of = ofc->oformat;
+  Debug( 1, "Using output format: %s (%s)", of->name, of->long_name );
 }
 
 void VideoStream::SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate )
 {
-	/* ffmpeg format matching */
-	switch(colours) {
-	  case ZM_COLOUR_RGB24:
-	  {
-	    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
-	      /* BGR subpixel order */
-	      pf = AV_PIX_FMT_BGR24;
-	    } else {
-	      /* Assume RGB subpixel order */
-	      pf = AV_PIX_FMT_RGB24;
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_RGB32:
-	  {
-	    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
-	      /* ARGB subpixel order */
-	      pf = AV_PIX_FMT_ARGB;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
-	      /* ABGR subpixel order */
-	      pf = AV_PIX_FMT_ABGR;
-	    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
-	      /* BGRA subpixel order */
-	      pf = AV_PIX_FMT_BGRA;
-	    } else {
-	      /* Assume RGBA subpixel order */
-	      pf = AV_PIX_FMT_RGBA;
-	    }
-	    break;
-	  }
-	  case ZM_COLOUR_GRAY8:
-	    pf = AV_PIX_FMT_GRAY8;
-	    break;
-	  default:
-	    Panic("Unexpected colours: %d",colours);
-	    break;
-	}
+  /* ffmpeg format matching */
+  switch(colours) {
+    case ZM_COLOUR_RGB24:
+    {
+    if(subpixelorder == ZM_SUBPIX_ORDER_BGR) {
+      /* BGR subpixel order */
+      pf = AV_PIX_FMT_BGR24;
+    } else {
+      /* Assume RGB subpixel order */
+      pf = AV_PIX_FMT_RGB24;
+    }
+    break;
+    }
+    case ZM_COLOUR_RGB32:
+    {
+    if(subpixelorder == ZM_SUBPIX_ORDER_ARGB) {
+      /* ARGB subpixel order */
+      pf = AV_PIX_FMT_ARGB;
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_ABGR) {
+      /* ABGR subpixel order */
+      pf = AV_PIX_FMT_ABGR;
+    } else if(subpixelorder == ZM_SUBPIX_ORDER_BGRA) {
+      /* BGRA subpixel order */
+      pf = AV_PIX_FMT_BGRA;
+    } else {
+      /* Assume RGBA subpixel order */
+      pf = AV_PIX_FMT_RGBA;
+    }
+    break;
+    }
+    case ZM_COLOUR_GRAY8:
+    pf = AV_PIX_FMT_GRAY8;
+    break;
+    default:
+    Panic("Unexpected colours: %d",colours);
+    break;
+  }
 
-	if ( strcmp( "rtp", of->name ) == 0 )
-	{
-		// RTP must have a packet_size.
-		// Not sure what this value should be really...
-		ofc->packet_size = width*height;
-		
-		if ( of->video_codec ==  AV_CODEC_ID_NONE)
-		{
-			// RTP does not have a default codec in ffmpeg <= 0.8.
-			of->video_codec = AV_CODEC_ID_MPEG4;
-		}
-	}
-	
-	_AVCODECID codec_id = of->video_codec;
-	if ( codec_name )
-	{
-            AVCodec *a = avcodec_find_encoder_by_name(codec_name);
-            if ( a )
-            {
-                codec_id = a->id;
-            }
-            else
-            {
+  if ( strcmp( "rtp", of->name ) == 0 )
+  {
+    // RTP must have a packet_size.
+    // Not sure what this value should be really...
+    ofc->packet_size = width*height;
+    
+    if ( of->video_codec ==  AV_CODEC_ID_NONE)
+    {
+      // RTP does not have a default codec in ffmpeg <= 0.8.
+      of->video_codec = AV_CODEC_ID_MPEG4;
+    }
+  }
+  
+  _AVCODECID codec_id = of->video_codec;
+  if ( codec_name )
+  {
+      AVCodec *a = avcodec_find_encoder_by_name(codec_name);
+      if ( a )
+      {
+        codec_id = a->id;
+      }
+      else
+      {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-                    Debug( 1, "Could not find codec \"%s\". Using default \"%s\"", codec_name, avcodec_get_name( codec_id ) );
+          Debug( 1, "Could not find codec \"%s\". Using default \"%s\"", codec_name, avcodec_get_name( codec_id ) );
 #else
-                    Debug( 1, "Could not find codec \"%s\". Using default \"%d\"", codec_name, codec_id );
+          Debug( 1, "Could not find codec \"%s\". Using default \"%d\"", codec_name, codec_id );
 #endif
-            }
-	}
+      }
+  }
 
-	/* add the video streams using the default format codecs
-	   and initialize the codecs */
-	ost = NULL;
-	if ( codec_id != AV_CODEC_ID_NONE )
-	{
-		codec = avcodec_find_encoder( codec_id );
-		if ( !codec )
-		{
+  /* add the video streams using the default format codecs
+     and initialize the codecs */
+  ost = NULL;
+  if ( codec_id != AV_CODEC_ID_NONE )
+  {
+    codec = avcodec_find_encoder( codec_id );
+    if ( !codec )
+    {
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-			Fatal( "Could not find encoder for '%s'", avcodec_get_name( codec_id ) );
+      Fatal( "Could not find encoder for '%s'", avcodec_get_name( codec_id ) );
 #else
-			Fatal( "Could not find encoder for '%d'", codec_id );
+      Fatal( "Could not find encoder for '%d'", codec_id );
 #endif
-		}
+    }
 
 #if (LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 11, 0) && (LIBAVFORMAT_VERSION_MICRO >= 100))
-		Debug( 1, "Found encoder for '%s'", avcodec_get_name( codec_id ) );
+    Debug( 1, "Found encoder for '%s'", avcodec_get_name( codec_id ) );
 #else
-		Debug( 1, "Found encoder for '%d'", codec_id );
+    Debug( 1, "Found encoder for '%d'", codec_id );
 #endif
 
 #if LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
-		ost = avformat_new_stream( ofc, codec );
+    ost = avformat_new_stream( ofc, codec );
 #else
-		ost = av_new_stream( ofc, 0 );
+    ost = av_new_stream( ofc, 0 );
 #endif
-		
-		if ( !ost )
-		{
-			Fatal( "Could not alloc stream" );
-		}
-		ost->id = ofc->nb_streams - 1;
+    
+    if ( !ost )
+    {
+      Fatal( "Could not alloc stream" );
+    }
+    ost->id = ofc->nb_streams - 1;
 
-		Debug( 1, "Allocated stream" );
+    Debug( 1, "Allocated stream" );
 
-		AVCodecContext *c = ost->codec;
+    AVCodecContext *c = ost->codec;
 
-		c->codec_id = codec->id;
-		c->codec_type = codec->type;
+    c->codec_id = codec->id;
+    c->codec_type = codec->type;
 
-		c->pix_fmt = strcmp( "mjpeg", ofc->oformat->name ) == 0 ? AV_PIX_FMT_YUVJ422P : AV_PIX_FMT_YUV420P;
-		if ( bitrate <= 100 )
-		{
-			// Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
-			// This gets rid of artifacts in the beginning of the movie; and well, even quality.
-			c->flags |= CODEC_FLAG_QSCALE;
-			c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
-		}
-		else
-		{
-			c->bit_rate = bitrate;
-		}
+    c->pix_fmt = strcmp( "mjpeg", ofc->oformat->name ) == 0 ? AV_PIX_FMT_YUVJ422P : AV_PIX_FMT_YUV420P;
+    if ( bitrate <= 100 )
+    {
+      // Quality based bitrate control (VBR). Scale is 1..31 where 1 is best.
+      // This gets rid of artifacts in the beginning of the movie; and well, even quality.
+      c->flags |= CODEC_FLAG_QSCALE;
+      c->global_quality = FF_QP2LAMBDA * (31 - (31 * (bitrate / 100.0)));
+    }
+    else
+    {
+      c->bit_rate = bitrate;
+    }
 
-		/* resolution must be a multiple of two */
-		c->width = width;
-		c->height = height;
-		/* time base: this is the fundamental unit of time (in seconds) in terms
-		   of which frame timestamps are represented. for fixed-fps content,
-		   timebase should be 1/framerate and timestamp increments should be
-		   identically 1. */
-		c->time_base.den = frame_rate;
-		c->time_base.num = 1;
-		
-		Debug( 1, "Will encode in %d fps.", c->time_base.den );
-		
-		/* emit one intra frame every second */
-		c->gop_size = frame_rate;
+    /* resolution must be a multiple of two */
+    c->width = width;
+    c->height = height;
+    /* time base: this is the fundamental unit of time (in seconds) in terms
+       of which frame timestamps are represented. for fixed-fps content,
+       timebase should be 1/framerate and timestamp increments should be
+       identically 1. */
+    c->time_base.den = frame_rate;
+    c->time_base.num = 1;
+    
+    Debug( 1, "Will encode in %d fps.", c->time_base.den );
+    
+    /* emit one intra frame every second */
+    c->gop_size = frame_rate;
 
-		// some formats want stream headers to be separate
-		if ( of->flags & AVFMT_GLOBALHEADER )
-			c->flags |= CODEC_FLAG_GLOBAL_HEADER;
-	}
-	else
-	{
-		Fatal( "of->video_codec == AV_CODEC_ID_NONE" );
-	}
+    // some formats want stream headers to be separate
+    if ( of->flags & AVFMT_GLOBALHEADER )
+      c->flags |= CODEC_FLAG_GLOBAL_HEADER;
+  }
+  else
+  {
+    Fatal( "of->video_codec == AV_CODEC_ID_NONE" );
+  }
 }
 
 void VideoStream::SetParameters( )
@@ -278,512 +278,512 @@ void VideoStream::SetParameters( )
 
 const char *VideoStream::MimeType( ) const
 {
-	for ( unsigned int i = 0; i < sizeof (mime_data) / sizeof (*mime_data); i++ )
-	{
-		if ( strcmp( format, mime_data[i].format ) == 0 )
-		{
-			Debug( 1, "MimeType is \"%s\"", mime_data[i].mime_type );
-			return ( mime_data[i].mime_type);
-		}
-	}
-	const char *mime_type = of->mime_type;
-	if ( !mime_type )
-	{
-		std::string mime = "video/";
-		mime = mime.append( format );
-		mime_type = mime.c_str( );
-		Warning( "Unable to determine mime type for '%s' format, using '%s' as default", format, mime_type );
-	}
+  for ( unsigned int i = 0; i < sizeof (mime_data) / sizeof (*mime_data); i++ )
+  {
+    if ( strcmp( format, mime_data[i].format ) == 0 )
+    {
+      Debug( 1, "MimeType is \"%s\"", mime_data[i].mime_type );
+      return ( mime_data[i].mime_type);
+    }
+  }
+  const char *mime_type = of->mime_type;
+  if ( !mime_type )
+  {
+    std::string mime = "video/";
+    mime = mime.append( format );
+    mime_type = mime.c_str( );
+    Warning( "Unable to determine mime type for '%s' format, using '%s' as default", format, mime_type );
+  }
 
-	Debug( 1, "MimeType is \"%s\"", mime_type );
+  Debug( 1, "MimeType is \"%s\"", mime_type );
 
-	return ( mime_type);
+  return ( mime_type);
 }
 
 void VideoStream::OpenStream( )
 {
-	int avRet;
+  int avRet;
 
-	/* now that all the parameters are set, we can open the 
-	   video codecs and allocate the necessary encode buffers */
-	if ( ost )
-	{
-		AVCodecContext *c = ost->codec;
-		
-		/* open the codec */
+  /* now that all the parameters are set, we can open the 
+     video codecs and allocate the necessary encode buffers */
+  if ( ost )
+  {
+    AVCodecContext *c = ost->codec;
+    
+    /* open the codec */
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-		if ( (avRet = avcodec_open( c, codec )) < 0 )
+    if ( (avRet = avcodec_open( c, codec )) < 0 )
 #else
-		if ( (avRet = avcodec_open2( c, codec, 0 )) < 0 )
+    if ( (avRet = avcodec_open2( c, codec, 0 )) < 0 )
 #endif
-		{
-			Fatal( "Could not open codec. Error code %d \"%s\"", avRet, av_err2str( avRet ) );
-		}
+    {
+      Fatal( "Could not open codec. Error code %d \"%s\"", avRet, av_err2str( avRet ) );
+    }
 
-		Debug( 1, "Opened codec" );
+    Debug( 1, "Opened codec" );
 
-		/* allocate the encoded raw picture */
+    /* allocate the encoded raw picture */
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-		opicture = av_frame_alloc( );
+    opicture = av_frame_alloc( );
 #else
-		opicture = avcodec_alloc_frame( );
+    opicture = avcodec_alloc_frame( );
 #endif
-		if ( !opicture )
-		{
-			Panic( "Could not allocate opicture" );
-		}
-		
-		int size = avpicture_get_size( c->pix_fmt, c->width, c->height );
-		uint8_t *opicture_buf = (uint8_t *)av_malloc( size );
-		if ( !opicture_buf )
-		{
+    if ( !opicture )
+    {
+      Panic( "Could not allocate opicture" );
+    }
+    
+    int size = avpicture_get_size( c->pix_fmt, c->width, c->height );
+    uint8_t *opicture_buf = (uint8_t *)av_malloc( size );
+    if ( !opicture_buf )
+    {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-                    av_frame_free( &opicture );
+          av_frame_free( &opicture );
 #else
-                    av_freep( &opicture );
+          av_freep( &opicture );
 #endif
-			Panic( "Could not allocate opicture_buf" );
-		}
-		avpicture_fill( (AVPicture *)opicture, opicture_buf, c->pix_fmt, c->width, c->height );
+      Panic( "Could not allocate opicture_buf" );
+    }
+    avpicture_fill( (AVPicture *)opicture, opicture_buf, c->pix_fmt, c->width, c->height );
 
-		/* if the output format is not identical to the input format, then a temporary
-		   picture is needed too. It is then converted to the required
-		   output format */
-		tmp_opicture = NULL;
-		if ( c->pix_fmt != pf )
-		{
+    /* if the output format is not identical to the input format, then a temporary
+       picture is needed too. It is then converted to the required
+       output format */
+    tmp_opicture = NULL;
+    if ( c->pix_fmt != pf )
+    {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-			tmp_opicture = av_frame_alloc( );
+      tmp_opicture = av_frame_alloc( );
 #else
-			tmp_opicture = avcodec_alloc_frame( );
+      tmp_opicture = avcodec_alloc_frame( );
 #endif
-			if ( !tmp_opicture )
-			{
-				Panic( "Could not allocate tmp_opicture" );
-			}
-			int size = avpicture_get_size( pf, c->width, c->height );
-			uint8_t *tmp_opicture_buf = (uint8_t *)av_malloc( size );
-			if ( !tmp_opicture_buf )
-			{
+      if ( !tmp_opicture )
+      {
+        Panic( "Could not allocate tmp_opicture" );
+      }
+      int size = avpicture_get_size( pf, c->width, c->height );
+      uint8_t *tmp_opicture_buf = (uint8_t *)av_malloc( size );
+      if ( !tmp_opicture_buf )
+      {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-                            av_frame_free( &tmp_opicture );
+              av_frame_free( &tmp_opicture );
 #else
-                            av_freep( &tmp_opicture );
+              av_freep( &tmp_opicture );
 #endif
-				Panic( "Could not allocate tmp_opicture_buf" );
-			}
-			avpicture_fill( (AVPicture *)tmp_opicture, tmp_opicture_buf, pf, c->width, c->height );
-		}
-	}
+        Panic( "Could not allocate tmp_opicture_buf" );
+      }
+      avpicture_fill( (AVPicture *)tmp_opicture, tmp_opicture_buf, pf, c->width, c->height );
+    }
+  }
 
-	/* open the output file, if needed */
-	if ( !(of->flags & AVFMT_NOFILE) )
-	{
-		int ret;
+  /* open the output file, if needed */
+  if ( !(of->flags & AVFMT_NOFILE) )
+  {
+    int ret;
 #if LIBAVFORMAT_VERSION_CHECK(53, 15, 0, 21, 0)
-		ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL );
+    ret = avio_open2( &ofc->pb, filename, AVIO_FLAG_WRITE, NULL, NULL );
 #elif LIBAVFORMAT_VERSION_CHECK(52, 102, 0, 102, 0)
-		ret = avio_open( &ofc->pb, filename, AVIO_FLAG_WRITE );
+    ret = avio_open( &ofc->pb, filename, AVIO_FLAG_WRITE );
 #else
-		ret = url_fopen( &ofc->pb, filename, AVIO_FLAG_WRITE );
+    ret = url_fopen( &ofc->pb, filename, AVIO_FLAG_WRITE );
 #endif
-		if ( ret < 0 )
-		{
-			Fatal( "Could not open '%s'", filename );
-		}
+    if ( ret < 0 )
+    {
+      Fatal( "Could not open '%s'", filename );
+    }
 
-		Debug( 1, "Opened output \"%s\"", filename );
-	}
-	else
-	{
-		Fatal( "of->flags & AVFMT_NOFILE" );
-	}
+    Debug( 1, "Opened output \"%s\"", filename );
+  }
+  else
+  {
+    Fatal( "of->flags & AVFMT_NOFILE" );
+  }
 
-	video_outbuf = NULL;
-	if ( !(of->flags & AVFMT_RAWPICTURE) )
-	{
-		/* allocate output buffer */
-		/* XXX: API change will be done */
-		// TODO: Make buffer dynamic.
-		video_outbuf_size = 4000000;
-		video_outbuf = (uint8_t *)malloc( video_outbuf_size );
-		if ( video_outbuf == NULL ) {
-			Fatal("Unable to malloc memory for outbuf");
-		}
-	}
+  video_outbuf = NULL;
+  if ( !(of->flags & AVFMT_RAWPICTURE) )
+  {
+    /* allocate output buffer */
+    /* XXX: API change will be done */
+    // TODO: Make buffer dynamic.
+    video_outbuf_size = 4000000;
+    video_outbuf = (uint8_t *)malloc( video_outbuf_size );
+    if ( video_outbuf == NULL ) {
+      Fatal("Unable to malloc memory for outbuf");
+    }
+  }
 
 #if LIBAVFORMAT_VERSION_CHECK(52, 101, 0, 101, 0)
-	av_dump_format(ofc, 0, filename, 1);
+  av_dump_format(ofc, 0, filename, 1);
 #else
-	dump_format(ofc, 0, filename, 1);
+  dump_format(ofc, 0, filename, 1);
 #endif
 
 #if !LIBAVFORMAT_VERSION_CHECK(53, 2, 0, 4, 0)
-    int ret = av_write_header( ofc );
+  int ret = av_write_header( ofc );
 #else
-    int ret = avformat_write_header( ofc, NULL );
+  int ret = avformat_write_header( ofc, NULL );
 #endif
 
-    if ( ret < 0 )
-    {
-        Fatal( "?_write_header failed with error %d \"%s\"", ret, av_err2str( ret ) );
-    }
+  if ( ret < 0 )
+  {
+    Fatal( "?_write_header failed with error %d \"%s\"", ret, av_err2str( ret ) );
+  }
 }
 
 VideoStream::VideoStream( const char *in_filename, const char *in_format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height ) :
-		filename(in_filename),
-		format(in_format),
-		last_pts( -1 ),
-		streaming_thread(0),
-		do_streaming(true),
-		buffer_copy(NULL),
-		buffer_copy_lock(new pthread_mutex_t),
-		buffer_copy_size(0),
-		buffer_copy_used(0),
-        packet_index(0)
+    filename(in_filename),
+    format(in_format),
+    last_pts( -1 ),
+    streaming_thread(0),
+    do_streaming(true),
+    buffer_copy(NULL),
+    buffer_copy_lock(new pthread_mutex_t),
+    buffer_copy_size(0),
+    buffer_copy_used(0),
+    packet_index(0)
 {
-	if ( !initialised )
-	{
-		Initialise( );
-	}
-	
-	if ( format )
-	{
-		int length = strlen(format);
-		codec_and_format = new char[length+1];;
-		strcpy( codec_and_format, format );
-		format = codec_and_format;
-		codec_name = NULL;
-		char *f = strchr(codec_and_format, '/');
-		if (f != NULL)
-		{
-			*f = 0;
-			codec_name = f+1;
-		}
-	}
+  if ( !initialised )
+  {
+    Initialise( );
+  }
+  
+  if ( format )
+  {
+    int length = strlen(format);
+    codec_and_format = new char[length+1];;
+    strcpy( codec_and_format, format );
+    format = codec_and_format;
+    codec_name = NULL;
+    char *f = strchr(codec_and_format, '/');
+    if (f != NULL)
+    {
+      *f = 0;
+      codec_name = f+1;
+    }
+  }
 
-	SetupFormat( );
-	SetupCodec( colours, subpixelorder, width, height, bitrate, frame_rate );
-	SetParameters( );
-    
-    // Allocate buffered packets.
-    packet_buffers = new AVPacket*[2];
-    packet_buffers[0] = new AVPacket();
-    packet_buffers[1] = new AVPacket();
-    packet_index = 0;
-	
-	// Initialize mutex used by streaming thread.
-	if ( pthread_mutex_init( buffer_copy_lock, NULL ) != 0 )
-	{
-		Fatal("pthread_mutex_init failed");
-	}
+  SetupFormat( );
+  SetupCodec( colours, subpixelorder, width, height, bitrate, frame_rate );
+  SetParameters( );
+  
+  // Allocate buffered packets.
+  packet_buffers = new AVPacket*[2];
+  packet_buffers[0] = new AVPacket();
+  packet_buffers[1] = new AVPacket();
+  packet_index = 0;
+  
+  // Initialize mutex used by streaming thread.
+  if ( pthread_mutex_init( buffer_copy_lock, NULL ) != 0 )
+  {
+    Fatal("pthread_mutex_init failed");
+  }
 }
 
 VideoStream::~VideoStream( )
 {
-	Debug( 1, "VideoStream destructor." );
-	
-	// Stop streaming thread.
-	if ( streaming_thread )
-	{
-		do_streaming = false;
-		void* thread_exit_code;
-		
-		Debug( 1, "Asking streaming thread to exit." );
-		
-		// Wait for thread to exit.
-		pthread_join(streaming_thread, &thread_exit_code);
-	}
-	
-	if ( buffer_copy != NULL )
-	{
-		av_free( buffer_copy );
-	}
+  Debug( 1, "VideoStream destructor." );
+  
+  // Stop streaming thread.
+  if ( streaming_thread )
+  {
+    do_streaming = false;
+    void* thread_exit_code;
     
-	if ( buffer_copy_lock )
-	{
-		if ( pthread_mutex_destroy( buffer_copy_lock ) != 0 )
-		{
-			Error( "pthread_mutex_destroy failed" );
-		}
-		delete buffer_copy_lock;
-	}
+    Debug( 1, "Asking streaming thread to exit." );
     
-    if (packet_buffers) {
-        delete packet_buffers[0];
-        delete packet_buffers[1];
-        delete[] packet_buffers;
+    // Wait for thread to exit.
+    pthread_join(streaming_thread, &thread_exit_code);
+  }
+  
+  if ( buffer_copy != NULL )
+  {
+    av_free( buffer_copy );
+  }
+  
+  if ( buffer_copy_lock )
+  {
+    if ( pthread_mutex_destroy( buffer_copy_lock ) != 0 )
+    {
+      Error( "pthread_mutex_destroy failed" );
     }
-	
-	/* close each codec */
-	if ( ost )
-	{
-		avcodec_close( ost->codec );
-		av_free( opicture->data[0] );
+    delete buffer_copy_lock;
+  }
+  
+  if (packet_buffers) {
+    delete packet_buffers[0];
+    delete packet_buffers[1];
+    delete[] packet_buffers;
+  }
+  
+  /* close each codec */
+  if ( ost )
+  {
+    avcodec_close( ost->codec );
+    av_free( opicture->data[0] );
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-		av_frame_free( &opicture );
+    av_frame_free( &opicture );
 #else
-		av_freep( &opicture );
+    av_freep( &opicture );
 #endif
-		if ( tmp_opicture )
-		{
-			av_free( tmp_opicture->data[0] );
+    if ( tmp_opicture )
+    {
+      av_free( tmp_opicture->data[0] );
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-			av_frame_free( &tmp_opicture );
+      av_frame_free( &tmp_opicture );
 #else
-			av_freep( &tmp_opicture );
+      av_freep( &tmp_opicture );
 #endif
-		}
-		av_free( video_outbuf );
-	}
+    }
+    av_free( video_outbuf );
+  }
 
-	/* write the trailer, if any */
-	av_write_trailer( ofc );
+  /* write the trailer, if any */
+  av_write_trailer( ofc );
 
-	/* free the streams */
-	for ( unsigned int i = 0; i < ofc->nb_streams; i++ )
-	{
-		av_freep( &ofc->streams[i] );
-	}
+  /* free the streams */
+  for ( unsigned int i = 0; i < ofc->nb_streams; i++ )
+  {
+    av_freep( &ofc->streams[i] );
+  }
 
-	if ( !(of->flags & AVFMT_NOFILE) )
-	{
-		/* close the output file */
+  if ( !(of->flags & AVFMT_NOFILE) )
+  {
+    /* close the output file */
 #if LIBAVFORMAT_VERSION_CHECK(52, 105, 0, 105, 0)
-		avio_close( ofc->pb );
+    avio_close( ofc->pb );
 #else
-		url_fclose( ofc->pb );
+    url_fclose( ofc->pb );
 #endif
-	}
+  }
 
-	/* free the stream */
-	av_free( ofc );
-	
-	/* free format and codec_name data. */
-	if ( codec_and_format )
-	{
-		delete codec_and_format;
-	}
+  /* free the stream */
+  av_free( ofc );
+  
+  /* free format and codec_name data. */
+  if ( codec_and_format )
+  {
+    delete codec_and_format;
+  }
 }
 
 double VideoStream::EncodeFrame( const uint8_t *buffer, int buffer_size, bool _add_timestamp, unsigned int _timestamp )
 {
-	if ( pthread_mutex_lock( buffer_copy_lock ) != 0 )
-	{
-		Fatal( "EncodeFrame: pthread_mutex_lock failed." );
-	}
-	
-	if (buffer_copy_size < buffer_size)
-	{
-		if ( buffer_copy )
-		{
-			av_free( buffer_copy );
-		}
-		
-		// Allocate a buffer to store source images for the streaming thread to encode.
-		buffer_copy = (uint8_t *)av_malloc( buffer_size );
-		if ( !buffer_copy )
-		{
-			Panic( "Could not allocate buffer_copy" );
-		}
-		buffer_copy_size = buffer_size;
-	}
-	
-	add_timestamp = _add_timestamp;
-	timestamp = _timestamp;
-	buffer_copy_used = buffer_size;
-	memcpy(buffer_copy, buffer, buffer_size);
-	
-	if ( pthread_mutex_unlock( buffer_copy_lock ) != 0 )
-	{
-		Fatal( "EncodeFrame: pthread_mutex_unlock failed." );
-	}
-	
-	if ( streaming_thread == 0 )
-	{
-		Debug( 1, "Starting streaming thread" );
-		
-		// Start a thread for streaming encoded video.
-		if (pthread_create( &streaming_thread, NULL, StreamingThreadCallback, (void*) this) != 0){
-			// Log a fatal error and exit the process.
-			Fatal( "VideoStream failed to create streaming thread." );
-		}
-	}
-	
-	//return ActuallyEncodeFrame( buffer, buffer_size, add_timestamp, timestamp);
-	
-	return _timestamp;
+  if ( pthread_mutex_lock( buffer_copy_lock ) != 0 )
+  {
+    Fatal( "EncodeFrame: pthread_mutex_lock failed." );
+  }
+  
+  if (buffer_copy_size < buffer_size)
+  {
+    if ( buffer_copy )
+    {
+      av_free( buffer_copy );
+    }
+    
+    // Allocate a buffer to store source images for the streaming thread to encode.
+    buffer_copy = (uint8_t *)av_malloc( buffer_size );
+    if ( !buffer_copy )
+    {
+      Panic( "Could not allocate buffer_copy" );
+    }
+    buffer_copy_size = buffer_size;
+  }
+  
+  add_timestamp = _add_timestamp;
+  timestamp = _timestamp;
+  buffer_copy_used = buffer_size;
+  memcpy(buffer_copy, buffer, buffer_size);
+  
+  if ( pthread_mutex_unlock( buffer_copy_lock ) != 0 )
+  {
+    Fatal( "EncodeFrame: pthread_mutex_unlock failed." );
+  }
+  
+  if ( streaming_thread == 0 )
+  {
+    Debug( 1, "Starting streaming thread" );
+    
+    // Start a thread for streaming encoded video.
+    if (pthread_create( &streaming_thread, NULL, StreamingThreadCallback, (void*) this) != 0){
+      // Log a fatal error and exit the process.
+      Fatal( "VideoStream failed to create streaming thread." );
+    }
+  }
+  
+  //return ActuallyEncodeFrame( buffer, buffer_size, add_timestamp, timestamp);
+  
+  return _timestamp;
 }
 
 double VideoStream::ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp, unsigned int timestamp )
 {
 #ifdef HAVE_LIBSWSCALE
-	static struct SwsContext *img_convert_ctx = 0;
+  static struct SwsContext *img_convert_ctx = 0;
 #endif // HAVE_LIBSWSCALE
 
-	AVCodecContext *c = ost->codec;
+  AVCodecContext *c = ost->codec;
 
-	if ( c->pix_fmt != pf )
-	{
-		memcpy( tmp_opicture->data[0], buffer, buffer_size );
+  if ( c->pix_fmt != pf )
+  {
+    memcpy( tmp_opicture->data[0], buffer, buffer_size );
 #ifdef HAVE_LIBSWSCALE
-		if ( !img_convert_ctx )
-		{
-			img_convert_ctx = sws_getCachedContext( NULL, c->width, c->height, pf, c->width, c->height, c->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
-			if ( !img_convert_ctx )
-				Panic( "Unable to initialise image scaling context" );
-		}
-		sws_scale( img_convert_ctx, tmp_opicture->data, tmp_opicture->linesize, 0, c->height, opicture->data, opicture->linesize );
+    if ( !img_convert_ctx )
+    {
+      img_convert_ctx = sws_getCachedContext( NULL, c->width, c->height, pf, c->width, c->height, c->pix_fmt, SWS_BICUBIC, NULL, NULL, NULL );
+      if ( !img_convert_ctx )
+        Panic( "Unable to initialise image scaling context" );
+    }
+    sws_scale( img_convert_ctx, tmp_opicture->data, tmp_opicture->linesize, 0, c->height, opicture->data, opicture->linesize );
 #else // HAVE_LIBSWSCALE
-		Fatal( "swscale is required for MPEG mode" );
+    Fatal( "swscale is required for MPEG mode" );
 #endif // HAVE_LIBSWSCALE
-	}
-	else
-	{
-		memcpy( opicture->data[0], buffer, buffer_size );
-	}
-	AVFrame *opicture_ptr = opicture;
-	
-	AVPacket *pkt = packet_buffers[packet_index];
-	av_init_packet( pkt );
-    int got_packet = 0;
-	if ( of->flags & AVFMT_RAWPICTURE )
-	{
+  }
+  else
+  {
+    memcpy( opicture->data[0], buffer, buffer_size );
+  }
+  AVFrame *opicture_ptr = opicture;
+  
+  AVPacket *pkt = packet_buffers[packet_index];
+  av_init_packet( pkt );
+  int got_packet = 0;
+  if ( of->flags & AVFMT_RAWPICTURE )
+  {
 #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
-		pkt->flags |= AV_PKT_FLAG_KEY;
+    pkt->flags |= AV_PKT_FLAG_KEY;
 #else
-		pkt->flags |= PKT_FLAG_KEY;
+    pkt->flags |= PKT_FLAG_KEY;
 #endif
-		pkt->stream_index = ost->index;
-		pkt->data = (uint8_t *)opicture_ptr;
-		pkt->size = sizeof (AVPicture);
-        got_packet = 1;
-	}
-	else
-	{
-		opicture_ptr->pts = c->frame_number;
-		opicture_ptr->quality = c->global_quality;
+    pkt->stream_index = ost->index;
+    pkt->data = (uint8_t *)opicture_ptr;
+    pkt->size = sizeof (AVPicture);
+    got_packet = 1;
+  }
+  else
+  {
+    opicture_ptr->pts = c->frame_number;
+    opicture_ptr->quality = c->global_quality;
 
 #if LIBAVFORMAT_VERSION_CHECK(54, 1, 0, 2, 100)
-		int ret = avcodec_encode_video2( c, pkt, opicture_ptr, &got_packet );
-		if ( ret != 0 )
-		{
-			Fatal( "avcodec_encode_video2 failed with errorcode %d \"%s\"", ret, av_err2str( ret ) );
-		}
+    int ret = avcodec_encode_video2( c, pkt, opicture_ptr, &got_packet );
+    if ( ret != 0 )
+    {
+      Fatal( "avcodec_encode_video2 failed with errorcode %d \"%s\"", ret, av_err2str( ret ) );
+    }
 #else
-		int out_size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, opicture_ptr );
-		got_packet = out_size > 0 ? 1 : 0;
-		pkt->data = got_packet ? video_outbuf : NULL;
-		pkt->size = got_packet ? out_size : 0;
+    int out_size = avcodec_encode_video( c, video_outbuf, video_outbuf_size, opicture_ptr );
+    got_packet = out_size > 0 ? 1 : 0;
+    pkt->data = got_packet ? video_outbuf : NULL;
+    pkt->size = got_packet ? out_size : 0;
 #endif
-		if ( got_packet )
-		{
-			if ( c->coded_frame->key_frame )
-			{
+    if ( got_packet )
+    {
+      if ( c->coded_frame->key_frame )
+      {
 #if LIBAVCODEC_VERSION_CHECK(52, 30, 2, 30, 2)
-				pkt->flags |= AV_PKT_FLAG_KEY;
+        pkt->flags |= AV_PKT_FLAG_KEY;
 #else
-				pkt->flags |= PKT_FLAG_KEY;
+        pkt->flags |= PKT_FLAG_KEY;
 #endif
-			}
+      }
 
-			if ( pkt->pts != (int64_t)AV_NOPTS_VALUE )
-			{
-				pkt->pts = av_rescale_q( pkt->pts, c->time_base, ost->time_base );
-			}
-			if ( pkt->dts != (int64_t)AV_NOPTS_VALUE )
-			{
-				pkt->dts = av_rescale_q( pkt->dts, c->time_base, ost->time_base );
-			}
-			pkt->duration = av_rescale_q( pkt->duration, c->time_base, ost->time_base );
-			pkt->stream_index = ost->index;
-		}
-	}
-    
-	return ( opicture_ptr->pts);
+      if ( pkt->pts != (int64_t)AV_NOPTS_VALUE )
+      {
+        pkt->pts = av_rescale_q( pkt->pts, c->time_base, ost->time_base );
+      }
+      if ( pkt->dts != (int64_t)AV_NOPTS_VALUE )
+      {
+        pkt->dts = av_rescale_q( pkt->dts, c->time_base, ost->time_base );
+      }
+      pkt->duration = av_rescale_q( pkt->duration, c->time_base, ost->time_base );
+      pkt->stream_index = ost->index;
+    }
+  }
+  
+  return ( opicture_ptr->pts);
 }
 
 int VideoStream::SendPacket(AVPacket *packet) {
-    
-    int ret = av_write_frame( ofc, packet );
-    if ( ret != 0 )
-    {
-        Fatal( "Error %d while writing video frame: %s", ret, av_err2str( errno ) );
-    }
+  
+  int ret = av_write_frame( ofc, packet );
+  if ( ret != 0 )
+  {
+    Fatal( "Error %d while writing video frame: %s", ret, av_err2str( errno ) );
+  }
 #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
-        av_packet_unref( packet );
+    av_packet_unref( packet );
 #else
-        av_free_packet( packet );
+    av_free_packet( packet );
 #endif
-    return ret;
+  return ret;
 }
 
 void *VideoStream::StreamingThreadCallback(void *ctx){
-	
-	Debug( 1, "StreamingThreadCallback started" );
-	
-    if (ctx == NULL) return NULL;
+  
+  Debug( 1, "StreamingThreadCallback started" );
+  
+  if (ctx == NULL) return NULL;
 
-    VideoStream* videoStream = reinterpret_cast<VideoStream*>(ctx);
-	
-	const uint64_t nanosecond_multiplier = 1000000000;
-	
-	uint64_t target_interval_ns = nanosecond_multiplier * ( ((double)videoStream->ost->codec->time_base.num) / (videoStream->ost->codec->time_base.den) );
-	uint64_t frame_count = 0;
-	timespec start_time;
-	clock_gettime(CLOCK_MONOTONIC, &start_time);
-	uint64_t start_time_ns = (start_time.tv_sec*nanosecond_multiplier) + start_time.tv_nsec;
-	while(videoStream->do_streaming)
-	{
-		timespec current_time;
-		clock_gettime(CLOCK_MONOTONIC, &current_time);
-		uint64_t current_time_ns = (current_time.tv_sec*nanosecond_multiplier) + current_time.tv_nsec;
-		uint64_t target_ns = start_time_ns + (target_interval_ns * frame_count);
-		
-		if ( current_time_ns < target_ns )
-		{
-			// It's not time to render a frame yet.
-			usleep( (target_ns - current_time_ns) * 0.001 );
-		}
-        
-        // By sending the last rendered frame we deliver frames to the client more accurate.
-        // If we're encoding the frame before sending it there will be lag.
-        // Since this lag is not constant the client may skip frames.
-        
-        // Get the last rendered packet.
-        AVPacket *packet = videoStream->packet_buffers[videoStream->packet_index];
-        if (packet->size) {
-            videoStream->SendPacket(packet);
-        }
+  VideoStream* videoStream = reinterpret_cast<VideoStream*>(ctx);
+  
+  const uint64_t nanosecond_multiplier = 1000000000;
+  
+  uint64_t target_interval_ns = nanosecond_multiplier * ( ((double)videoStream->ost->codec->time_base.num) / (videoStream->ost->codec->time_base.den) );
+  uint64_t frame_count = 0;
+  timespec start_time;
+  clock_gettime(CLOCK_MONOTONIC, &start_time);
+  uint64_t start_time_ns = (start_time.tv_sec*nanosecond_multiplier) + start_time.tv_nsec;
+  while(videoStream->do_streaming)
+  {
+    timespec current_time;
+    clock_gettime(CLOCK_MONOTONIC, &current_time);
+    uint64_t current_time_ns = (current_time.tv_sec*nanosecond_multiplier) + current_time.tv_nsec;
+    uint64_t target_ns = start_time_ns + (target_interval_ns * frame_count);
+    
+    if ( current_time_ns < target_ns )
+    {
+      // It's not time to render a frame yet.
+      usleep( (target_ns - current_time_ns) * 0.001 );
+    }
+    
+    // By sending the last rendered frame we deliver frames to the client more accurate.
+    // If we're encoding the frame before sending it there will be lag.
+    // Since this lag is not constant the client may skip frames.
+    
+    // Get the last rendered packet.
+    AVPacket *packet = videoStream->packet_buffers[videoStream->packet_index];
+    if (packet->size) {
+      videoStream->SendPacket(packet);
+    }
 #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
-        av_packet_unref( packet);
+    av_packet_unref( packet);
 #else
-        av_free_packet( packet );
+    av_free_packet( packet );
 #endif
-        videoStream->packet_index = videoStream->packet_index ? 0 : 1;
-        
-		// Lock buffer and render next frame.
-        
-		if ( pthread_mutex_lock( videoStream->buffer_copy_lock ) != 0 )
-		{
-			Fatal( "StreamingThreadCallback: pthread_mutex_lock failed." );
-		}
-		
-		if ( videoStream->buffer_copy )
-		{
-			// Encode next frame.
-			videoStream->ActuallyEncodeFrame( videoStream->buffer_copy, videoStream->buffer_copy_used, videoStream->add_timestamp, videoStream->timestamp );
-		}
-	
-		if ( pthread_mutex_unlock( videoStream->buffer_copy_lock ) != 0 )
-		{
-			Fatal( "StreamingThreadCallback: pthread_mutex_unlock failed." );
-		}
-		
-		frame_count++;
-	}
-	
-	return 0;
+    videoStream->packet_index = videoStream->packet_index ? 0 : 1;
+    
+    // Lock buffer and render next frame.
+    
+    if ( pthread_mutex_lock( videoStream->buffer_copy_lock ) != 0 )
+    {
+      Fatal( "StreamingThreadCallback: pthread_mutex_lock failed." );
+    }
+    
+    if ( videoStream->buffer_copy )
+    {
+      // Encode next frame.
+      videoStream->ActuallyEncodeFrame( videoStream->buffer_copy, videoStream->buffer_copy_used, videoStream->add_timestamp, videoStream->timestamp );
+    }
+  
+    if ( pthread_mutex_unlock( videoStream->buffer_copy_lock ) != 0 )
+    {
+      Fatal( "StreamingThreadCallback: pthread_mutex_unlock failed." );
+    }
+    
+    frame_count++;
+  }
+  
+  return 0;
 }
 
 #endif // HAVE_LIBAVCODEC
diff --git a/src/zm_mpeg.h b/src/zm_mpeg.h
index b54776e70..e2ec33592 100644
--- a/src/zm_mpeg.h
+++ b/src/zm_mpeg.h
@@ -27,60 +27,60 @@
 class VideoStream
 {
 protected:
-	struct MimeData
-	{
-		const char *format;
-		const char *mime_type;
-	};
+  struct MimeData
+  {
+    const char *format;
+    const char *mime_type;
+  };
 
 protected:
-	static bool initialised;
-	static struct MimeData mime_data[];
+  static bool initialised;
+  static struct MimeData mime_data[];
 
 protected:
-	char *codec_and_format;
-	const char *filename;
-	const char *format;
-	const char *codec_name;
-	enum _AVPIXELFORMAT pf;
-	AVOutputFormat *of;
-	AVFormatContext *ofc;
-	AVStream *ost;
-	AVCodec *codec;
-	AVFrame *opicture;
-	AVFrame *tmp_opicture;
-	uint8_t *video_outbuf;
-	int video_outbuf_size;
-	double last_pts;
-	
-	pthread_t streaming_thread;
-	bool do_streaming;
-	uint8_t *buffer_copy;
-	bool add_timestamp;
-	unsigned int timestamp;
-	pthread_mutex_t *buffer_copy_lock;
-	int buffer_copy_size;
-	int buffer_copy_used;
-    AVPacket** packet_buffers;
-    int packet_index;
-    int SendPacket(AVPacket *packet);
-    static void* StreamingThreadCallback(void *ctx);
+  char *codec_and_format;
+  const char *filename;
+  const char *format;
+  const char *codec_name;
+  enum _AVPIXELFORMAT pf;
+  AVOutputFormat *of;
+  AVFormatContext *ofc;
+  AVStream *ost;
+  AVCodec *codec;
+  AVFrame *opicture;
+  AVFrame *tmp_opicture;
+  uint8_t *video_outbuf;
+  int video_outbuf_size;
+  double last_pts;
+  
+  pthread_t streaming_thread;
+  bool do_streaming;
+  uint8_t *buffer_copy;
+  bool add_timestamp;
+  unsigned int timestamp;
+  pthread_mutex_t *buffer_copy_lock;
+  int buffer_copy_size;
+  int buffer_copy_used;
+  AVPacket** packet_buffers;
+  int packet_index;
+  int SendPacket(AVPacket *packet);
+  static void* StreamingThreadCallback(void *ctx);
 
 protected:
-	static void Initialise();
+  static void Initialise();
 
-	void SetupFormat( );
-	void SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate );
-	void SetParameters();
-	void ActuallyOpenStream();
-	double ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp=false, unsigned int timestamp=0 );
+  void SetupFormat( );
+  void SetupCodec( int colours, int subpixelorder, int width, int height, int bitrate, double frame_rate );
+  void SetParameters();
+  void ActuallyOpenStream();
+  double ActuallyEncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp=false, unsigned int timestamp=0 );
 
 public:
-	VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height );
-	~VideoStream();
-	const char *MimeType() const;
-	void OpenStream();
-	double EncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp=false, unsigned int timestamp=0 );
+  VideoStream( const char *filename, const char *format, int bitrate, double frame_rate, int colours, int subpixelorder, int width, int height );
+  ~VideoStream();
+  const char *MimeType() const;
+  void OpenStream();
+  double EncodeFrame( const uint8_t *buffer, int buffer_size, bool add_timestamp=false, unsigned int timestamp=0 );
 };
 
 #endif // HAVE_LIBAVCODEC
diff --git a/src/zm_packetqueue.cpp b/src/zm_packetqueue.cpp
index d39a04215..826825156 100644
--- a/src/zm_packetqueue.cpp
+++ b/src/zm_packetqueue.cpp
@@ -63,9 +63,6 @@ alloc(msm.get_segment_manager()) {
   shared_memory_object::remove("MySharedMemory");
 }
 
-zm_packetqueue::zm_packetqueue(const zm_packetqueue& orig) {
-}
-
 zm_packetqueue::~zm_packetqueue() {
 }
 
diff --git a/src/zm_poly.cpp b/src/zm_poly.cpp
index 4eee73f46..cddcced46 100644
--- a/src/zm_poly.cpp
+++ b/src/zm_poly.cpp
@@ -28,95 +28,95 @@
 
 void Polygon::calcArea()
 {
-	double float_area = 0.0L;
-	for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-	{
-		double trap_area = ((coords[i].X()-coords[j].X())*((coords[i].Y()+coords[j].Y())))/2.0L;
-		float_area += trap_area;
-		//printf( "%.2f (%.2f)\n", float_area, trap_area );
-	}
-	area = (int)round(fabs(float_area));
+  double float_area = 0.0L;
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
+  {
+    double trap_area = ((coords[i].X()-coords[j].X())*((coords[i].Y()+coords[j].Y())))/2.0L;
+    float_area += trap_area;
+    //printf( "%.2f (%.2f)\n", float_area, trap_area );
+  }
+  area = (int)round(fabs(float_area));
 }
 
 void Polygon::calcCentre()
 {
-	if ( !area && n_coords )
-		calcArea();
-	double float_x = 0.0L, float_y = 0.0L;
-	for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-	{
-		float_x += ((coords[i].Y()-coords[j].Y())*((coords[i].X()*2)+(coords[i].X()*coords[j].X())+(coords[j].X()*2)));
-		float_y += ((coords[j].X()-coords[i].X())*((coords[i].Y()*2)+(coords[i].Y()*coords[j].Y())+(coords[j].Y()*2)));
-	}
-	float_x /= (6*area);
-	float_y /= (6*area);
-	//printf( "%.2f,%.2f\n", float_x, float_y );
-	centre = Coord( (int)round(float_x), (int)round(float_y) );
+  if ( !area && n_coords )
+    calcArea();
+  double float_x = 0.0L, float_y = 0.0L;
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
+  {
+    float_x += ((coords[i].Y()-coords[j].Y())*((coords[i].X()*2)+(coords[i].X()*coords[j].X())+(coords[j].X()*2)));
+    float_y += ((coords[j].X()-coords[i].X())*((coords[i].Y()*2)+(coords[i].Y()*coords[j].Y())+(coords[j].Y()*2)));
+  }
+  float_x /= (6*area);
+  float_y /= (6*area);
+  //printf( "%.2f,%.2f\n", float_x, float_y );
+  centre = Coord( (int)round(float_x), (int)round(float_y) );
 }
 
 Polygon::Polygon( int p_n_coords, const Coord *p_coords ) : n_coords( p_n_coords )
 {
-	coords = new Coord[n_coords];
+  coords = new Coord[n_coords];
 
-	int min_x = -1;
-	int max_x = -1;
-	int min_y = -1;
-	int max_y = -1;
-	for( int i = 0; i < n_coords; i++ )
-	{
-		coords[i] = p_coords[i];
-		if ( min_x == -1 || coords[i].X() < min_x )
-			min_x = coords[i].X();
-		if ( max_x == -1 || coords[i].X() > max_x )
-			max_x = coords[i].X();
-		if ( min_y == -1 || coords[i].Y() < min_y )
-			min_y = coords[i].Y();
-		if ( max_y == -1 || coords[i].Y() > max_y )
-			max_y = coords[i].Y();
-	}
-	extent = Box( min_x, min_y, max_x, max_y );
-	calcArea();
-	calcCentre();
+  int min_x = -1;
+  int max_x = -1;
+  int min_y = -1;
+  int max_y = -1;
+  for( int i = 0; i < n_coords; i++ )
+  {
+    coords[i] = p_coords[i];
+    if ( min_x == -1 || coords[i].X() < min_x )
+      min_x = coords[i].X();
+    if ( max_x == -1 || coords[i].X() > max_x )
+      max_x = coords[i].X();
+    if ( min_y == -1 || coords[i].Y() < min_y )
+      min_y = coords[i].Y();
+    if ( max_y == -1 || coords[i].Y() > max_y )
+      max_y = coords[i].Y();
+  }
+  extent = Box( min_x, min_y, max_x, max_y );
+  calcArea();
+  calcCentre();
 }
 
 Polygon::Polygon( const Polygon &p_polygon ) : n_coords( p_polygon.n_coords ), extent( p_polygon.extent ), area( p_polygon.area ), centre( p_polygon.centre )
 {
-	coords = new Coord[n_coords];
-	for( int i = 0; i < n_coords; i++ )
-	{
-		coords[i] = p_polygon.coords[i];
-	}
+  coords = new Coord[n_coords];
+  for( int i = 0; i < n_coords; i++ )
+  {
+    coords[i] = p_polygon.coords[i];
+  }
 }
 
 Polygon &Polygon::operator=( const Polygon &p_polygon )
 {
-	if ( n_coords < p_polygon.n_coords )
-	{
-		delete[] coords;
-		coords = new Coord[p_polygon.n_coords];
-	}
-	n_coords = p_polygon.n_coords;
-	for( int i = 0; i < n_coords; i++ )
-	{
-		coords[i] = p_polygon.coords[i];
-	}
-	extent = p_polygon.extent;
-	area = p_polygon.area;
-	centre = p_polygon.centre;
-	return( *this );
+  if ( n_coords < p_polygon.n_coords )
+  {
+    delete[] coords;
+    coords = new Coord[p_polygon.n_coords];
+  }
+  n_coords = p_polygon.n_coords;
+  for( int i = 0; i < n_coords; i++ )
+  {
+    coords[i] = p_polygon.coords[i];
+  }
+  extent = p_polygon.extent;
+  area = p_polygon.area;
+  centre = p_polygon.centre;
+  return( *this );
 }
 
 bool Polygon::isInside( const Coord &coord ) const
 {
-	bool inside = false;
-	for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
-	{
-		if ( (((coords[i].Y() <= coord.Y()) && (coord.Y() < coords[j].Y()) )
-		|| ((coords[j].Y() <= coord.Y()) && (coord.Y() < coords[i].Y())))
-		&& (coord.X() < (coords[j].X() - coords[i].X()) * (coord.Y() - coords[i].Y()) / (coords[j].Y() - coords[i].Y()) + coords[i].X()))
-		{
-			inside = !inside;
-		}
-	}
-	return( inside );
+  bool inside = false;
+  for ( int i = 0, j = n_coords-1; i < n_coords; j = i++ )
+  {
+    if ( (((coords[i].Y() <= coord.Y()) && (coord.Y() < coords[j].Y()) )
+    || ((coords[j].Y() <= coord.Y()) && (coord.Y() < coords[i].Y())))
+    && (coord.X() < (coords[j].X() - coords[i].X()) * (coord.Y() - coords[i].Y()) / (coords[j].Y() - coords[i].Y()) + coords[i].X()))
+    {
+      inside = !inside;
+    }
+  }
+  return( inside );
 }
diff --git a/src/zm_poly.h b/src/zm_poly.h
index 854a3c322..7ba3043fd 100644
--- a/src/zm_poly.h
+++ b/src/zm_poly.h
@@ -33,93 +33,93 @@
 class Polygon
 {
 protected:
-	struct Edge
-	{
-		int min_y;
-		int max_y;
-		double min_x;
-		double _1_m;
+  struct Edge
+  {
+    int min_y;
+    int max_y;
+    double min_x;
+    double _1_m;
 
-		static int CompareYX( const void *p1, const void *p2 )
-		{
-			const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
-			if ( e1->min_y == e2->min_y )
-				return( int(e1->min_x - e2->min_x) );
-			else
-				return( int(e1->min_y - e2->min_y) );
-		}
-		static int CompareX( const void *p1, const void *p2 )
-		{
-			const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
-			return( int(e1->min_x - e2->min_x) );
-		}
-	};
+    static int CompareYX( const void *p1, const void *p2 )
+    {
+      const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
+      if ( e1->min_y == e2->min_y )
+        return( int(e1->min_x - e2->min_x) );
+      else
+        return( int(e1->min_y - e2->min_y) );
+    }
+    static int CompareX( const void *p1, const void *p2 )
+    {
+      const Edge *e1 = (const Edge *)p1, *e2 = (const Edge *)p2;
+      return( int(e1->min_x - e2->min_x) );
+    }
+  };
 
-	struct Slice
-	{
-		int min_x;
-		int max_x;
-		int n_edges;
-		int *edges;
+  struct Slice
+  {
+    int min_x;
+    int max_x;
+    int n_edges;
+    int *edges;
 
-		Slice()
-		{
-			n_edges = 0;
-			edges = 0;
-		}
-		~Slice()
-		{
-			delete edges;
-		}
-	};
+    Slice()
+    {
+      n_edges = 0;
+      edges = 0;
+    }
+    ~Slice()
+    {
+      delete edges;
+    }
+  };
 
 protected:
-	int n_coords;
-	Coord *coords;
-	Box extent;
-	int area;
-	Coord centre;
-	Edge *edges;
-	Slice *slices;
+  int n_coords;
+  Coord *coords;
+  Box extent;
+  int area;
+  Coord centre;
+  Edge *edges;
+  Slice *slices;
 
 protected:
-	void initialiseEdges();
-	void calcArea();
-	void calcCentre();
+  void initialiseEdges();
+  void calcArea();
+  void calcCentre();
 
 public:
-	inline Polygon() : n_coords( 0 ), coords( 0 ), area( 0 )
-	{
-	}
-	Polygon( int p_n_coords, const Coord *p_coords );
-	Polygon( const Polygon &p_polygon );
-	~Polygon()
-	{
-		delete[] coords;
-	}
+  inline Polygon() : n_coords( 0 ), coords( 0 ), area( 0 )
+  {
+  }
+  Polygon( int p_n_coords, const Coord *p_coords );
+  Polygon( const Polygon &p_polygon );
+  ~Polygon()
+  {
+    delete[] coords;
+  }
 
-	Polygon &operator=( const Polygon &p_polygon );
+  Polygon &operator=( const Polygon &p_polygon );
 
-	inline int getNumCoords() const { return( n_coords ); }
-	inline const Coord &getCoord( int index ) const
-	{
-		return( coords[index] );
-	}
+  inline int getNumCoords() const { return( n_coords ); }
+  inline const Coord &getCoord( int index ) const
+  {
+    return( coords[index] );
+  }
 
-	inline const Box &Extent() const { return( extent ); }
-	inline int LoX() const { return( extent.LoX() ); }
-	inline int HiX() const { return( extent.HiX() ); }
-	inline int LoY() const { return( extent.LoY() ); }
-	inline int HiY() const { return( extent.HiY() ); }
-	inline int Width() const { return( extent.Width() ); }
-	inline int Height() const { return( extent.Height() ); }
+  inline const Box &Extent() const { return( extent ); }
+  inline int LoX() const { return( extent.LoX() ); }
+  inline int HiX() const { return( extent.HiX() ); }
+  inline int LoY() const { return( extent.LoY() ); }
+  inline int HiY() const { return( extent.HiY() ); }
+  inline int Width() const { return( extent.Width() ); }
+  inline int Height() const { return( extent.Height() ); }
 
-	inline int Area() const { return( area ); }
-	inline const Coord &Centre() const
-	{
-		return( centre );
-	}
-	bool isInside( const Coord &coord ) const;
+  inline int Area() const { return( area ); }
+  inline const Coord &Centre() const
+  {
+    return( centre );
+  }
+  bool isInside( const Coord &coord ) const;
 };
 
 #endif // ZM_POLY_H
diff --git a/src/zm_regexp.cpp b/src/zm_regexp.cpp
index 43f738217..cfa686688 100644
--- a/src/zm_regexp.cpp
+++ b/src/zm_regexp.cpp
@@ -26,99 +26,99 @@
 
 RegExpr::RegExpr( const char *pattern, int flags, int p_max_matches ) : max_matches( p_max_matches ), match_buffers( 0 ), match_lengths( 0 ), match_valid( 0 )
 {
-	const char *errstr;
-	int erroffset = 0;
-	if ( !(regex = pcre_compile( pattern, flags, &errstr, &erroffset, 0 )) )
-	{
-		Panic( "pcre_compile(%s): %s at %d", pattern, errstr, erroffset );
-	}
+  const char *errstr;
+  int erroffset = 0;
+  if ( !(regex = pcre_compile( pattern, flags, &errstr, &erroffset, 0 )) )
+  {
+    Panic( "pcre_compile(%s): %s at %d", pattern, errstr, erroffset );
+  }
 
-	regextra = pcre_study( regex, 0, &errstr );
-	if ( errstr )
-	{
-		Panic( "pcre_study(%s): %s", pattern, errstr );
-	}
+  regextra = pcre_study( regex, 0, &errstr );
+  if ( errstr )
+  {
+    Panic( "pcre_study(%s): %s", pattern, errstr );
+  }
 
-	if ( (ok = (bool)regex) )
-	{
-		match_vectors = new int[3*max_matches];
-		memset( match_vectors, 0, sizeof(*match_vectors)*3*max_matches );
-		match_buffers = new char *[max_matches];
-		memset( match_buffers, 0, sizeof(*match_buffers)*max_matches );
-		match_lengths = new int[max_matches];
-		memset( match_lengths, 0, sizeof(*match_lengths)*max_matches );
-		match_valid = new bool[max_matches];
-		memset( match_valid, 0, sizeof(*match_valid)*max_matches );
-	}
-	n_matches = 0;
+  if ( (ok = (bool)regex) )
+  {
+    match_vectors = new int[3*max_matches];
+    memset( match_vectors, 0, sizeof(*match_vectors)*3*max_matches );
+    match_buffers = new char *[max_matches];
+    memset( match_buffers, 0, sizeof(*match_buffers)*max_matches );
+    match_lengths = new int[max_matches];
+    memset( match_lengths, 0, sizeof(*match_lengths)*max_matches );
+    match_valid = new bool[max_matches];
+    memset( match_valid, 0, sizeof(*match_valid)*max_matches );
+  }
+  n_matches = 0;
 }
 
 RegExpr::~RegExpr()
 {
-	for ( int i = 0; i < max_matches; i++ )
-	{
-		if ( match_buffers[i] )
-		{
-			delete[] match_buffers[i];
-		}
-	}
-	delete[] match_valid;
-	delete[] match_lengths;
-	delete[] match_buffers;
-	delete[] match_vectors;
+  for ( int i = 0; i < max_matches; i++ )
+  {
+    if ( match_buffers[i] )
+    {
+      delete[] match_buffers[i];
+    }
+  }
+  delete[] match_valid;
+  delete[] match_lengths;
+  delete[] match_buffers;
+  delete[] match_vectors;
 }
 
 int RegExpr::Match( const char *subject_string, int subject_length, int flags )
 {
-	match_string = subject_string;
+  match_string = subject_string;
 
-	n_matches = pcre_exec( regex, regextra, subject_string, subject_length, 0, flags, match_vectors, 2*max_matches );
+  n_matches = pcre_exec( regex, regextra, subject_string, subject_length, 0, flags, match_vectors, 2*max_matches );
 
-	if ( n_matches <= 0 )
-	{
-		if ( n_matches < PCRE_ERROR_NOMATCH )
-		{
-			Error( "Error %d executing regular expression", n_matches );
-		}
-		return( n_matches = 0 );
-	}
+  if ( n_matches <= 0 )
+  {
+    if ( n_matches < PCRE_ERROR_NOMATCH )
+    {
+      Error( "Error %d executing regular expression", n_matches );
+    }
+    return( n_matches = 0 );
+  }
 
-	for( int i = 0; i < max_matches; i++ )
-	{
-		match_valid[i] = false;
-	}
-	return( n_matches );
+  for( int i = 0; i < max_matches; i++ )
+  {
+    match_valid[i] = false;
+  }
+  return( n_matches );
 }
 
 const char *RegExpr::MatchString( int match_index ) const
 {
-	if ( match_index > n_matches )
-	{
-		return( 0 );
-	}
-	if ( !match_valid[match_index] )
-	{
-		int match_len = match_vectors[(2*match_index)+1]-match_vectors[2*match_index];
-		if ( match_lengths[match_index] < (match_len+1) )
-		{
-			delete[] match_buffers[match_index];
-			match_buffers[match_index] = new char[match_len+1];
-			match_lengths[match_index] = match_len+1;
-		}
-		memcpy( match_buffers[match_index], match_string+match_vectors[2*match_index], match_len );
-		match_buffers[match_index][match_len] = '\0';
-		match_valid[match_index] = true;
-	}
-	return( match_buffers[match_index] );
+  if ( match_index > n_matches )
+  {
+    return( 0 );
+  }
+  if ( !match_valid[match_index] )
+  {
+    int match_len = match_vectors[(2*match_index)+1]-match_vectors[2*match_index];
+    if ( match_lengths[match_index] < (match_len+1) )
+    {
+      delete[] match_buffers[match_index];
+      match_buffers[match_index] = new char[match_len+1];
+      match_lengths[match_index] = match_len+1;
+    }
+    memcpy( match_buffers[match_index], match_string+match_vectors[2*match_index], match_len );
+    match_buffers[match_index][match_len] = '\0';
+    match_valid[match_index] = true;
+  }
+  return( match_buffers[match_index] );
 }
 
 int RegExpr::MatchLength( int match_index ) const
 {
-	if ( match_index > n_matches )
-	{
-		return( 0 );
-	}
-	return( match_vectors[(2*match_index)+1]-match_vectors[2*match_index] );
+  if ( match_index > n_matches )
+  {
+    return( 0 );
+  }
+  return( match_vectors[(2*match_index)+1]-match_vectors[2*match_index] );
 }
 
 #endif // HAVE_LIBPCRE
diff --git a/src/zm_regexp.h b/src/zm_regexp.h
index f1c9d705d..1b1a9d518 100644
--- a/src/zm_regexp.h
+++ b/src/zm_regexp.h
@@ -35,29 +35,29 @@
 class RegExpr
 {
 protected:
-	pcre *regex;
-	pcre_extra *regextra;
-	int max_matches;
-	int *match_vectors;
-	mutable char **match_buffers;
-	int *match_lengths;
-	bool *match_valid;
+  pcre *regex;
+  pcre_extra *regextra;
+  int max_matches;
+  int *match_vectors;
+  mutable char **match_buffers;
+  int *match_lengths;
+  bool *match_valid;
 
 protected:
-	const char *match_string;
-	int n_matches;
-	
+  const char *match_string;
+  int n_matches;
+  
 protected:
-	bool ok;
+  bool ok;
 
 public:
-	RegExpr( const char *pattern, int cflags=0, int p_max_matches=32 );
-	~RegExpr();
-	bool Ok() const { return( ok ); }
-	int MatchCount() const { return( n_matches ); }
-	int Match( const char *subject_string, int subject_length, int flags=0 );
-	const char *MatchString( int match_index ) const;
-	int MatchLength( int match_index ) const;
+  RegExpr( const char *pattern, int cflags=0, int p_max_matches=32 );
+  ~RegExpr();
+  bool Ok() const { return( ok ); }
+  int MatchCount() const { return( n_matches ); }
+  int Match( const char *subject_string, int subject_length, int flags=0 );
+  const char *MatchString( int match_index ) const;
+  int MatchLength( int match_index ) const;
 };
 
 #endif // HAVE_LIBPCRE
diff --git a/src/zm_remote_camera.cpp b/src/zm_remote_camera.cpp
index 8ac4a51ba..1ffe5f568 100644
--- a/src/zm_remote_camera.cpp
+++ b/src/zm_remote_camera.cpp
@@ -21,67 +21,82 @@
 
 #include "zm_utils.h"
 
-RemoteCamera::RemoteCamera( int p_id, const std::string &p_protocol, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    Camera( p_id, REMOTE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture ),
+RemoteCamera::RemoteCamera(
+  int p_id,
+  const std::string &p_protocol,
+  const std::string &p_host,
+  const std::string &p_port,
+  const std::string &p_path,
+  int p_width,
+  int p_height,
+  int p_colours,
+  int p_brightness,
+  int p_contrast,
+  int p_hue,
+  int p_colour,
+  bool p_capture,
+  bool p_record_audio
+ ) :
+    Camera( p_id, REMOTE_SRC, p_width, p_height, p_colours, ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(p_colours), p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
     protocol( p_protocol ),
     host( p_host ),
     port( p_port ),
     path( p_path ),
     hp( 0 )
 {
-    if ( path[0] != '/' )
-        path = '/'+path;
+  if ( path[0] != '/' )
+    path = '/'+path;
 }
 
 RemoteCamera::~RemoteCamera()
 {
-	if(hp != NULL) {
-    		freeaddrinfo(hp);
-		hp = NULL;
-	}
+  if(hp != NULL) {
+      freeaddrinfo(hp);
+    hp = NULL;
+  }
 }
 
 void RemoteCamera::Initialise()
 {
-	if( protocol.empty() )
-		Fatal( "No protocol specified for remote camera" );
+  if( protocol.empty() )
+    Fatal( "No protocol specified for remote camera" );
 
-	if( host.empty() )
-		Fatal( "No host specified for remote camera" );
+  if( host.empty() )
+    Fatal( "No host specified for remote camera" );
 
-	if( port.empty() )
-		Fatal( "No port specified for remote camera" );
+  if( port.empty() )
+    Fatal( "No port specified for remote camera" );
 
-	//if( path.empty() )
-		//Fatal( "No path specified for remote camera" );
+  //if( path.empty() )
+    //Fatal( "No path specified for remote camera" );
 
-	// Cache as much as we can to speed things up
-    std::string::size_type authIndex = host.rfind( '@' );
+  // Cache as much as we can to speed things up
+  std::string::size_type authIndex = host.rfind( '@' );
 
-	if ( authIndex != std::string::npos )
-	{
-        auth = host.substr( 0, authIndex );
-        host.erase( 0, authIndex+1 );
-		auth64 = base64Encode( auth );
+  if ( authIndex != std::string::npos )
+  {
+    auth = host.substr( 0, authIndex );
+    host.erase( 0, authIndex+1 );
+    auth64 = base64Encode( auth );
 
-		authIndex = auth.rfind( ':' );
-		username = auth.substr(0,authIndex);
-		password = auth.substr( authIndex+1, auth.length() );
+    authIndex = auth.rfind( ':' );
+    username = auth.substr(0,authIndex);
+    password = auth.substr( authIndex+1, auth.length() );
 
-	}
+  }
 
-    mNeedAuth = false;
-	mAuthenticator = new zm::Authenticator(username,password);
+  mNeedAuth = false;
+  mAuthenticator = new zm::Authenticator(username,password);
 
-	struct addrinfo hints;
-	memset(&hints, 0, sizeof(hints));
-	hints.ai_family = AF_UNSPEC;
-	hints.ai_socktype = SOCK_STREAM;
+  struct addrinfo hints;
+  memset(&hints, 0, sizeof(hints));
+  hints.ai_family = AF_UNSPEC;
+  hints.ai_socktype = SOCK_STREAM;
 
-	int ret = getaddrinfo(host.c_str(), port.c_str(), &hints, &hp);
-	if ( ret != 0 )
-	{
-		Fatal( "Can't getaddrinfo(%s port %s): %s", host.c_str(), port.c_str(), gai_strerror(ret) );
-	}
+  int ret = getaddrinfo(host.c_str(), port.c_str(), &hints, &hp);
+  if ( ret != 0 )
+  {
+    Fatal( "Can't getaddrinfo(%s port %s): %s", host.c_str(), port.c_str(), gai_strerror(ret) );
+  }
 }
 
diff --git a/src/zm_remote_camera.h b/src/zm_remote_camera.h
index 04823db91..6add0398a 100644
--- a/src/zm_remote_camera.h
+++ b/src/zm_remote_camera.h
@@ -35,45 +35,60 @@
 class RemoteCamera : public Camera
 {
 protected:
-	std::string	protocol;
-	std::string	host;
-	std::string	port;
-	std::string	path;
-	std::string	auth;
-	std::string	username;
-	std::string	password;
-	std::string	auth64;
+  std::string  protocol;
+  std::string  host;
+  std::string  port;
+  std::string  path;
+  std::string  auth;
+  std::string  username;
+  std::string  password;
+  std::string  auth64;
 
-    // Reworked authentication system
-    // First try without authentication, even if we have a username and password
-    // on receiving a 401 response, select authentication method (basic or digest)
-    // fill required fields and set needAuth
-    // subsequent requests can set the required authentication header.
-    bool mNeedAuth;
-    zm::Authenticator* mAuthenticator;
+  // Reworked authentication system
+  // First try without authentication, even if we have a username and password
+  // on receiving a 401 response, select authentication method (basic or digest)
+  // fill required fields and set needAuth
+  // subsequent requests can set the required authentication header.
+  bool mNeedAuth;
+  zm::Authenticator* mAuthenticator;
 protected:
-	struct addrinfo *hp;
+  struct addrinfo *hp;
 
 public:
-	RemoteCamera( int p_id, const std::string &p_proto, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	virtual ~RemoteCamera();
+  RemoteCamera(
+    int p_id,
+    const std::string &p_proto,
+    const std::string &p_host,
+    const std::string &p_port,
+    const std::string &p_path,
+    int p_width,
+    int p_height,
+    int p_colours,
+    int p_brightness,
+    int p_contrast,
+    int p_hue,
+    int p_colour,
+    bool p_capture,
+    bool p_record_audio
+  );
+  virtual ~RemoteCamera();
 
-	const std::string &Protocol() const { return( protocol ); }
-	const std::string &Host() const { return( host ); }
-	const std::string &Port() const { return( port ); }
-	const std::string &Path() const { return( path ); }
-	const std::string &Auth() const { return( auth ); }
-	const std::string &Username() const { return( username ); }
-	const std::string &Password() const { return( password ); }
+  const std::string &Protocol() const { return( protocol ); }
+  const std::string &Host() const { return( host ); }
+  const std::string &Port() const { return( port ); }
+  const std::string &Path() const { return( path ); }
+  const std::string &Auth() const { return( auth ); }
+  const std::string &Username() const { return( username ); }
+  const std::string &Password() const { return( password ); }
 
-	virtual void Initialise();
-	virtual void Terminate() = 0;
-	virtual int Connect() = 0;
-	virtual int Disconnect() = 0;
-	virtual int PreCapture() = 0;
-	virtual int Capture( Image &image ) = 0;
-	virtual int PostCapture() = 0;
-    	virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory )=0;
+  virtual void Initialise();
+  virtual void Terminate() = 0;
+  virtual int Connect() = 0;
+  virtual int Disconnect() = 0;
+  virtual int PreCapture() = 0;
+  virtual int Capture( Image &image ) = 0;
+  virtual int PostCapture() = 0;
+  virtual int CaptureAndRecord( Image &image, bool recording, char* event_directory )=0;
 };
 
 #endif // ZM_REMOTE_CAMERA_H
diff --git a/src/zm_remote_camera_http.cpp b/src/zm_remote_camera_http.cpp
index 006f80faf..02641632d 100644
--- a/src/zm_remote_camera_http.cpp
+++ b/src/zm_remote_camera_http.cpp
@@ -31,121 +31,148 @@
 #include <sys/filio.h> // FIONREAD and friends
 #endif
 
-RemoteCameraHttp::RemoteCameraHttp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    RemoteCamera( p_id, "http", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture )
+RemoteCameraHttp::RemoteCameraHttp(
+  int p_id,
+  const std::string &p_method,
+  const std::string &p_host,
+  const std::string &p_port,
+  const std::string &p_path,
+  int p_width, int p_height,
+  int p_colours,
+  int p_brightness,
+  int p_contrast,
+  int p_hue,
+  int p_colour,
+  bool p_capture,
+  bool p_record_audio ) :
+  RemoteCamera(
+    p_id,
+    "http",
+    p_host,
+    p_port,
+    p_path,
+    p_width,
+    p_height,
+    p_colours,
+    p_brightness,
+    p_contrast,
+    p_hue,
+    p_colour,
+    p_capture,
+    p_record_audio )
 {
-    sd = -1;
+  sd = -1;
 
-    timeout.tv_sec = 0;
-    timeout.tv_usec = 0;
+  timeout.tv_sec = 0;
+  timeout.tv_usec = 0;
 
-    if ( p_method == "simple" )
-        method = SIMPLE;
-    else if ( p_method == "regexp" )
-        method = REGEXP;
-    else
-        Fatal( "Unrecognised method '%s' when creating HTTP camera %d", p_method.c_str(), id );
-    if ( capture )
-    {
-        Initialise();
-    }
+  if ( p_method == "simple" )
+    method = SIMPLE;
+  else if ( p_method == "regexp" )
+    method = REGEXP;
+  else
+    Fatal( "Unrecognised method '%s' when creating HTTP camera %d", p_method.c_str(), id );
+  if ( capture )
+  {
+    Initialise();
+  }
 }
 
 RemoteCameraHttp::~RemoteCameraHttp()
 {
-    if ( capture )
-    {
-        Terminate();
-    }
+  if ( capture )
+  {
+    Terminate();
+  }
 }
 
 void RemoteCameraHttp::Initialise()
 {
-    RemoteCamera::Initialise();
+  RemoteCamera::Initialise();
 
-    if ( request.empty() )
-    {
-        request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
-        request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
-        request += stringtf( "Host: %s\r\n", host.c_str());
-        if ( strcmp( config.http_version, "1.0" ) == 0 )
-            request += stringtf( "Connection: Keep-Alive\r\n" );
-        if ( !auth.empty() )
-            request += stringtf( "Authorization: Basic %s\r\n", auth64.c_str() );
-        request += "\r\n";
-        Debug( 2, "Request: %s", request.c_str() );
-    }
+  if ( request.empty() )
+  {
+    request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
+    request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
+    request += stringtf( "Host: %s\r\n", host.c_str());
+    if ( strcmp( config.http_version, "1.0" ) == 0 )
+      request += stringtf( "Connection: Keep-Alive\r\n" );
+    if ( !auth.empty() )
+      request += stringtf( "Authorization: Basic %s\r\n", auth64.c_str() );
+    request += "\r\n";
+    Debug( 2, "Request: %s", request.c_str() );
+  }
 
-    if ( !timeout.tv_sec )
-    {
-        timeout.tv_sec = config.http_timeout/1000; 
-        timeout.tv_usec = (config.http_timeout%1000)*1000;
-    }
+  if ( !timeout.tv_sec )
+  {
+    timeout.tv_sec = config.http_timeout/1000; 
+    timeout.tv_usec = (config.http_timeout%1000)*1000;
+  }
 
-    int max_size = width*height*colours;
+  int max_size = width*height*colours;
 
-    buffer.size( max_size );
+  buffer.size( max_size );
 
-    mode = SINGLE_IMAGE;
-    format = UNDEF;
-    state = HEADER;
+  mode = SINGLE_IMAGE;
+  format = UNDEF;
+  state = HEADER;
 }
 
 int RemoteCameraHttp::Connect()
 {
-    struct addrinfo *p;
+  struct addrinfo *p;
 
-    for(p = hp; p != NULL; p = p->ai_next)
+  for(p = hp; p != NULL; p = p->ai_next)
+  {
+    sd = socket( p->ai_family, p->ai_socktype, p->ai_protocol );
+    if ( sd < 0 )
     {
-        sd = socket( p->ai_family, p->ai_socktype, p->ai_protocol );
-        if ( sd < 0 )
-        {
-            Warning("Can't create socket: %s", strerror(errno) );
-            continue;
-        }
-
-        if ( connect( sd, p->ai_addr, p->ai_addrlen ) < 0 )
-        {
-            close(sd);
-            sd = -1;
-            Warning("Can't connect to remote camera: %s", strerror(errno) );
-            continue;
-        }
-
-	/* If we got here, we must have connected successfully */
-	break;
+      Warning("Can't create socket: %s", strerror(errno) );
+      continue;
     }
 
-    if(p == NULL) {
-	    Error("Unable to connect to the remote camera, aborting");
-	    return( -1 );
+    if ( connect( sd, p->ai_addr, p->ai_addrlen ) < 0 )
+    {
+      close(sd);
+      sd = -1;
+      Warning("Can't connect to remote camera: %s", strerror(errno) );
+      continue;
     }
 
-    Debug( 3, "Connected to host, socket = %d", sd );
-    return( sd );
+  /* If we got here, we must have connected successfully */
+  break;
+  }
+
+  if(p == NULL) {
+    Error("Unable to connect to the remote camera, aborting");
+    return( -1 );
+  }
+
+  Debug( 3, "Connected to host, socket = %d", sd );
+  return( sd );
 }
 
 int RemoteCameraHttp::Disconnect()
 {
-    close( sd );
-    sd = -1;
-    Debug( 3, "Disconnected from host" );
-    return( 0 );
+  close( sd );
+  sd = -1;
+  Debug( 3, "Disconnected from host" );
+  return( 0 );
 }
 
 int RemoteCameraHttp::SendRequest()
 {
-	Debug( 2, "Sending request: %s", request.c_str() );
-    if ( write( sd, request.data(), request.length() ) < 0 )
-    {
-        Error( "Can't write: %s", strerror(errno) );
-        Disconnect();
-        return( -1 );
-    }
-    format = UNDEF;
-    state = HEADER;
-    Debug( 3, "Request sent" );
-    return( 0 );
+  Debug( 2, "Sending request: %s", request.c_str() );
+  if ( write( sd, request.data(), request.length() ) < 0 )
+  {
+    Error( "Can't write: %s", strerror(errno) );
+    Disconnect();
+    return( -1 );
+  }
+  format = UNDEF;
+  state = HEADER;
+  Debug( 3, "Request sent" );
+  return( 0 );
 }
 
 /* Return codes are as follows:
@@ -156,1037 +183,1037 @@ int RemoteCameraHttp::SendRequest()
 
 int RemoteCameraHttp::ReadData( Buffer &buffer, int bytes_expected )
 {
-    fd_set rfds;
-    FD_ZERO(&rfds);
-    FD_SET(sd, &rfds);
+  fd_set rfds;
+  FD_ZERO(&rfds);
+  FD_SET(sd, &rfds);
 
-    struct timeval temp_timeout = timeout;
+  struct timeval temp_timeout = timeout;
 
-    int n_found = select( sd+1, &rfds, NULL, NULL, &temp_timeout );
-    if( n_found == 0 )
+  int n_found = select( sd+1, &rfds, NULL, NULL, &temp_timeout );
+  if( n_found == 0 )
+  {
+    Debug( 4, "Select timed out timeout was %d secs %d usecs", temp_timeout.tv_sec, temp_timeout.tv_usec );
+    // Why are we disconnecting?  It's just a timeout, meaning that data wasn't available.
+    //Disconnect();
+    return( 0 );
+  }
+  else if ( n_found < 0)
+  {
+    Error( "Select error: %s", strerror(errno) );
+    return( -1 );
+  }
+
+  int total_bytes_to_read = 0;
+
+  if ( bytes_expected )
+  {
+    total_bytes_to_read = bytes_expected;
+  }
+  else
+  {
+    if ( ioctl( sd, FIONREAD, &total_bytes_to_read ) < 0 )
     {
-        Debug( 4, "Select timed out timeout was %d secs %d usecs", temp_timeout.tv_sec, temp_timeout.tv_usec );
-		// Why are we disconnecting?  It's just a timeout, meaning that data wasn't available.
-        //Disconnect();
-        return( 0 );
-    }
-    else if ( n_found < 0)
-    {
-        Error( "Select error: %s", strerror(errno) );
-        return( -1 );
+      Error( "Can't ioctl(): %s", strerror(errno) );
+      return( -1 );
     }
 
-    int total_bytes_to_read = 0;
-
-    if ( bytes_expected )
+    if ( total_bytes_to_read == 0 )
     {
-        total_bytes_to_read = bytes_expected;
+      // If socket is closed locally, then select will fail, but if it is closed remotely
+      // then we have an exception on our socket.. but no data.
+      Debug( 3, "Socket closed remotely" );
+      //Disconnect(); // Disconnect is done outside of ReadData now.
+      return( -1 );
     }
-    else
-    {
-        if ( ioctl( sd, FIONREAD, &total_bytes_to_read ) < 0 )
-        {
-            Error( "Can't ioctl(): %s", strerror(errno) );
-            return( -1 );
-        }
 
-        if ( total_bytes_to_read == 0 )
-        {
-			// If socket is closed locally, then select will fail, but if it is closed remotely
-			// then we have an exception on our socket.. but no data.
-            Debug( 3, "Socket closed remotely" );
-            //Disconnect(); // Disconnect is done outside of ReadData now.
-            return( -1 );
-        }
-
-		// There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily.
-		if ( total_bytes_to_read > ZM_NETWORK_BUFSIZ ) {
-			total_bytes_to_read = ZM_NETWORK_BUFSIZ;
-			Debug(3, "Just getting 32K" );
-		} else {
-			Debug(3, "Just getting %d", total_bytes_to_read );
-		}
-	}
-	Debug( 3, "Expecting %d bytes", total_bytes_to_read );
-
-    int total_bytes_read = 0;
-    do
-    {
-		int bytes_read = buffer.read_into( sd, total_bytes_to_read );
-        if ( bytes_read < 0)
-        {
-            Error( "Read error: %s", strerror(errno) );
-            return( -1 );
-        }
-        else if ( bytes_read == 0)
-        {
-            Debug( 2, "Socket closed" );
-            //Disconnect(); // Disconnect is done outside of ReadData now.
-            return( -1 );
-        }
-        else if ( bytes_read < total_bytes_to_read )
-        {
-            Error( "Incomplete read, expected %d, got %d", total_bytes_to_read, bytes_read );
-            return( -1 );
-        }
-        Debug( 3, "Read %d bytes", bytes_read );
-        total_bytes_read += bytes_read;
-        total_bytes_to_read -= bytes_read;
+    // There can be lots of bytes available.  I've seen 4MB or more. This will vastly inflate our buffer size unnecessarily.
+    if ( total_bytes_to_read > ZM_NETWORK_BUFSIZ ) {
+      total_bytes_to_read = ZM_NETWORK_BUFSIZ;
+      Debug(3, "Just getting 32K" );
+    } else {
+      Debug(3, "Just getting %d", total_bytes_to_read );
     }
-    while ( total_bytes_to_read );
+  }
+  Debug( 3, "Expecting %d bytes", total_bytes_to_read );
 
-	Debug( 4, buffer );
+  int total_bytes_read = 0;
+  do
+  {
+    int bytes_read = buffer.read_into( sd, total_bytes_to_read );
+    if ( bytes_read < 0)
+    {
+      Error( "Read error: %s", strerror(errno) );
+      return( -1 );
+    }
+    else if ( bytes_read == 0)
+    {
+      Debug( 2, "Socket closed" );
+      //Disconnect(); // Disconnect is done outside of ReadData now.
+      return( -1 );
+    }
+    else if ( bytes_read < total_bytes_to_read )
+    {
+      Error( "Incomplete read, expected %d, got %d", total_bytes_to_read, bytes_read );
+      return( -1 );
+    }
+    Debug( 3, "Read %d bytes", bytes_read );
+    total_bytes_read += bytes_read;
+    total_bytes_to_read -= bytes_read;
+  }
+  while ( total_bytes_to_read );
 
-    return( total_bytes_read );
+  Debug( 4, buffer );
+
+  return( total_bytes_read );
 }
 
 int RemoteCameraHttp::GetResponse()
 {
-	int buffer_len;
+  int buffer_len;
 #if HAVE_LIBPCRE
+  if ( method == REGEXP )
+  {
+    const char *header = 0;
+    int header_len = 0;
+    const char *http_version = 0;
+    int status_code = 0;
+    const char *status_mesg = 0;
+    const char *connection_type = "";
+    int content_length = 0;
+    const char *content_type = "";
+    const char *content_boundary = "";
+    const char *subheader = 0;
+    int subheader_len = 0;
+    //int subcontent_length = 0;
+    //const char *subcontent_type = "";
+
+    while ( true )
+    {
+      switch( state )
+      {
+        case HEADER :
+        {
+          static RegExpr *header_expr = 0;
+          static RegExpr *status_expr = 0;
+          static RegExpr *connection_expr = 0;
+          static RegExpr *content_length_expr = 0;
+          static RegExpr *content_type_expr = 0;
+
+          while ( ! ( buffer_len = ReadData( buffer ) ) ) {
+          }
+            if ( buffer_len < 0 ) {
+              Error( "Unable to read header data" );
+              return( -1 );
+            }
+          if ( !header_expr )
+            header_expr = new RegExpr( "^(.+?\r?\n\r?\n)", PCRE_DOTALL );
+          if ( header_expr->Match( (char*)buffer, buffer.size() ) == 2 )
+          {
+            header = header_expr->MatchString( 1 );
+            header_len = header_expr->MatchLength( 1 );
+            Debug( 4, "Captured header (%d bytes):\n'%s'", header_len, header );
+
+            if ( !status_expr )
+              status_expr = new RegExpr( "^HTTP/(1\\.[01]) +([0-9]+) +(.+?)\r?\n", PCRE_CASELESS );
+            if ( status_expr->Match( header, header_len ) < 4 )
+            {
+              Error( "Unable to extract HTTP status from header" );
+              return( -1 );
+            }
+            http_version = status_expr->MatchString( 1 );
+            status_code = atoi( status_expr->MatchString( 2 ) );
+            status_mesg = status_expr->MatchString( 3 );
+
+            if ( status_code == 401 ) {
+              if ( mNeedAuth ) {
+                Error( "Failed authentication: " );
+                return( -1 );
+              }
+              mNeedAuth = true;
+              std::string Header = header;
+        
+              mAuthenticator->checkAuthResponse(Header);
+              if ( mAuthenticator->auth_method() == zm::AUTH_DIGEST ) {
+                Debug( 2, "Need Digest Authentication" );
+                request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
+                request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
+                request += stringtf( "Host: %s\r\n", host.c_str());
+                if ( strcmp( config.http_version, "1.0" ) == 0 )
+                  request += stringtf( "Connection: Keep-Alive\r\n" );
+                request += mAuthenticator->getAuthHeader( "GET", path.c_str() );
+                request += "\r\n";
+                
+                Debug( 2, "New request header: %s", request.c_str() );
+                return( 0 );
+              } 
+
+            } else if ( status_code < 200 || status_code > 299 ) {
+              Error( "Invalid response status %d: %s\n%s", status_code, status_mesg, (char *)buffer );
+              return( -1 );
+            }
+            Debug( 3, "Got status '%d' (%s), http version %s", status_code, status_mesg, http_version );
+
+            if ( !connection_expr )
+              connection_expr = new RegExpr( "Connection: ?(.+?)\r?\n", PCRE_CASELESS );
+            if ( connection_expr->Match( header, header_len ) == 2 )
+            {
+              connection_type = connection_expr->MatchString( 1 );
+              Debug( 3, "Got connection '%s'", connection_type );
+            }
+
+            if ( !content_length_expr )
+              content_length_expr = new RegExpr( "Content-length: ?([0-9]+)\r?\n", PCRE_CASELESS );
+            if ( content_length_expr->Match( header, header_len ) == 2 )
+            {
+              content_length = atoi( content_length_expr->MatchString( 1 ) );
+              Debug( 3, "Got content length '%d'", content_length );
+            }
+
+            if ( !content_type_expr )
+              content_type_expr = new RegExpr( "Content-type: ?(.+?)(?:; ?boundary=(.+?))?\r?\n", PCRE_CASELESS );
+            if ( content_type_expr->Match( header, header_len ) >= 2 )
+            {
+              content_type = content_type_expr->MatchString( 1 );
+              Debug( 3, "Got content type '%s'\n", content_type );
+              if ( content_type_expr->MatchCount() > 2 )
+              {
+                content_boundary = content_type_expr->MatchString( 2 );
+                Debug( 3, "Got content boundary '%s'", content_boundary );
+              }
+            }
+
+            if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
+            {
+              // Single image
+              mode = SINGLE_IMAGE;
+              format = JPEG;
+              state = CONTENT;
+            }
+            else if ( !strcasecmp( content_type, "image/x-rgb" ) )
+            {
+              // Single image
+              mode = SINGLE_IMAGE;
+              format = X_RGB;
+              state = CONTENT;
+            }
+            else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
+            {
+              // Single image
+              mode = SINGLE_IMAGE;
+              format = X_RGBZ;
+              state = CONTENT;
+            }
+            else if ( !strcasecmp( content_type, "multipart/x-mixed-replace" ) )
+            {
+              // Image stream, so start processing
+              if ( !content_boundary[0] )
+              {
+                Error( "No content boundary found in header '%s'", header );
+                return( -1 );
+              }
+              mode = MULTI_IMAGE;
+              state = SUBHEADER;
+            }
+            //else if ( !strcasecmp( content_type, "video/mpeg" ) || !strcasecmp( content_type, "video/mpg" ) )
+            //{
+              //// MPEG stream, coming soon!
+            //}
+            else
+            {
+              Error( "Unrecognised content type '%s'", content_type );
+              return( -1 );
+            }
+            buffer.consume( header_len );
+          }
+          else
+          {
+            Debug( 3, "Unable to extract header from stream, retrying" );
+            //return( -1 );
+          }
+          break;
+        }
+        case SUBHEADER :
+        {
+          static RegExpr *subheader_expr = 0;
+          static RegExpr *subcontent_length_expr = 0;
+          static RegExpr *subcontent_type_expr = 0;
+
+          if ( !subheader_expr )
+          {
+            char subheader_pattern[256] = "";
+            snprintf( subheader_pattern, sizeof(subheader_pattern), "^((?:\r?\n){0,2}?(?:--)?%s\r?\n.+?\r?\n\r?\n)", content_boundary );
+            subheader_expr = new RegExpr( subheader_pattern, PCRE_DOTALL );
+          }
+          if ( subheader_expr->Match( (char *)buffer, (int)buffer ) == 2 )
+          {
+            subheader = subheader_expr->MatchString( 1 );
+            subheader_len = subheader_expr->MatchLength( 1 );
+            Debug( 4, "Captured subheader (%d bytes):'%s'", subheader_len, subheader );
+
+            if ( !subcontent_length_expr )
+              subcontent_length_expr = new RegExpr( "Content-length: ?([0-9]+)\r?\n", PCRE_CASELESS );
+            if ( subcontent_length_expr->Match( subheader, subheader_len ) == 2 )
+            {
+              content_length = atoi( subcontent_length_expr->MatchString( 1 ) );
+              Debug( 3, "Got subcontent length '%d'", content_length );
+            }
+
+            if ( !subcontent_type_expr )
+              subcontent_type_expr = new RegExpr( "Content-type: ?(.+?)\r?\n", PCRE_CASELESS );
+            if ( subcontent_type_expr->Match( subheader, subheader_len ) == 2 )
+            {
+              content_type = subcontent_type_expr->MatchString( 1 );
+              Debug( 3, "Got subcontent type '%s'", content_type );
+            }
+
+            buffer.consume( subheader_len );
+            state = CONTENT;
+          }
+          else
+          {
+            Debug( 3, "Unable to extract subheader from stream, retrying" );
+            while ( ! ( buffer_len = ReadData( buffer ) ) ) {
+            }
+              if ( buffer_len < 0 ) {
+                Error( "Unable to extract subheader data" );
+                return( -1 );
+              }
+          }
+          break;
+        }
+        case CONTENT :
+        {
+
+          // if content_type is something like image/jpeg;size=, this will strip the ;size=
+          char * semicolon = strchr( (char *)content_type, ';' );
+          if ( semicolon ) {
+            *semicolon = '\0';
+          }
+
+          if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
+          {
+            format = JPEG;
+          }
+          else if ( !strcasecmp( content_type, "image/x-rgb" ) )
+          {
+            format = X_RGB;
+          }
+          else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
+          {
+            format = X_RGBZ;
+          }
+          else
+          {
+            Error( "Found unsupported content type '%s'", content_type );
+            return( -1 );
+          }
+
+          if ( content_length )
+          {
+            while ( (long)buffer.size() < content_length )
+            {
+Debug(3, "Need more data buffer %d < content length %d", buffer.size(), content_length );
+              if ( ReadData( buffer ) < 0 ) {
+                Error( "Unable to read content" );
+                return( -1 );
+              }
+            }
+            Debug( 3, "Got end of image by length, content-length = %d", content_length );
+          }
+          else
+          {
+            while ( !content_length )
+            {
+              while ( ! ( buffer_len = ReadData( buffer ) ) ) {
+              }
+                if ( buffer_len < 0 ) {
+                  Error( "Unable to read content" );
+                  return( -1 );
+                }
+              static RegExpr *content_expr = 0;
+              if ( mode == MULTI_IMAGE )
+              {
+                if ( !content_expr )
+                {
+                  char content_pattern[256] = "";
+                  snprintf( content_pattern, sizeof(content_pattern), "^(.+?)(?:\r?\n)*(?:--)?%s\r?\n", content_boundary );
+                  content_expr = new RegExpr( content_pattern, PCRE_DOTALL );
+                }
+                if ( content_expr->Match( buffer, buffer.size() ) == 2 )
+                {
+                  content_length = content_expr->MatchLength( 1 );
+                  Debug( 3, "Got end of image by pattern, content-length = %d", content_length );
+                }
+              }
+            }
+          }
+          if ( mode == SINGLE_IMAGE )
+          {
+            state = HEADER;
+            Disconnect();
+          }
+          else
+          {
+            state = SUBHEADER;
+          }
+          Debug( 3, "Returning %d (%d) bytes of captured content", content_length, buffer.size() );
+          return( content_length );
+        }
+        case HEADERCONT :
+        case SUBHEADERCONT :
+        {
+          // Ignore
+          break;
+        }
+      }
+    }
+  }
+  else
+#endif // HAVE_LIBPCRE
+  {
     if ( method == REGEXP )
     {
-        const char *header = 0;
-        int header_len = 0;
-        const char *http_version = 0;
-        int status_code = 0;
-        const char *status_mesg = 0;
-        const char *connection_type = "";
-        int content_length = 0;
-        const char *content_type = "";
-        const char *content_boundary = "";
-        const char *subheader = 0;
-        int subheader_len = 0;
-        //int subcontent_length = 0;
-        //const char *subcontent_type = "";
-
-        while ( true )
-        {
-            switch( state )
-            {
-                case HEADER :
-                {
-                    static RegExpr *header_expr = 0;
-                    static RegExpr *status_expr = 0;
-                    static RegExpr *connection_expr = 0;
-                    static RegExpr *content_length_expr = 0;
-                    static RegExpr *content_type_expr = 0;
-
-					while ( ! ( buffer_len = ReadData( buffer ) ) ) {
-                    }
-						if ( buffer_len < 0 ) {
-							Error( "Unable to read header data" );
-							return( -1 );
-						}
-                    if ( !header_expr )
-                        header_expr = new RegExpr( "^(.+?\r?\n\r?\n)", PCRE_DOTALL );
-                    if ( header_expr->Match( (char*)buffer, buffer.size() ) == 2 )
-                    {
-                        header = header_expr->MatchString( 1 );
-                        header_len = header_expr->MatchLength( 1 );
-                        Debug( 4, "Captured header (%d bytes):\n'%s'", header_len, header );
-
-                        if ( !status_expr )
-                            status_expr = new RegExpr( "^HTTP/(1\\.[01]) +([0-9]+) +(.+?)\r?\n", PCRE_CASELESS );
-                        if ( status_expr->Match( header, header_len ) < 4 )
-                        {
-                            Error( "Unable to extract HTTP status from header" );
-                            return( -1 );
-                        }
-                        http_version = status_expr->MatchString( 1 );
-                        status_code = atoi( status_expr->MatchString( 2 ) );
-                        status_mesg = status_expr->MatchString( 3 );
-
-						if ( status_code == 401 ) {
-							if ( mNeedAuth ) {
-								Error( "Failed authentication: " );
-								return( -1 );
-							}
-							mNeedAuth = true;
-							std::string Header = header;
-				
-							mAuthenticator->checkAuthResponse(Header);
-							if ( mAuthenticator->auth_method() == zm::AUTH_DIGEST ) {
-								Debug( 2, "Need Digest Authentication" );
-								request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
-								request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
-								request += stringtf( "Host: %s\r\n", host.c_str());
-								if ( strcmp( config.http_version, "1.0" ) == 0 )
-									request += stringtf( "Connection: Keep-Alive\r\n" );
-								request += mAuthenticator->getAuthHeader( "GET", path.c_str() );
-								request += "\r\n";
-								
-								Debug( 2, "New request header: %s", request.c_str() );
-								return( 0 );
-							} 
-
-                        } else if ( status_code < 200 || status_code > 299 ) {
-                            Error( "Invalid response status %d: %s\n%s", status_code, status_mesg, (char *)buffer );
-                            return( -1 );
-                        }
-                        Debug( 3, "Got status '%d' (%s), http version %s", status_code, status_mesg, http_version );
-
-                        if ( !connection_expr )
-                            connection_expr = new RegExpr( "Connection: ?(.+?)\r?\n", PCRE_CASELESS );
-                        if ( connection_expr->Match( header, header_len ) == 2 )
-                        {
-                            connection_type = connection_expr->MatchString( 1 );
-                            Debug( 3, "Got connection '%s'", connection_type );
-                        }
-
-                        if ( !content_length_expr )
-                            content_length_expr = new RegExpr( "Content-length: ?([0-9]+)\r?\n", PCRE_CASELESS );
-                        if ( content_length_expr->Match( header, header_len ) == 2 )
-                        {
-                            content_length = atoi( content_length_expr->MatchString( 1 ) );
-                            Debug( 3, "Got content length '%d'", content_length );
-                        }
-
-                        if ( !content_type_expr )
-                            content_type_expr = new RegExpr( "Content-type: ?(.+?)(?:; ?boundary=(.+?))?\r?\n", PCRE_CASELESS );
-                        if ( content_type_expr->Match( header, header_len ) >= 2 )
-                        {
-                            content_type = content_type_expr->MatchString( 1 );
-                            Debug( 3, "Got content type '%s'\n", content_type );
-                            if ( content_type_expr->MatchCount() > 2 )
-                            {
-                                content_boundary = content_type_expr->MatchString( 2 );
-                                Debug( 3, "Got content boundary '%s'", content_boundary );
-                            }
-                        }
-
-                        if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
-                        {
-                            // Single image
-                            mode = SINGLE_IMAGE;
-                            format = JPEG;
-                            state = CONTENT;
-                        }
-                        else if ( !strcasecmp( content_type, "image/x-rgb" ) )
-                        {
-                            // Single image
-                            mode = SINGLE_IMAGE;
-                            format = X_RGB;
-                            state = CONTENT;
-                        }
-                        else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
-                        {
-                            // Single image
-                            mode = SINGLE_IMAGE;
-                            format = X_RGBZ;
-                            state = CONTENT;
-                        }
-                        else if ( !strcasecmp( content_type, "multipart/x-mixed-replace" ) )
-                        {
-                            // Image stream, so start processing
-                            if ( !content_boundary[0] )
-                            {
-                                Error( "No content boundary found in header '%s'", header );
-                                return( -1 );
-                            }
-                            mode = MULTI_IMAGE;
-                            state = SUBHEADER;
-                        }
-                        //else if ( !strcasecmp( content_type, "video/mpeg" ) || !strcasecmp( content_type, "video/mpg" ) )
-                        //{
-                            //// MPEG stream, coming soon!
-                        //}
-                        else
-                        {
-                            Error( "Unrecognised content type '%s'", content_type );
-                            return( -1 );
-                        }
-                        buffer.consume( header_len );
-                    }
-                    else
-                    {
-                        Debug( 3, "Unable to extract header from stream, retrying" );
-                        //return( -1 );
-                    }
-                    break;
-                }
-                case SUBHEADER :
-                {
-                    static RegExpr *subheader_expr = 0;
-                    static RegExpr *subcontent_length_expr = 0;
-                    static RegExpr *subcontent_type_expr = 0;
-
-                    if ( !subheader_expr )
-                    {
-                        char subheader_pattern[256] = "";
-                        snprintf( subheader_pattern, sizeof(subheader_pattern), "^((?:\r?\n){0,2}?(?:--)?%s\r?\n.+?\r?\n\r?\n)", content_boundary );
-                        subheader_expr = new RegExpr( subheader_pattern, PCRE_DOTALL );
-                    }
-                    if ( subheader_expr->Match( (char *)buffer, (int)buffer ) == 2 )
-                    {
-                        subheader = subheader_expr->MatchString( 1 );
-                        subheader_len = subheader_expr->MatchLength( 1 );
-                        Debug( 4, "Captured subheader (%d bytes):'%s'", subheader_len, subheader );
-
-                        if ( !subcontent_length_expr )
-                            subcontent_length_expr = new RegExpr( "Content-length: ?([0-9]+)\r?\n", PCRE_CASELESS );
-                        if ( subcontent_length_expr->Match( subheader, subheader_len ) == 2 )
-                        {
-                            content_length = atoi( subcontent_length_expr->MatchString( 1 ) );
-                            Debug( 3, "Got subcontent length '%d'", content_length );
-                        }
-
-                        if ( !subcontent_type_expr )
-                            subcontent_type_expr = new RegExpr( "Content-type: ?(.+?)\r?\n", PCRE_CASELESS );
-                        if ( subcontent_type_expr->Match( subheader, subheader_len ) == 2 )
-                        {
-                            content_type = subcontent_type_expr->MatchString( 1 );
-                            Debug( 3, "Got subcontent type '%s'", content_type );
-                        }
-
-                        buffer.consume( subheader_len );
-                        state = CONTENT;
-                    }
-                    else
-                    {
-                        Debug( 3, "Unable to extract subheader from stream, retrying" );
-						while ( ! ( buffer_len = ReadData( buffer ) ) ) {
-                        }
-							if ( buffer_len < 0 ) {
-								Error( "Unable to extract subheader data" );
-								return( -1 );
-							}
-                    }
-                    break;
-                }
-                case CONTENT :
-                {
-
-					// if content_type is something like image/jpeg;size=, this will strip the ;size=
-					char * semicolon = strchr( (char *)content_type, ';' );
-					if ( semicolon ) {
-						*semicolon = '\0';
-					}
-
-                    if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
-                    {
-                        format = JPEG;
-                    }
-                    else if ( !strcasecmp( content_type, "image/x-rgb" ) )
-                    {
-                        format = X_RGB;
-                    }
-                    else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
-                    {
-                        format = X_RGBZ;
-                    }
-                    else
-                    {
-                        Error( "Found unsupported content type '%s'", content_type );
-                        return( -1 );
-                    }
-
-                    if ( content_length )
-                    {
-                        while ( (long)buffer.size() < content_length )
-                        {
-Debug(3, "Need more data buffer %d < content length %d", buffer.size(), content_length );
-                            if ( ReadData( buffer ) < 0 ) {
-                                Error( "Unable to read content" );
-                                return( -1 );
-                            }
-                        }
-                        Debug( 3, "Got end of image by length, content-length = %d", content_length );
-                    }
-                    else
-                    {
-                        while ( !content_length )
-                        {
-							while ( ! ( buffer_len = ReadData( buffer ) ) ) {
-                            }
-								if ( buffer_len < 0 ) {
-									Error( "Unable to read content" );
-									return( -1 );
-								}
-                            static RegExpr *content_expr = 0;
-							if ( mode == MULTI_IMAGE )
-							{
-								if ( !content_expr )
-								{
-									char content_pattern[256] = "";
-									snprintf( content_pattern, sizeof(content_pattern), "^(.+?)(?:\r?\n)*(?:--)?%s\r?\n", content_boundary );
-									content_expr = new RegExpr( content_pattern, PCRE_DOTALL );
-								}
-								if ( content_expr->Match( buffer, buffer.size() ) == 2 )
-								{
-									content_length = content_expr->MatchLength( 1 );
-									Debug( 3, "Got end of image by pattern, content-length = %d", content_length );
-								}
-                            }
-                        }
-                    }
-                    if ( mode == SINGLE_IMAGE )
-                    {
-                        state = HEADER;
-                        Disconnect();
-                    }
-                    else
-                    {
-                        state = SUBHEADER;
-                    }
-                    Debug( 3, "Returning %d (%d) bytes of captured content", content_length, buffer.size() );
-                    return( content_length );
-                }
-                case HEADERCONT :
-                case SUBHEADERCONT :
-                {
-                    // Ignore
-                    break;
-                }
-            }
-        }
+      Warning( "Unable to use netcam regexps as not compiled with libpcre" );
     }
-    else
-#endif // HAVE_LIBPCRE
+    static const char *http_match = "HTTP/";
+    static const char *connection_match = "Connection:";
+    static const char *content_length_match = "Content-length:";
+    static const char *content_type_match = "Content-type:";
+    static const char *boundary_match = "boundary=";
+    static const char *authenticate_match = "WWW-Authenticate:";
+    static int http_match_len = 0;
+    static int connection_match_len = 0;
+    static int content_length_match_len = 0;
+    static int content_type_match_len = 0;
+    static int boundary_match_len = 0;
+    static int authenticate_match_len = 0;
+
+    if ( !http_match_len )
+      http_match_len = strlen( http_match );
+    if ( !connection_match_len )
+      connection_match_len = strlen( connection_match );
+    if ( !content_length_match_len )
+      content_length_match_len = strlen( content_length_match );
+    if ( !content_type_match_len )
+      content_type_match_len = strlen( content_type_match );
+    if ( !boundary_match_len )
+      boundary_match_len = strlen( boundary_match );
+    if ( !authenticate_match_len )
+      authenticate_match_len = strlen( authenticate_match );
+
+    static int n_headers;
+    //static char *headers[32];
+
+    static int n_subheaders;
+    //static char *subheaders[32];
+
+    static char *http_header;
+    static char *connection_header;
+    static char *content_length_header;
+    static char *content_type_header;
+    static char *boundary_header;
+    static char *authenticate_header;
+    static char subcontent_length_header[32];
+    static char subcontent_type_header[64];
+  
+    static char http_version[16];
+    static char status_code[16];
+    static char status_mesg[256];
+    static char connection_type[32];
+    static int content_length;
+    static char content_type[32];
+    static char content_boundary[64];
+    static int content_boundary_len;
+
+    while ( true )
     {
-        if ( method == REGEXP )
+      switch( state )
+      {
+        case HEADER :
         {
-            Warning( "Unable to use netcam regexps as not compiled with libpcre" );
+          n_headers = 0;
+          http_header = 0;
+          connection_header = 0;
+          content_length_header = 0;
+          content_type_header = 0;
+          authenticate_header = 0;
+
+          http_version[0] = '\0';
+          status_code [0]= '\0';
+          status_mesg [0]= '\0';
+          connection_type [0]= '\0';
+          content_length = 0;
+          content_type[0] = '\0';
+          content_boundary[0] = '\0';
+          content_boundary_len = 0;
         }
-        static const char *http_match = "HTTP/";
-        static const char *connection_match = "Connection:";
-        static const char *content_length_match = "Content-length:";
-        static const char *content_type_match = "Content-type:";
-        static const char *boundary_match = "boundary=";
-		static const char *authenticate_match = "WWW-Authenticate:";
-        static int http_match_len = 0;
-        static int connection_match_len = 0;
-        static int content_length_match_len = 0;
-        static int content_type_match_len = 0;
-        static int boundary_match_len = 0;
-		static int authenticate_match_len = 0;
-
-        if ( !http_match_len )
-            http_match_len = strlen( http_match );
-        if ( !connection_match_len )
-            connection_match_len = strlen( connection_match );
-        if ( !content_length_match_len )
-            content_length_match_len = strlen( content_length_match );
-        if ( !content_type_match_len )
-            content_type_match_len = strlen( content_type_match );
-        if ( !boundary_match_len )
-            boundary_match_len = strlen( boundary_match );
-        if ( !authenticate_match_len )
-            authenticate_match_len = strlen( authenticate_match );
-
-        static int n_headers;
-        //static char *headers[32];
-
-        static int n_subheaders;
-        //static char *subheaders[32];
-
-        static char *http_header;
-        static char *connection_header;
-        static char *content_length_header;
-        static char *content_type_header;
-        static char *boundary_header;
-		static char *authenticate_header;
-        static char subcontent_length_header[32];
-        static char subcontent_type_header[64];
-    
-        static char http_version[16];
-        static char status_code[16];
-        static char status_mesg[256];
-        static char connection_type[32];
-        static int content_length;
-        static char content_type[32];
-        static char content_boundary[64];
-        static int content_boundary_len;
-
-        while ( true )
+        case HEADERCONT :
         {
-            switch( state )
-            {
-                case HEADER :
-                {
-                    n_headers = 0;
-                    http_header = 0;
-                    connection_header = 0;
-                    content_length_header = 0;
-                    content_type_header = 0;
-					authenticate_header = 0;
-
-                    http_version[0] = '\0';
-                    status_code [0]= '\0';
-                    status_mesg [0]= '\0';
-                    connection_type [0]= '\0';
-                    content_length = 0;
-                    content_type[0] = '\0';
-                    content_boundary[0] = '\0';
-                    content_boundary_len = 0;
-                }
-                case HEADERCONT :
-                {
-					while ( ! ( buffer_len = ReadData( buffer ) ) ) {
-                    }
-						if ( buffer_len < 0 ) {
-							Error( "Unable to read header" );
-							return( -1 );
-						}
-
-                    char *crlf = 0;
-                    char *header_ptr = (char *)buffer;
-                    int header_len = buffer.size();
-                    bool all_headers = false;
-
-                    while( true )
-                    {
-                        int crlf_len = memspn( header_ptr, "\r\n", header_len );
-                        if ( n_headers )
-                        {
-                            if ( (crlf_len == 2 && !strncmp( header_ptr, "\n\n", crlf_len )) || (crlf_len == 4 && !strncmp( header_ptr, "\r\n\r\n", crlf_len )) )
-                            {
-                                *header_ptr = '\0';
-                                header_ptr += crlf_len;
-                                header_len -= buffer.consume( header_ptr-(char *)buffer );
-                                all_headers = true;
-                                break;
-                            }
-                        }
-                        if ( crlf_len )
-                        {
-                            if ( header_len == crlf_len )
-                            {
-                                break;
-                            }
-                            else
-                            {
-                                *header_ptr = '\0';
-                                header_ptr += crlf_len;
-                                header_len -= buffer.consume( header_ptr-(char *)buffer );
-                            }
-                        }
-
-                        Debug( 6, "%s", header_ptr );
-                        if ( (crlf = mempbrk( header_ptr, "\r\n", header_len )) )
-                        {
-                            //headers[n_headers++] = header_ptr;
-                            n_headers++;
-
-                            if ( !http_header && (strncasecmp( header_ptr, http_match, http_match_len ) == 0) )
-                            {
-                                http_header = header_ptr+http_match_len;
-                                Debug( 6, "Got http header '%s'", header_ptr );
-                            }
-                            else if ( !connection_header && (strncasecmp( header_ptr, connection_match, connection_match_len) == 0) )
-                            {
-                                connection_header = header_ptr+connection_match_len;
-                                Debug( 6, "Got connection header '%s'", header_ptr );
-                            }
-                            else if ( !content_length_header && (strncasecmp( header_ptr, content_length_match, content_length_match_len) == 0) )
-                            {
-                                content_length_header = header_ptr+content_length_match_len;
-                                Debug( 6, "Got content length header '%s'", header_ptr );
-                            }
-
-                            else if ( !authenticate_header && (strncasecmp( header_ptr, authenticate_match, authenticate_match_len) == 0) )
-                            {
-                                authenticate_header = header_ptr;
-                                Debug( 6, "Got authenticate header '%s'", header_ptr );
-                            }
-                            else if ( !content_type_header && (strncasecmp( header_ptr, content_type_match, content_type_match_len) == 0) )
-                            {
-                                content_type_header = header_ptr+content_type_match_len;
-                                Debug( 6, "Got content type header '%s'", header_ptr );
-                            }
-                            else
-                            {
-                                Debug( 6, "Got ignored header '%s'", header_ptr );
-                            }
-                            header_ptr = crlf;
-                            header_len -= buffer.consume( header_ptr-(char *)buffer );
-                        }
-                        else
-                        {
-                            // No end of line found
-                            break;
-                        }
-                    }
-
-                    if ( all_headers )
-                    {
-                        char *start_ptr, *end_ptr;
-
-                        if ( !http_header )
-                        {
-                            Error( "Unable to extract HTTP status from header" );
-                            return( -1 );
-                        }
-
-                        start_ptr = http_header;
-                        end_ptr = start_ptr+strspn( start_ptr, "10." );
-
-                        memset( http_version, 0, sizeof(http_version) );
-                        strncpy( http_version, start_ptr, end_ptr-start_ptr );
-
-                        start_ptr = end_ptr;
-                        start_ptr += strspn( start_ptr, " " );
-                        end_ptr = start_ptr+strspn( start_ptr, "0123456789" );
-
-                        memset( status_code, 0, sizeof(status_code) );
-                        strncpy( status_code, start_ptr, end_ptr-start_ptr );
-                        int status = atoi( status_code );
-
-                        start_ptr = end_ptr;
-                        start_ptr += strspn( start_ptr, " " );
-                        strcpy( status_mesg, start_ptr );
-
-                        if ( status == 401 ) {
-                            if ( mNeedAuth ) {
-                                Error( "Failed authentication: " );
-                                return( -1 );
-                            }
-							if ( ! authenticate_header ) {
-                                Error( "Failed authentication, but don't have an authentication header: " );
-                                return( -1 );
-							}
-                            mNeedAuth = true;
-                            std::string Header = authenticate_header;
-							Debug(2, "Checking for digest auth in %s", authenticate_header );
-
-                            mAuthenticator->checkAuthResponse(Header);
-                            if ( mAuthenticator->auth_method() == zm::AUTH_DIGEST ) {
-                                Debug( 2, "Need Digest Authentication" );
-                                request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
-                                request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
-                                request += stringtf( "Host: %s\r\n", host.c_str());
-                                if ( strcmp( config.http_version, "1.0" ) == 0 )
-                                    request += stringtf( "Connection: Keep-Alive\r\n" );
-                                request += mAuthenticator->getAuthHeader( "GET", path.c_str() );
-                                request += "\r\n";
-
-                                Debug( 2, "New request header: %s", request.c_str() );
-                                return( 0 );
-							} else {
-                                Debug( 2, "Need some other kind of Authentication" );
-                            }
-                        } else if ( status < 200 || status > 299 )
-                        {
-                            Error( "Invalid response status %s: %s", status_code, status_mesg );
-                            return( -1 );
-                        }
-                        Debug( 3, "Got status '%d' (%s), http version %s", status, status_mesg, http_version );
-
-                        if ( connection_header )
-                        {
-                            memset( connection_type, 0, sizeof(connection_type) );
-                            start_ptr = connection_header + strspn( connection_header, " " );
-                            strcpy( connection_type, start_ptr );
-                            Debug( 3, "Got connection '%s'", connection_type );
-                        }
-                        if ( content_length_header )
-                        {
-                            start_ptr = content_length_header + strspn( content_length_header, " " );
-                            content_length = atoi( start_ptr );
-                            Debug( 3, "Got content length '%d'", content_length );
-                        }
-                        if ( content_type_header )
-                        {
-                            memset( content_type, 0, sizeof(content_type) );
-                            start_ptr = content_type_header + strspn( content_type_header, " " );
-                            if ( (end_ptr = strchr( start_ptr, ';' )) )
-                            {
-                                strncpy( content_type, start_ptr, end_ptr-start_ptr );
-                                Debug( 3, "Got content type '%s'", content_type );
-
-                                start_ptr = end_ptr + strspn( end_ptr, "; " );
-
-                                if ( strncasecmp( start_ptr, boundary_match, boundary_match_len ) == 0 )
-                                {
-                                    start_ptr += boundary_match_len;
-                                    start_ptr += strspn( start_ptr, "-" );
-                                    content_boundary_len = sprintf( content_boundary, "--%s", start_ptr );
-                                    Debug( 3, "Got content boundary '%s'", content_boundary );
-                                }
-                                else
-                                {
-                                    Error( "No content boundary found in header '%s'", content_type_header );
-                                }
-                            }
-                            else
-                            {
-                                strcpy( content_type, start_ptr );
-                                Debug( 3, "Got content type '%s'", content_type );
-                            }
-                        }
-
-                        if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
-                        {
-                            // Single image
-                            mode = SINGLE_IMAGE;
-                            format = JPEG;
-                            state = CONTENT;
-                        }
-                        else if ( !strcasecmp( content_type, "image/x-rgb" ) )
-                        {
-                            // Single image
-                            mode = SINGLE_IMAGE;
-                            format = X_RGB;
-                            state = CONTENT;
-                        }
-                        else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
-                        {
-                            // Single image
-                            mode = SINGLE_IMAGE;
-                            format = X_RGBZ;
-                            state = CONTENT;
-                        }
-                        else if ( !strcasecmp( content_type, "multipart/x-mixed-replace" ) )
-                        {
-                            // Image stream, so start processing
-                            if ( !content_boundary[0] )
-                            {
-                                Error( "No content boundary found in header '%s'", content_type_header );
-                                return( -1 );
-                            }
-                            mode = MULTI_IMAGE;
-                            state = SUBHEADER;
-                        }
-                        //else if ( !strcasecmp( content_type, "video/mpeg" ) || !strcasecmp( content_type, "video/mpg" ) )
-                        //{
-                            //// MPEG stream, coming soon!
-                        //}
-                        else
-                        {
-                            Error( "Unrecognised content type '%s'", content_type );
-                            return( -1 );
-                        }
-                    }
-                    else
-                    {
-                        Debug( 3, "Unable to extract entire header from stream, continuing" );
-                        state = HEADERCONT;
-                        //return( -1 );
-                    }
-                    break;
-                }
-                case SUBHEADER :
-                {
-                    n_subheaders = 0;
-                    boundary_header = 0;
-                    subcontent_length_header[0] = '\0';
-                    subcontent_type_header[0] = '\0';
-                    content_length = 0;
-                    content_type[0] = '\0';
-                }
-                case SUBHEADERCONT :
-                {
-                    char *crlf = 0;
-                    char *subheader_ptr = (char *)buffer;
-                    int subheader_len = buffer.size();
-                    bool all_headers = false;
-
-                    while( true )
-                    {
-                        int crlf_len = memspn( subheader_ptr, "\r\n", subheader_len );
-                        if ( n_subheaders )
-                        {
-                            if ( (crlf_len == 2 && !strncmp( subheader_ptr, "\n\n", crlf_len )) || (crlf_len == 4 && !strncmp( subheader_ptr, "\r\n\r\n", crlf_len )) )
-                            {
-                                *subheader_ptr = '\0';
-                                subheader_ptr += crlf_len;
-                                subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
-                                all_headers = true;
-                                break;
-                            }
-                        }
-                        if ( crlf_len )
-                        {
-                            if ( subheader_len == crlf_len )
-                            {
-                                break;
-                            }
-                            else
-                            {
-                                *subheader_ptr = '\0';
-                                subheader_ptr += crlf_len;
-                                subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
-                            }
-                        }
-
-                        Debug( 6, "%d: %s", subheader_len, subheader_ptr );
-
-                        if ( (crlf = mempbrk( subheader_ptr, "\r\n", subheader_len )) )
-                        {
-                            //subheaders[n_subheaders++] = subheader_ptr;
-                            n_subheaders++;
-
-                            if ( !boundary_header && (strncasecmp( subheader_ptr, content_boundary, content_boundary_len ) == 0) )
-                            {
-                                boundary_header = subheader_ptr;
-                                Debug( 4, "Got boundary subheader '%s'", subheader_ptr );
-                            }
-                            else if ( !subcontent_length_header[0] && (strncasecmp( subheader_ptr, content_length_match, content_length_match_len) == 0) )
-                            {
-                                strncpy( subcontent_length_header, subheader_ptr+content_length_match_len, sizeof(subcontent_length_header) );
-                                *(subcontent_length_header+strcspn( subcontent_length_header, "\r\n" )) = '\0';
-                                Debug( 4, "Got content length subheader '%s'", subcontent_length_header );
-                            }
-                            else if ( !subcontent_type_header[0] && (strncasecmp( subheader_ptr, content_type_match, content_type_match_len) == 0) )
-                            {
-                                strncpy( subcontent_type_header, subheader_ptr+content_type_match_len, sizeof(subcontent_type_header) );
-                                *(subcontent_type_header+strcspn( subcontent_type_header, "\r\n" )) = '\0';
-                                Debug( 4, "Got content type subheader '%s'", subcontent_type_header );
-                            }
-                            else
-                            {
-                                Debug( 6, "Got ignored subheader '%s' found", subheader_ptr );
-                            }
-                            subheader_ptr = crlf;
-                            subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
-                        }
-                        else
-                        {
-                            // No line end found
-                            break;
-                        }
-                    }
-                    
-                    if ( all_headers && boundary_header )
-                    {
-                        char *start_ptr/*, *end_ptr*/;
-
-                        Debug( 3, "Got boundary '%s'", boundary_header );
-
-                        if ( subcontent_length_header[0] )
-                        {
-                            start_ptr = subcontent_length_header + strspn( subcontent_length_header, " " );
-                            content_length = atoi( start_ptr );
-                            Debug( 3, "Got subcontent length '%d'", content_length );
-                        }
-                        if ( subcontent_type_header[0] )
-                        {
-                            memset( content_type, 0, sizeof(content_type) );
-                            start_ptr = subcontent_type_header + strspn( subcontent_type_header, " " );
-                            strcpy( content_type, start_ptr );
-                            Debug( 3, "Got subcontent type '%s'", content_type );
-                        }
-                        state = CONTENT;
-                    }
-                    else
-                    {
-                        Debug( 3, "Unable to extract subheader from stream, retrying" );
-                        while ( ! ( buffer_len = ReadData( buffer ) ) ) {
-                        }
-							if ( buffer_len < 0 ) {
-								Error( "Unable to read subheader" );
-								return( -1 );
-							}
-                        state = SUBHEADERCONT;
-                    }
-                    break;
-                }
-                case CONTENT :
-                {
-
-					// if content_type is something like image/jpeg;size=, this will strip the ;size=
-					char * semicolon = strchr( content_type, ';' );
-					if ( semicolon ) {
-						*semicolon = '\0';
-					}
-
-					if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
-                    {
-                        format = JPEG;
-                    }
-                    else if ( !strcasecmp( content_type, "image/x-rgb" ) )
-                    {
-                        format = X_RGB;
-                    }
-                    else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
-                    {
-                        format = X_RGBZ;
-                    }
-                    else
-                    {
-                        Error( "Found unsupported content type '%s'", content_type );
-                        return( -1 );
-                    }
-
-                    if ( format == JPEG && buffer.size() >= 2 )
-                    {
-                        if ( buffer[0] != 0xff || buffer[1] != 0xd8 )
-                        {
-                            Error( "Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1] );
-                            return( -1 );
-                        }
-                    }
-
-                    if ( content_length )
-                    {
-                        while ( (long)buffer.size() < content_length )
-                        {
-                            //int buffer_len = ReadData( buffer, content_length-buffer.size() );
-                            if ( ReadData( buffer ) < 0 ) {
-                                Error( "Unable to read content" );
-                                return( -1 );
-                            }
-                        }
-                        Debug( 3, "Got end of image by length, content-length = %d", content_length );
-                    }
-                    else
-                    {
-                        int content_pos = 0;
-                        while ( !content_length )
-                        {
-                            buffer_len = ReadData( buffer );
-                            if ( buffer_len < 0 )
-                            {
-                                Error( "Unable to read content" );
-                                return( -1 );
-                            }
-                            int buffer_size = buffer.size();
-                            if ( buffer_len )
-                            {
-                                if ( mode == MULTI_IMAGE )
-                                {
-                                    while ( char *start_ptr = (char *)memstr( (char *)buffer+content_pos, "\r\n--", buffer_size-content_pos ) )
-                                    {
-                                        content_length = start_ptr - (char *)buffer;
-                                        Debug( 3, "Got end of image by pattern (crlf--), content-length = %d", content_length );
-                                        break;
-                                    }
-                                }
-                            }
-                            else
-                            {
-                                content_length = buffer_size;
-                                Debug( 3, "Got end of image by closure, content-length = %d", content_length );
-                                if ( mode == SINGLE_IMAGE )
-                                {
-                                    char *end_ptr = (char *)buffer+buffer_size;
-
-                                    while( *end_ptr == '\r' || *end_ptr == '\n' )
-                                    {
-                                        content_length--;
-                                        end_ptr--;
-                                    }
-
-                                    if ( end_ptr != ((char *)buffer+buffer_size) )
-                                    {
-                                        Debug( 3, "Trimmed end of image, new content-length = %d", content_length );
-                                    }
-                                }
-                            }
-                        }
-                    }
-                    if ( mode == SINGLE_IMAGE )
-                    {
-                        state = HEADER;
-                        Disconnect();
-                    }
-                    else
-                    {
-                        state = SUBHEADER;
-                    }
-
-                    if ( format == JPEG && buffer.size() >= 2 )
-                    {
-                        if ( buffer[0] != 0xff || buffer[1] != 0xd8 )
-                        {
-                            Error( "Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1] );
-                            return( -1 );
-                        }
-                    }
-
-                    Debug( 3, "Returning %d bytes, buffer size: (%d) bytes of captured content", content_length, buffer.size() );
-                    return( content_length );
-                }
+          while ( ! ( buffer_len = ReadData( buffer ) ) ) {
+          }
+            if ( buffer_len < 0 ) {
+              Error( "Unable to read header" );
+              return( -1 );
             }
+
+          char *crlf = 0;
+          char *header_ptr = (char *)buffer;
+          int header_len = buffer.size();
+          bool all_headers = false;
+
+          while( true )
+          {
+            int crlf_len = memspn( header_ptr, "\r\n", header_len );
+            if ( n_headers )
+            {
+              if ( (crlf_len == 2 && !strncmp( header_ptr, "\n\n", crlf_len )) || (crlf_len == 4 && !strncmp( header_ptr, "\r\n\r\n", crlf_len )) )
+              {
+                *header_ptr = '\0';
+                header_ptr += crlf_len;
+                header_len -= buffer.consume( header_ptr-(char *)buffer );
+                all_headers = true;
+                break;
+              }
+            }
+            if ( crlf_len )
+            {
+              if ( header_len == crlf_len )
+              {
+                break;
+              }
+              else
+              {
+                *header_ptr = '\0';
+                header_ptr += crlf_len;
+                header_len -= buffer.consume( header_ptr-(char *)buffer );
+              }
+            }
+
+            Debug( 6, "%s", header_ptr );
+            if ( (crlf = mempbrk( header_ptr, "\r\n", header_len )) )
+            {
+              //headers[n_headers++] = header_ptr;
+              n_headers++;
+
+              if ( !http_header && (strncasecmp( header_ptr, http_match, http_match_len ) == 0) )
+              {
+                http_header = header_ptr+http_match_len;
+                Debug( 6, "Got http header '%s'", header_ptr );
+              }
+              else if ( !connection_header && (strncasecmp( header_ptr, connection_match, connection_match_len) == 0) )
+              {
+                connection_header = header_ptr+connection_match_len;
+                Debug( 6, "Got connection header '%s'", header_ptr );
+              }
+              else if ( !content_length_header && (strncasecmp( header_ptr, content_length_match, content_length_match_len) == 0) )
+              {
+                content_length_header = header_ptr+content_length_match_len;
+                Debug( 6, "Got content length header '%s'", header_ptr );
+              }
+
+              else if ( !authenticate_header && (strncasecmp( header_ptr, authenticate_match, authenticate_match_len) == 0) )
+              {
+                authenticate_header = header_ptr;
+                Debug( 6, "Got authenticate header '%s'", header_ptr );
+              }
+              else if ( !content_type_header && (strncasecmp( header_ptr, content_type_match, content_type_match_len) == 0) )
+              {
+                content_type_header = header_ptr+content_type_match_len;
+                Debug( 6, "Got content type header '%s'", header_ptr );
+              }
+              else
+              {
+                Debug( 6, "Got ignored header '%s'", header_ptr );
+              }
+              header_ptr = crlf;
+              header_len -= buffer.consume( header_ptr-(char *)buffer );
+            }
+            else
+            {
+              // No end of line found
+              break;
+            }
+          }
+
+          if ( all_headers )
+          {
+            char *start_ptr, *end_ptr;
+
+            if ( !http_header )
+            {
+              Error( "Unable to extract HTTP status from header" );
+              return( -1 );
+            }
+
+            start_ptr = http_header;
+            end_ptr = start_ptr+strspn( start_ptr, "10." );
+
+            memset( http_version, 0, sizeof(http_version) );
+            strncpy( http_version, start_ptr, end_ptr-start_ptr );
+
+            start_ptr = end_ptr;
+            start_ptr += strspn( start_ptr, " " );
+            end_ptr = start_ptr+strspn( start_ptr, "0123456789" );
+
+            memset( status_code, 0, sizeof(status_code) );
+            strncpy( status_code, start_ptr, end_ptr-start_ptr );
+            int status = atoi( status_code );
+
+            start_ptr = end_ptr;
+            start_ptr += strspn( start_ptr, " " );
+            strcpy( status_mesg, start_ptr );
+
+            if ( status == 401 ) {
+              if ( mNeedAuth ) {
+                Error( "Failed authentication: " );
+                return( -1 );
+              }
+              if ( ! authenticate_header ) {
+                Error( "Failed authentication, but don't have an authentication header: " );
+                return( -1 );
+              }
+              mNeedAuth = true;
+              std::string Header = authenticate_header;
+              Debug(2, "Checking for digest auth in %s", authenticate_header );
+
+              mAuthenticator->checkAuthResponse(Header);
+              if ( mAuthenticator->auth_method() == zm::AUTH_DIGEST ) {
+                Debug( 2, "Need Digest Authentication" );
+                request = stringtf( "GET %s HTTP/%s\r\n", path.c_str(), config.http_version );
+                request += stringtf( "User-Agent: %s/%s\r\n", config.http_ua, ZM_VERSION );
+                request += stringtf( "Host: %s\r\n", host.c_str());
+                if ( strcmp( config.http_version, "1.0" ) == 0 )
+                  request += stringtf( "Connection: Keep-Alive\r\n" );
+                request += mAuthenticator->getAuthHeader( "GET", path.c_str() );
+                request += "\r\n";
+
+                Debug( 2, "New request header: %s", request.c_str() );
+                return( 0 );
+              } else {
+                Debug( 2, "Need some other kind of Authentication" );
+              }
+            } else if ( status < 200 || status > 299 )
+            {
+              Error( "Invalid response status %s: %s", status_code, status_mesg );
+              return( -1 );
+            }
+            Debug( 3, "Got status '%d' (%s), http version %s", status, status_mesg, http_version );
+
+            if ( connection_header )
+            {
+              memset( connection_type, 0, sizeof(connection_type) );
+              start_ptr = connection_header + strspn( connection_header, " " );
+              strcpy( connection_type, start_ptr );
+              Debug( 3, "Got connection '%s'", connection_type );
+            }
+            if ( content_length_header )
+            {
+              start_ptr = content_length_header + strspn( content_length_header, " " );
+              content_length = atoi( start_ptr );
+              Debug( 3, "Got content length '%d'", content_length );
+            }
+            if ( content_type_header )
+            {
+              memset( content_type, 0, sizeof(content_type) );
+              start_ptr = content_type_header + strspn( content_type_header, " " );
+              if ( (end_ptr = strchr( start_ptr, ';' )) )
+              {
+                strncpy( content_type, start_ptr, end_ptr-start_ptr );
+                Debug( 3, "Got content type '%s'", content_type );
+
+                start_ptr = end_ptr + strspn( end_ptr, "; " );
+
+                if ( strncasecmp( start_ptr, boundary_match, boundary_match_len ) == 0 )
+                {
+                  start_ptr += boundary_match_len;
+                  start_ptr += strspn( start_ptr, "-" );
+                  content_boundary_len = sprintf( content_boundary, "--%s", start_ptr );
+                  Debug( 3, "Got content boundary '%s'", content_boundary );
+                }
+                else
+                {
+                  Error( "No content boundary found in header '%s'", content_type_header );
+                }
+              }
+              else
+              {
+                strcpy( content_type, start_ptr );
+                Debug( 3, "Got content type '%s'", content_type );
+              }
+            }
+
+            if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
+            {
+              // Single image
+              mode = SINGLE_IMAGE;
+              format = JPEG;
+              state = CONTENT;
+            }
+            else if ( !strcasecmp( content_type, "image/x-rgb" ) )
+            {
+              // Single image
+              mode = SINGLE_IMAGE;
+              format = X_RGB;
+              state = CONTENT;
+            }
+            else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
+            {
+              // Single image
+              mode = SINGLE_IMAGE;
+              format = X_RGBZ;
+              state = CONTENT;
+            }
+            else if ( !strcasecmp( content_type, "multipart/x-mixed-replace" ) )
+            {
+              // Image stream, so start processing
+              if ( !content_boundary[0] )
+              {
+                Error( "No content boundary found in header '%s'", content_type_header );
+                return( -1 );
+              }
+              mode = MULTI_IMAGE;
+              state = SUBHEADER;
+            }
+            //else if ( !strcasecmp( content_type, "video/mpeg" ) || !strcasecmp( content_type, "video/mpg" ) )
+            //{
+              //// MPEG stream, coming soon!
+            //}
+            else
+            {
+              Error( "Unrecognised content type '%s'", content_type );
+              return( -1 );
+            }
+          }
+          else
+          {
+            Debug( 3, "Unable to extract entire header from stream, continuing" );
+            state = HEADERCONT;
+            //return( -1 );
+          }
+          break;
         }
+        case SUBHEADER :
+        {
+          n_subheaders = 0;
+          boundary_header = 0;
+          subcontent_length_header[0] = '\0';
+          subcontent_type_header[0] = '\0';
+          content_length = 0;
+          content_type[0] = '\0';
+        }
+        case SUBHEADERCONT :
+        {
+          char *crlf = 0;
+          char *subheader_ptr = (char *)buffer;
+          int subheader_len = buffer.size();
+          bool all_headers = false;
+
+          while( true )
+          {
+            int crlf_len = memspn( subheader_ptr, "\r\n", subheader_len );
+            if ( n_subheaders )
+            {
+              if ( (crlf_len == 2 && !strncmp( subheader_ptr, "\n\n", crlf_len )) || (crlf_len == 4 && !strncmp( subheader_ptr, "\r\n\r\n", crlf_len )) )
+              {
+                *subheader_ptr = '\0';
+                subheader_ptr += crlf_len;
+                subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
+                all_headers = true;
+                break;
+              }
+            }
+            if ( crlf_len )
+            {
+              if ( subheader_len == crlf_len )
+              {
+                break;
+              }
+              else
+              {
+                *subheader_ptr = '\0';
+                subheader_ptr += crlf_len;
+                subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
+              }
+            }
+
+            Debug( 6, "%d: %s", subheader_len, subheader_ptr );
+
+            if ( (crlf = mempbrk( subheader_ptr, "\r\n", subheader_len )) )
+            {
+              //subheaders[n_subheaders++] = subheader_ptr;
+              n_subheaders++;
+
+              if ( !boundary_header && (strncasecmp( subheader_ptr, content_boundary, content_boundary_len ) == 0) )
+              {
+                boundary_header = subheader_ptr;
+                Debug( 4, "Got boundary subheader '%s'", subheader_ptr );
+              }
+              else if ( !subcontent_length_header[0] && (strncasecmp( subheader_ptr, content_length_match, content_length_match_len) == 0) )
+              {
+                strncpy( subcontent_length_header, subheader_ptr+content_length_match_len, sizeof(subcontent_length_header) );
+                *(subcontent_length_header+strcspn( subcontent_length_header, "\r\n" )) = '\0';
+                Debug( 4, "Got content length subheader '%s'", subcontent_length_header );
+              }
+              else if ( !subcontent_type_header[0] && (strncasecmp( subheader_ptr, content_type_match, content_type_match_len) == 0) )
+              {
+                strncpy( subcontent_type_header, subheader_ptr+content_type_match_len, sizeof(subcontent_type_header) );
+                *(subcontent_type_header+strcspn( subcontent_type_header, "\r\n" )) = '\0';
+                Debug( 4, "Got content type subheader '%s'", subcontent_type_header );
+              }
+              else
+              {
+                Debug( 6, "Got ignored subheader '%s' found", subheader_ptr );
+              }
+              subheader_ptr = crlf;
+              subheader_len -= buffer.consume( subheader_ptr-(char *)buffer );
+            }
+            else
+            {
+              // No line end found
+              break;
+            }
+          }
+          
+          if ( all_headers && boundary_header )
+          {
+            char *start_ptr/*, *end_ptr*/;
+
+            Debug( 3, "Got boundary '%s'", boundary_header );
+
+            if ( subcontent_length_header[0] )
+            {
+              start_ptr = subcontent_length_header + strspn( subcontent_length_header, " " );
+              content_length = atoi( start_ptr );
+              Debug( 3, "Got subcontent length '%d'", content_length );
+            }
+            if ( subcontent_type_header[0] )
+            {
+              memset( content_type, 0, sizeof(content_type) );
+              start_ptr = subcontent_type_header + strspn( subcontent_type_header, " " );
+              strcpy( content_type, start_ptr );
+              Debug( 3, "Got subcontent type '%s'", content_type );
+            }
+            state = CONTENT;
+          }
+          else
+          {
+            Debug( 3, "Unable to extract subheader from stream, retrying" );
+            while ( ! ( buffer_len = ReadData( buffer ) ) ) {
+            }
+              if ( buffer_len < 0 ) {
+                Error( "Unable to read subheader" );
+                return( -1 );
+              }
+            state = SUBHEADERCONT;
+          }
+          break;
+        }
+        case CONTENT :
+        {
+
+          // if content_type is something like image/jpeg;size=, this will strip the ;size=
+          char * semicolon = strchr( content_type, ';' );
+          if ( semicolon ) {
+            *semicolon = '\0';
+          }
+
+          if ( !strcasecmp( content_type, "image/jpeg" ) || !strcasecmp( content_type, "image/jpg" ) )
+          {
+            format = JPEG;
+          }
+          else if ( !strcasecmp( content_type, "image/x-rgb" ) )
+          {
+            format = X_RGB;
+          }
+          else if ( !strcasecmp( content_type, "image/x-rgbz" ) )
+          {
+            format = X_RGBZ;
+          }
+          else
+          {
+            Error( "Found unsupported content type '%s'", content_type );
+            return( -1 );
+          }
+
+          if ( format == JPEG && buffer.size() >= 2 )
+          {
+            if ( buffer[0] != 0xff || buffer[1] != 0xd8 )
+            {
+              Error( "Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1] );
+              return( -1 );
+            }
+          }
+
+          if ( content_length )
+          {
+            while ( (long)buffer.size() < content_length )
+            {
+              //int buffer_len = ReadData( buffer, content_length-buffer.size() );
+              if ( ReadData( buffer ) < 0 ) {
+                Error( "Unable to read content" );
+                return( -1 );
+              }
+            }
+            Debug( 3, "Got end of image by length, content-length = %d", content_length );
+          }
+          else
+          {
+            int content_pos = 0;
+            while ( !content_length )
+            {
+              buffer_len = ReadData( buffer );
+              if ( buffer_len < 0 )
+              {
+                Error( "Unable to read content" );
+                return( -1 );
+              }
+              int buffer_size = buffer.size();
+              if ( buffer_len )
+              {
+                if ( mode == MULTI_IMAGE )
+                {
+                  while ( char *start_ptr = (char *)memstr( (char *)buffer+content_pos, "\r\n--", buffer_size-content_pos ) )
+                  {
+                    content_length = start_ptr - (char *)buffer;
+                    Debug( 3, "Got end of image by pattern (crlf--), content-length = %d", content_length );
+                    break;
+                  }
+                }
+              }
+              else
+              {
+                content_length = buffer_size;
+                Debug( 3, "Got end of image by closure, content-length = %d", content_length );
+                if ( mode == SINGLE_IMAGE )
+                {
+                  char *end_ptr = (char *)buffer+buffer_size;
+
+                  while( *end_ptr == '\r' || *end_ptr == '\n' )
+                  {
+                    content_length--;
+                    end_ptr--;
+                  }
+
+                  if ( end_ptr != ((char *)buffer+buffer_size) )
+                  {
+                    Debug( 3, "Trimmed end of image, new content-length = %d", content_length );
+                  }
+                }
+              }
+            }
+          }
+          if ( mode == SINGLE_IMAGE )
+          {
+            state = HEADER;
+            Disconnect();
+          }
+          else
+          {
+            state = SUBHEADER;
+          }
+
+          if ( format == JPEG && buffer.size() >= 2 )
+          {
+            if ( buffer[0] != 0xff || buffer[1] != 0xd8 )
+            {
+              Error( "Found bogus jpeg header '%02x%02x'", buffer[0], buffer[1] );
+              return( -1 );
+            }
+          }
+
+          Debug( 3, "Returning %d bytes, buffer size: (%d) bytes of captured content", content_length, buffer.size() );
+          return( content_length );
+        }
+      }
     }
-    return( 0 );
+  }
+  return( 0 );
 }
 
 int RemoteCameraHttp::PreCapture()
 {
+  if ( sd < 0 )
+  {
+    Connect();
     if ( sd < 0 )
     {
-        Connect();
-        if ( sd < 0 )
-        {
-            Error( "Unable to connect to camera" );
-            return( -1 );
-        }
-        mode = SINGLE_IMAGE;
-        buffer.clear();
+      Error( "Unable to connect to camera" );
+      return( -1 );
     }
-    if ( mode == SINGLE_IMAGE )
+    mode = SINGLE_IMAGE;
+    buffer.clear();
+  }
+  if ( mode == SINGLE_IMAGE )
+  {
+    if ( SendRequest() < 0 )
     {
-        if ( SendRequest() < 0 )
-        {
-            Error( "Unable to send request" );
-            Disconnect();
-            return( -1 );
-        }
+      Error( "Unable to send request" );
+      Disconnect();
+      return( -1 );
     }
-    return( 0 );
+  }
+  return( 0 );
 }
 
 int RemoteCameraHttp::Capture( Image &image )
 {
-    int content_length = GetResponse();
-    if ( content_length == 0 )
+  int content_length = GetResponse();
+  if ( content_length == 0 )
+  {
+    Warning( "Unable to capture image, retrying" );
+    return( 1 );
+  }
+  if ( content_length < 0 )
+  {
+    Error( "Unable to get response, disconnecting" );
+    Disconnect();
+    return( -1 );
+  }
+  switch( format )
+  {
+    case JPEG :
     {
-        Warning( "Unable to capture image, retrying" );
-        return( 1 );
-    }
-    if ( content_length < 0 )
-    {
-        Error( "Unable to get response, disconnecting" );
+      if ( !image.DecodeJpeg( buffer.extract( content_length ), content_length, colours, subpixelorder ) )
+      {
+        Error( "Unable to decode jpeg" );
         Disconnect();
         return( -1 );
+      }
+      break;
     }
-    switch( format )
+    case X_RGB :
     {
-        case JPEG :
-        {
-            if ( !image.DecodeJpeg( buffer.extract( content_length ), content_length, colours, subpixelorder ) )
-            {
-                Error( "Unable to decode jpeg" );
-                Disconnect();
-                return( -1 );
-            }
-            break;
-        }
-        case X_RGB :
-        {
-            if ( content_length != (long)image.Size() )
-            {
-                Error( "Image length mismatch, expected %d bytes, content length was %d", image.Size(), content_length );
-                Disconnect();
-                return( -1 );
-            }
-            image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
-            break;
-        }
-        case X_RGBZ :
-        {
-            if ( !image.Unzip( buffer.extract( content_length ), content_length ) )
-            {
-                Error( "Unable to unzip RGB image" );
-                Disconnect();
-                return( -1 );
-            }
-            image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
-            break;
-        }
-        default :
-        {
-            Error( "Unexpected image format encountered" );
-            Disconnect();
-            return( -1 );
-        }
+      if ( content_length != (long)image.Size() )
+      {
+        Error( "Image length mismatch, expected %d bytes, content length was %d", image.Size(), content_length );
+        Disconnect();
+        return( -1 );
+      }
+      image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
+      break;
     }
-    return( 0 );
+    case X_RGBZ :
+    {
+      if ( !image.Unzip( buffer.extract( content_length ), content_length ) )
+      {
+        Error( "Unable to unzip RGB image" );
+        Disconnect();
+        return( -1 );
+      }
+      image.Assign( width, height, colours, subpixelorder, buffer, imagesize );
+      break;
+    }
+    default :
+    {
+      Error( "Unexpected image format encountered" );
+      Disconnect();
+      return( -1 );
+    }
+  }
+  return( 0 );
 }
 
 int RemoteCameraHttp::PostCapture()
 {
-    return( 0 );
+  return( 0 );
 }
diff --git a/src/zm_remote_camera_http.h b/src/zm_remote_camera_http.h
index 15971037e..f0b8a4415 100644
--- a/src/zm_remote_camera_http.h
+++ b/src/zm_remote_camera_http.h
@@ -33,32 +33,32 @@
 class RemoteCameraHttp : public RemoteCamera
 {
 protected:
-	std::string request;
-	struct timeval timeout;
-	//struct hostent *hp;
-	//struct sockaddr_in sa;
-	int sd;
-	Buffer buffer;
-	enum { SINGLE_IMAGE, MULTI_IMAGE } mode;
-	enum { UNDEF, JPEG, X_RGB, X_RGBZ } format;
-	enum { HEADER, HEADERCONT, SUBHEADER, SUBHEADERCONT, CONTENT } state;
-    enum { SIMPLE, REGEXP } method;
+  std::string request;
+  struct timeval timeout;
+  //struct hostent *hp;
+  //struct sockaddr_in sa;
+  int sd;
+  Buffer buffer;
+  enum { SINGLE_IMAGE, MULTI_IMAGE } mode;
+  enum { UNDEF, JPEG, X_RGB, X_RGBZ } format;
+  enum { HEADER, HEADERCONT, SUBHEADER, SUBHEADERCONT, CONTENT } state;
+  enum { SIMPLE, REGEXP } method;
 
 public:
-	RemoteCameraHttp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	~RemoteCameraHttp();
+  RemoteCameraHttp(int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  ~RemoteCameraHttp();
 
-	void Initialise();
-	void Terminate() { Disconnect(); }
-	int Connect();
-	int Disconnect();
-	int SendRequest();
-	int ReadData( Buffer &buffer, int bytes_expected=0 );
-	int GetResponse();
-	int PreCapture();
-	int Capture( Image &image );
-	int PostCapture();
-    	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
+  void Initialise();
+  void Terminate() { Disconnect(); }
+  int Connect();
+  int Disconnect();
+  int SendRequest();
+  int ReadData( Buffer &buffer, int bytes_expected=0 );
+  int GetResponse();
+  int PreCapture();
+  int Capture( Image &image );
+  int PostCapture();
+  int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
 };
 
 #endif // ZM_REMOTE_CAMERA_HTTP_H
diff --git a/src/zm_remote_camera_rtsp.cpp b/src/zm_remote_camera_rtsp.cpp
index a07d97a8e..66363c104 100644
--- a/src/zm_remote_camera_rtsp.cpp
+++ b/src/zm_remote_camera_rtsp.cpp
@@ -28,344 +28,523 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 
-RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture ) :
-    RemoteCamera( p_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture ),
-    rtsp_describe( p_rtsp_describe ),
-    rtspThread( 0 )
+RemoteCameraRtsp::RemoteCameraRtsp( int p_id, const std::string &p_method, const std::string &p_host, const std::string &p_port, const std::string &p_path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio ) :
+  RemoteCamera( p_id, "rtsp", p_host, p_port, p_path, p_width, p_height, p_colours, p_brightness, p_contrast, p_hue, p_colour, p_capture, p_record_audio ),
+  rtsp_describe( p_rtsp_describe ),
+  rtspThread( 0 )
 
 {
-    if ( p_method == "rtpUni" )
-        method = RtspThread::RTP_UNICAST;
-    else if ( p_method == "rtpMulti" )
-        method = RtspThread::RTP_MULTICAST;
-    else if ( p_method == "rtpRtsp" )
-        method = RtspThread::RTP_RTSP;
-    else if ( p_method == "rtpRtspHttp" )
-        method = RtspThread::RTP_RTSP_HTTP;
-    else
-        Fatal( "Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), id );
+  if ( p_method == "rtpUni" )
+    method = RtspThread::RTP_UNICAST;
+  else if ( p_method == "rtpMulti" )
+    method = RtspThread::RTP_MULTICAST;
+  else if ( p_method == "rtpRtsp" )
+    method = RtspThread::RTP_RTSP;
+  else if ( p_method == "rtpRtspHttp" )
+    method = RtspThread::RTP_RTSP_HTTP;
+  else
+    Fatal( "Unrecognised method '%s' when creating RTSP camera %d", p_method.c_str(), id );
 
-	if ( capture )
-	{
-		Initialise();
-	}
-	
-	mFormatContext = NULL;
-	mVideoStreamId = -1;
-	mCodecContext = NULL;
-	mCodec = NULL;
-	mRawFrame = NULL;
-	mFrame = NULL;
-	frameCount = 0;
-	
-#if HAVE_LIBSWSCALE    
-	mConvertContext = NULL;
+  if ( capture )
+  {
+    Initialise();
+  }
+  
+  mFormatContext = NULL;
+  mVideoStreamId = -1;
+  mAudioStreamId = -1;
+  mCodecContext = NULL;
+  mCodec = NULL;
+  mRawFrame = NULL;
+  mFrame = NULL;
+  frameCount = 0;
+  wasRecording = false;
+  startTime=0;
+  
+#if HAVE_LIBSWSCALE  
+  mConvertContext = NULL;
 #endif
-	/* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
-	if(colours == ZM_COLOUR_RGB32) {
-		subpixelorder = ZM_SUBPIX_ORDER_RGBA;
-		imagePixFormat = AV_PIX_FMT_RGBA;
-	} else if(colours == ZM_COLOUR_RGB24) {
-		subpixelorder = ZM_SUBPIX_ORDER_RGB;
-		imagePixFormat = AV_PIX_FMT_RGB24;
-	} else if(colours == ZM_COLOUR_GRAY8) {
-		subpixelorder = ZM_SUBPIX_ORDER_NONE;
-		imagePixFormat = AV_PIX_FMT_GRAY8;
-	} else {
-		Panic("Unexpected colours: %d",colours);
-	}
-	
+  /* Has to be located inside the constructor so other components such as zma will receive correct colours and subpixel order */
+  if(colours == ZM_COLOUR_RGB32) {
+    subpixelorder = ZM_SUBPIX_ORDER_RGBA;
+    imagePixFormat = AV_PIX_FMT_RGBA;
+  } else if(colours == ZM_COLOUR_RGB24) {
+    subpixelorder = ZM_SUBPIX_ORDER_RGB;
+    imagePixFormat = AV_PIX_FMT_RGB24;
+  } else if(colours == ZM_COLOUR_GRAY8) {
+    subpixelorder = ZM_SUBPIX_ORDER_NONE;
+    imagePixFormat = AV_PIX_FMT_GRAY8;
+  } else {
+    Panic("Unexpected colours: %d",colours);
+  }
+  
 }
 
 RemoteCameraRtsp::~RemoteCameraRtsp()
 {
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-    av_frame_free( &mFrame );
-    av_frame_free( &mRawFrame );
+  av_frame_free( &mFrame );
+  av_frame_free( &mRawFrame );
 #else
-    av_freep( &mFrame );
-    av_freep( &mRawFrame );
+  av_freep( &mFrame );
+  av_freep( &mRawFrame );
 #endif
-    
+  
 #if HAVE_LIBSWSCALE
-    if ( mConvertContext )
-    {
-        sws_freeContext( mConvertContext );
-        mConvertContext = NULL;
-    }
+  if ( mConvertContext )
+  {
+    sws_freeContext( mConvertContext );
+    mConvertContext = NULL;
+  }
 #endif
 
-    if ( mCodecContext )
-    {
-       avcodec_close( mCodecContext );
-       mCodecContext = NULL; // Freed by avformat_free_context in the destructor of RtspThread class
-    }
+  if ( mCodecContext )
+  {
+     avcodec_close( mCodecContext );
+     mCodecContext = NULL; // Freed by avformat_free_context in the destructor of RtspThread class
+  }
 
-	if ( capture )
-	{
-		Terminate();
-	}
+  if ( capture )
+  {
+    Terminate();
+  }
 }
 
 void RemoteCameraRtsp::Initialise()
 {
-    RemoteCamera::Initialise();
+  RemoteCamera::Initialise();
 
-	int max_size = width*height*colours;
+  int max_size = width*height*colours;
 
-	buffer.size( max_size );
+  // This allocates a buffer able to hold a raw fframe, which is a little artbitrary.  Might be nice to get some
+  // decent data on how large a buffer is really needed.
+  buffer.size( max_size );
 
-    if ( logDebugging() )
-        av_log_set_level( AV_LOG_DEBUG ); 
-    else
-        av_log_set_level( AV_LOG_QUIET ); 
+  if ( logDebugging() )
+    av_log_set_level( AV_LOG_DEBUG ); 
+  else
+    av_log_set_level( AV_LOG_QUIET ); 
 
-    av_register_all();
+  av_register_all();
 
-    Connect();
+  Connect();
 }
 
 void RemoteCameraRtsp::Terminate()
 {
-    Disconnect();
+  Disconnect();
 }
 
 int RemoteCameraRtsp::Connect()
 {
-    rtspThread = new RtspThread( id, method, protocol, host, port, path, auth, rtsp_describe );
+  rtspThread = new RtspThread( id, method, protocol, host, port, path, auth, rtsp_describe );
 
-    rtspThread->start();
+  rtspThread->start();
 
-    return( 0 );
+  return( 0 );
 }
 
 int RemoteCameraRtsp::Disconnect()
 {
-    if ( rtspThread )
-    {
-        rtspThread->stop();
-        rtspThread->join();
-        delete rtspThread;
-        rtspThread = 0;
-    }
-    return( 0 );
+  if ( rtspThread )
+  {
+    rtspThread->stop();
+    rtspThread->join();
+    delete rtspThread;
+    rtspThread = 0;
+  }
+  return( 0 );
 }
 
 int RemoteCameraRtsp::PrimeCapture()
 {
-    Debug( 2, "Waiting for sources" );
-    for ( int i = 0; i < 100 && !rtspThread->hasSources(); i++ )
-    {
-        usleep( 100000 );
-    }
-    if ( !rtspThread->hasSources() )
-        Fatal( "No RTSP sources" );
+  Debug( 2, "Waiting for sources" );
+  for ( int i = 0; i < 100 && !rtspThread->hasSources(); i++ )
+  {
+    usleep( 100000 );
+  }
+  if ( !rtspThread->hasSources() )
+    Fatal( "No RTSP sources" );
 
-    Debug( 2, "Got sources" );
+  Debug( 2, "Got sources" );
 
-    mFormatContext = rtspThread->getFormatContext();
+  mFormatContext = rtspThread->getFormatContext();
 
-    // Find first video stream present
-    mVideoStreamId = -1;
-    
-    for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ )
+  // Find first video stream present
+  mVideoStreamId = -1;
+  
+  // Find the first video stream. 
+  for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ ) {
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-	if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
+    if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
-	if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
+    if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
 #endif
-        {
-            mVideoStreamId = i;
-            break;
-        }
-    if ( mVideoStreamId == -1 )
-        Fatal( "Unable to locate video stream" );
+    {
+      mVideoStreamId = i;
+      break;
+    }
+  }
+  if ( mVideoStreamId == -1 )
+    Fatal( "Unable to locate video stream" );
 
-    // Get a pointer to the codec context for the video stream
-    mCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
+  // Get a pointer to the codec context for the video stream
+  mCodecContext = mFormatContext->streams[mVideoStreamId]->codec;
 
-    // Find the decoder for the video stream
-    mCodec = avcodec_find_decoder( mCodecContext->codec_id );
-    if ( mCodec == NULL )
-        Panic( "Unable to locate codec %d decoder", mCodecContext->codec_id );
+  // Find the decoder for the video stream
+  mCodec = avcodec_find_decoder( mCodecContext->codec_id );
+  if ( mCodec == NULL )
+    Panic( "Unable to locate codec %d decoder", mCodecContext->codec_id );
 
-    // Open codec
+  // Open codec
 #if !LIBAVFORMAT_VERSION_CHECK(53, 8, 0, 8, 0)
-    if ( avcodec_open( mCodecContext, mCodec ) < 0 )
+  if ( avcodec_open( mCodecContext, mCodec ) < 0 )
 #else
-    if ( avcodec_open2( mCodecContext, mCodec, 0 ) < 0 )
+  if ( avcodec_open2( mCodecContext, mCodec, 0 ) < 0 )
 #endif
-        Panic( "Can't open codec" );
+    Panic( "Can't open codec" );
 
-    // Allocate space for the native video frame
+  // Allocate space for the native video frame
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-    mRawFrame = av_frame_alloc();
+  mRawFrame = av_frame_alloc();
 #else
-    mRawFrame = avcodec_alloc_frame();
+  mRawFrame = avcodec_alloc_frame();
 #endif
 
-    // Allocate space for the converted video frame
+  // Allocate space for the converted video frame
 #if LIBAVCODEC_VERSION_CHECK(55, 28, 1, 45, 101)
-    mFrame = av_frame_alloc();
+  mFrame = av_frame_alloc();
 #else
-    mFrame = avcodec_alloc_frame();
+  mFrame = avcodec_alloc_frame();
 #endif
 
-	if(mRawFrame == NULL || mFrame == NULL)
-		Fatal( "Unable to allocate frame(s)");
-	
-	int pSize = avpicture_get_size( imagePixFormat, width, height );
-	if( (unsigned int)pSize != imagesize) {
-		Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
-	}
-/*	
+  if(mRawFrame == NULL || mFrame == NULL)
+    Fatal( "Unable to allocate frame(s)");
+  
+  int pSize = avpicture_get_size( imagePixFormat, width, height );
+  if( (unsigned int)pSize != imagesize) {
+    Fatal("Image size mismatch. Required: %d Available: %d",pSize,imagesize);
+  }
+/*  
 #if HAVE_LIBSWSCALE
-	if(!sws_isSupportedInput(mCodecContext->pix_fmt)) {
-		Fatal("swscale does not support the codec format: %c%c%c%c",(mCodecContext->pix_fmt)&0xff,((mCodecContext->pix_fmt>>8)&0xff),((mCodecContext->pix_fmt>>16)&0xff),((mCodecContext->pix_fmt>>24)&0xff));
-	}
+  if(!sws_isSupportedInput(mCodecContext->pix_fmt)) {
+    Fatal("swscale does not support the codec format: %c%c%c%c",(mCodecContext->pix_fmt)&0xff,((mCodecContext->pix_fmt>>8)&0xff),((mCodecContext->pix_fmt>>16)&0xff),((mCodecContext->pix_fmt>>24)&0xff));
+  }
 
-	if(!sws_isSupportedOutput(imagePixFormat)) {
-		Fatal("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
-	}
-	
+  if(!sws_isSupportedOutput(imagePixFormat)) {
+    Fatal("swscale does not support the target format: %c%c%c%c",(imagePixFormat)&0xff,((imagePixFormat>>8)&0xff),((imagePixFormat>>16)&0xff),((imagePixFormat>>24)&0xff));
+  }
+  
 #else // HAVE_LIBSWSCALE
-    Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
+  Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
 #endif // HAVE_LIBSWSCALE
 */
 
-    return( 0 );
+  return( 0 );
 }
 
 int RemoteCameraRtsp::PreCapture()
 {
-    if ( !rtspThread->isRunning() )
-        return( -1 );
-    if ( !rtspThread->hasSources() )
-    {
-        Error( "Cannot precapture, no RTP sources" );
-        return( -1 );
-    }
-    return( 0 );
+  if ( !rtspThread->isRunning() )
+    return( -1 );
+  if ( !rtspThread->hasSources() )
+  {
+    Error( "Cannot precapture, no RTP sources" );
+    return( -1 );
+  }
+  return( 0 );
 }
 
 int RemoteCameraRtsp::Capture( Image &image )
 {
-	AVPacket packet;
-	uint8_t* directbuffer;
-	int frameComplete = false;
-	
-	/* Request a writeable buffer of the target image */
-	directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
-	if(directbuffer == NULL) {
-		Error("Failed requesting writeable buffer for the captured image.");
-		return (-1);
-	}
-	
-    while ( true )
+  AVPacket packet;
+  uint8_t* directbuffer;
+  int frameComplete = false;
+  
+  /* Request a writeable buffer of the target image */
+  directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
+  if(directbuffer == NULL) {
+    Error("Failed requesting writeable buffer for the captured image.");
+    return (-1);
+  }
+
+  while ( true )
+  {
+    buffer.clear();
+    if ( !rtspThread->isRunning() )
+      return (-1);
+
+    if ( rtspThread->getFrame( buffer ) )
     {
-        buffer.clear();
-        if ( !rtspThread->isRunning() )
-            return (-1);
+      Debug( 3, "Read frame %d bytes", buffer.size() );
+      Debug( 4, "Address %p", buffer.head() );
+      Hexdump( 4, buffer.head(), 16 );
 
-        if ( rtspThread->getFrame( buffer ) )
+      if ( !buffer.size() )
+        return( -1 );
+
+      if(mCodecContext->codec_id == AV_CODEC_ID_H264)
+      {
+        // SPS and PPS frames should be saved and appended to IDR frames
+        int nalType = (buffer.head()[3] & 0x1f);
+        
+        // SPS
+        if(nalType == 7)
         {
-            Debug( 3, "Read frame %d bytes", buffer.size() );
-            Debug( 4, "Address %p", buffer.head() );
-            Hexdump( 4, buffer.head(), 16 );
+          lastSps = buffer;
+          continue;
+        }
+        // PPS
+        else if(nalType == 8)
+        {
+          lastPps = buffer;
+          continue;
+        }
+        // IDR
+        else if(nalType == 5)
+        {
+          buffer += lastSps;
+          buffer += lastPps;
+        }
+      }
 
-            if ( !buffer.size() )
-                return( -1 );
+      av_init_packet( &packet );
 
-            if(mCodecContext->codec_id == AV_CODEC_ID_H264)
-            {
-                // SPS and PPS frames should be saved and appended to IDR frames
-                int nalType = (buffer.head()[3] & 0x1f);
-                
-                // SPS
-                if(nalType == 7)
-                {
-                    lastSps = buffer;
-                    continue;
-                }
-                // PPS
-                else if(nalType == 8)
-                {
-                    lastPps = buffer;
-                    continue;
-                }
-                // IDR
-                else if(nalType == 5)
-                {
-                    buffer += lastSps;
-                    buffer += lastPps;
-                }
-            }
+      while ( !frameComplete && buffer.size() > 0 ) {
+        packet.data = buffer.head();
+        packet.size = buffer.size();
 
-            av_init_packet( &packet );
-            
-	    while ( !frameComplete && buffer.size() > 0 )
-	    {
-		packet.data = buffer.head();
-		packet.size = buffer.size();
+        // So I think this is the magic decode step. Result is a raw image?
 #if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
-		int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
+        int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
 #else
-		int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size );
+        int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size );
 #endif
-		if ( len < 0 )
-		{
-			Error( "Error while decoding frame %d", frameCount );
-			Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
-			buffer.clear();
-			continue;
-		}
-		Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
-		//if ( buffer.size() < 400 )
-		   //Hexdump( 0, buffer.head(), buffer.size() );
-		   
-		buffer -= len;
-
-	    }
-            if ( frameComplete ) {
-	       
-		Debug( 3, "Got frame %d", frameCount );
-			    
-		avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);
-			
+        if ( len < 0 ) {
+          Error( "Error while decoding frame %d", frameCount );
+          Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
+          buffer.clear();
+          continue;
+        }
+        Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
+        //if ( buffer.size() < 400 )
+        //Hexdump( 0, buffer.head(), buffer.size() );
+        
+        buffer -= len;
+      }
+      // At this point, we either have a frame or ran out of buffer. What happens if we run out of buffer?
+      if ( frameComplete ) {
+        
+        Debug( 3, "Got frame %d", frameCount );
+        avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height );
+        
 #if HAVE_LIBSWSCALE
-		if(mConvertContext == NULL) {
-			mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
+        if(mConvertContext == NULL) {
+          mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
 
-			if(mConvertContext == NULL)
-				Fatal( "Unable to create conversion context");
-		}
-	
-		if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
-			Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
+          if(mConvertContext == NULL)
+            Fatal( "Unable to create conversion context");
+        }
+
+        if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
+          Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
 #else // HAVE_LIBSWSCALE
-		Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
+          Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
 #endif // HAVE_LIBSWSCALE
-	
-		frameCount++;
+          frameCount++;
+
+      } /* frame complete */
 
-	     } /* frame complete */
-	     
 #if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
-            av_packet_unref( &packet);
+      av_packet_unref( &packet );
 #else
-            av_free_packet( &packet );
+      av_free_packet( &packet );
 #endif
-	} /* getFrame() */
- 
-	if(frameComplete)
-		return (0);
-	
-    }
-    return (0) ;
+    } /* getFrame() */
+
+    if(frameComplete)
+      return (0);
+
+  } // end while true
+
+  // can never get here.
+  return (0) ;
 }
 
+//Function to handle capture and store
+int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* event_file ) {
+  AVPacket packet;
+  uint8_t* directbuffer;
+  int frameComplete = false;
+  
+  /* Request a writeable buffer of the target image */
+  directbuffer = image.WriteBuffer(width, height, colours, subpixelorder);
+  if(directbuffer == NULL) {
+    Error("Failed requesting writeable buffer for the captured image.");
+    return (-1);
+  }
+  
+  while ( true ) {
+    buffer.clear();
+    if ( !rtspThread->isRunning() )
+      return (-1);
+
+    if ( rtspThread->getFrame( buffer ) ) {
+      Debug( 3, "Read frame %d bytes", buffer.size() );
+      Debug( 4, "Address %p", buffer.head() );
+    Hexdump( 4, buffer.head(), 16 );
+
+      if ( !buffer.size() )
+        return( -1 );
+
+      if(mCodecContext->codec_id == AV_CODEC_ID_H264) {
+        // SPS and PPS frames should be saved and appended to IDR frames
+        int nalType = (buffer.head()[3] & 0x1f);
+        
+        // SPS
+        if(nalType == 7) {
+          lastSps = buffer;
+          continue;
+        }
+        // PPS
+        else if(nalType == 8) {
+          lastPps = buffer;
+          continue;
+        }
+        // IDR
+        else if(nalType == 5) {
+          buffer += lastSps;
+          buffer += lastPps;
+        }
+      } // end if H264, what about other codecs?
+
+      av_init_packet( &packet );
+      
+      // Why are we checking for it being the video stream
+      if ( packet.stream_index == mVideoStreamId ) {
+
+    while ( !frameComplete && buffer.size() > 0 )
+    {
+      packet.data = buffer.head();
+      packet.size = buffer.size();
+
+        // So this does the decode
+#if LIBAVCODEC_VERSION_CHECK(52, 23, 0, 23, 0)
+      int len = avcodec_decode_video2( mCodecContext, mRawFrame, &frameComplete, &packet );
+#else
+      int len = avcodec_decode_video( mCodecContext, mRawFrame, &frameComplete, packet.data, packet.size );
+#endif
+      if ( len < 0 )
+      {
+        Error( "Error while decoding frame %d", frameCount );
+        Hexdump( Logger::ERROR, buffer.head(), buffer.size()>256?256:buffer.size() );
+        buffer.clear();
+        continue;
+      }
+      Debug( 2, "Frame: %d - %d/%d", frameCount, len, buffer.size() );
+      //if ( buffer.size() < 400 )
+         //Hexdump( 0, buffer.head(), buffer.size() );
+       
+      buffer -= len;
+    } // end while get & decode a frame
+
+    if ( frameComplete ) {
+       
+      Debug( 3, "Got frame %d", frameCount );
+        
+      avpicture_fill( (AVPicture *)mFrame, directbuffer, imagePixFormat, width, height);
+      
+      //Video recording
+      if ( recording && !wasRecording ) {
+        //Instantiate the video storage module
+
+        videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
+        wasRecording = true;
+        strcpy(oldDirectory, event_file);
+
+      } else if ( !recording && wasRecording && videoStore ) {
+        // Why are we deleting the videostore? Becase for soem reason we are no longer recording? How does that happen?
+        Info("Deleting videoStore instance");
+        delete videoStore;
+        videoStore = NULL;
+      }
+
+      //The directory we are recording to is no longer tied to the current event. Need to re-init the videostore with the correct directory and start recording again
+      if ( recording && wasRecording && (strcmp(oldDirectory, event_file)!=0) && (packet.flags & AV_PKT_FLAG_KEY) ) {
+        //don't open new videostore until we're on a key frame..would this require an offset adjustment for the event as a result?...if we store our key frame location with the event will that be enough?
+        Info("Re-starting video storage module");
+        if ( videoStore ) {
+          delete videoStore;
+          videoStore = NULL;
+        }
+
+      videoStore = new VideoStore((const char *)event_file, "mp4", mFormatContext->streams[mVideoStreamId],mAudioStreamId==-1?NULL:mFormatContext->streams[mAudioStreamId],startTime);
+      strcpy( oldDirectory, event_file );
+      }
+
+      if ( videoStore && recording ) {
+        //Write the packet to our video store
+        int ret = videoStore->writeVideoFramePacket(&packet, mFormatContext->streams[mVideoStreamId]);//, &lastKeyframePkt);
+        if ( ret < 0 ) {//Less than zero and we skipped a frame
+          av_free_packet( &packet );
+          return 0;
+        }
+      }
+
+#if HAVE_LIBSWSCALE
+      if(mConvertContext == NULL) {
+        mConvertContext = sws_getContext( mCodecContext->width, mCodecContext->height, mCodecContext->pix_fmt, width, height, imagePixFormat, SWS_BICUBIC, NULL, NULL, NULL );
+
+        if(mConvertContext == NULL)
+          Fatal( "Unable to create conversion context");
+      }
+  
+      if ( sws_scale( mConvertContext, mRawFrame->data, mRawFrame->linesize, 0, mCodecContext->height, mFrame->data, mFrame->linesize ) < 0 )
+        Fatal( "Unable to convert raw format %u to target format %u at frame %d", mCodecContext->pix_fmt, imagePixFormat, frameCount );
+#else // HAVE_LIBSWSCALE
+      Fatal( "You must compile ffmpeg with the --enable-swscale option to use RTSP cameras" );
+#endif // HAVE_LIBSWSCALE
+  
+      frameCount++;
+
+    } /* frame complete */
+      } else if ( packet.stream_index == mAudioStreamId ) {
+        Debug( 4, "Got audio packet" );
+        if ( videoStore && recording ) {
+          if ( record_audio ) {
+            Debug( 4, "Storing Audio packet" );
+            //Write the packet to our video store
+            int ret = videoStore->writeAudioFramePacket(&packet, mFormatContext->streams[packet.stream_index]); //FIXME no relevance of last key frame
+            if ( ret < 0 ) { //Less than zero and we skipped a frame
+#if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
+              av_packet_unref( &packet );
+#else
+              av_free_packet( &packet );
+#endif
+              return 0;
+            }
+          } else {
+                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                                              Debug( 4, "Not storing audio" );
+          }
+        }
+      } // end if video or audio packet
+     
+#if LIBAVCODEC_VERSION_CHECK(57, 8, 0, 12, 100)
+    av_packet_unref( &packet);
+#else
+    av_free_packet( &packet );
+#endif
+  } /* getFrame() */
+ 
+  if(frameComplete)
+    return (0);
+  
+  } // end while true
+  return (0) ;
+} // int RemoteCameraRtsp::CaptureAndRecord( Image &image, bool recording, char* event_file ) 
+
 int RemoteCameraRtsp::PostCapture()
 {
-    return( 0 );
+  return( 0 );
 }
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_remote_camera_rtsp.h b/src/zm_remote_camera_rtsp.h
index 1e2bba7f8..1a1da6999 100644
--- a/src/zm_remote_camera_rtsp.h
+++ b/src/zm_remote_camera_rtsp.h
@@ -26,6 +26,7 @@
 #include "zm_utils.h"
 #include "zm_rtsp.h"
 #include "zm_ffmpeg.h"
+#include "zm_videostore.h"
 
 //
 // Class representing 'rtsp' cameras, i.e. those which are
@@ -35,51 +36,56 @@
 class RemoteCameraRtsp : public RemoteCamera
 {
 protected:
-	struct sockaddr_in rtsp_sa;
-	struct sockaddr_in rtcp_sa;
-	int rtsp_sd;
-	int rtp_sd;
-	int rtcp_sd;
-        bool rtsp_describe;
+  struct sockaddr_in rtsp_sa;
+  struct sockaddr_in rtcp_sa;
+  int rtsp_sd;
+  int rtp_sd;
+  int rtcp_sd;
+  bool rtsp_describe;
 
-	Buffer buffer;
-        Buffer lastSps;
-        Buffer lastPps;
+  Buffer buffer;
+  Buffer lastSps;
+  Buffer lastPps;
 
-    RtspThread::RtspMethod method;
+  RtspThread::RtspMethod method;
 
-    RtspThread *rtspThread;
+  RtspThread *rtspThread;
 
-    int frameCount;
-    
+  int frameCount;
+  
 #if HAVE_LIBAVFORMAT
-    AVFormatContext     *mFormatContext;
-    int                 mVideoStreamId;
-    AVCodecContext      *mCodecContext;
-    AVCodec             *mCodec;
-    AVFrame             *mRawFrame; 
-    AVFrame             *mFrame;
-    _AVPIXELFORMAT         imagePixFormat;
+  AVFormatContext   *mFormatContext;
+  int         mVideoStreamId;
+  int         mAudioStreamId;
+  AVCodecContext    *mCodecContext;
+  AVCodec       *mCodec;
+  AVFrame       *mRawFrame; 
+  AVFrame       *mFrame;
+  _AVPIXELFORMAT     imagePixFormat;
 #endif // HAVE_LIBAVFORMAT
+  bool                wasRecording;
+  VideoStore          *videoStore;
+  char                oldDirectory[4096];
+  int64_t             startTime;
 
 #if HAVE_LIBSWSCALE
-	struct SwsContext   *mConvertContext;
+  struct SwsContext   *mConvertContext;
 #endif
 
 public:
-	RemoteCameraRtsp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture );
-	~RemoteCameraRtsp();
+  RemoteCameraRtsp( int p_id, const std::string &method, const std::string &host, const std::string &port, const std::string &path, int p_width, int p_height, bool p_rtsp_describe, int p_colours, int p_brightness, int p_contrast, int p_hue, int p_colour, bool p_capture, bool p_record_audio );
+  ~RemoteCameraRtsp();
 
-	void Initialise();
-	void Terminate();
-        int Connect();
-        int Disconnect();
+  void Initialise();
+  void Terminate();
+  int Connect();
+  int Disconnect();
 
-	int PrimeCapture();
-	int PreCapture();
-	int Capture( Image &image );
-	int PostCapture();
-    	int CaptureAndRecord( Image &image, bool recording, char* event_directory ) {return(0);};
+  int PrimeCapture();
+  int PreCapture();
+  int Capture( Image &image );
+  int PostCapture();
+	int CaptureAndRecord( Image &image, bool recording, char* event_directory );
 };
 
 #endif // ZM_REMOTE_CAMERA_RTSP_H
diff --git a/src/zm_rgb.h b/src/zm_rgb.h
index bfef10501..af74d872b 100644
--- a/src/zm_rgb.h
+++ b/src/zm_rgb.h
@@ -20,80 +20,80 @@
 #ifndef ZM_RGB_H
 #define ZM_RGB_H
 
-typedef uint32_t Rgb;	// RGB colour type
+typedef uint32_t Rgb;  // RGB colour type
 
-#define WHITE   	0xff
-#define WHITE_R 	0xff
-#define WHITE_G 	0xff
-#define WHITE_B 	0xff
+#define WHITE     0xff
+#define WHITE_R   0xff
+#define WHITE_G   0xff
+#define WHITE_B   0xff
 
-#define BLACK   	0x00
-#define BLACK_R 	0x00
-#define BLACK_G 	0x00
-#define BLACK_B 	0x00
+#define BLACK     0x00
+#define BLACK_R   0x00
+#define BLACK_G   0x00
+#define BLACK_B   0x00
 
-#define RGB_WHITE   	(0x00ffffff)
-#define RGB_BLACK   	(0x00000000)
-#define RGB_RED     	(0x000000ff)
-#define RGB_GREEN   	(0x0000ff00)
-#define RGB_BLUE    	(0x00ff0000)
-#define RGB_ORANGE  	(0x0000a5ff)
-#define RGB_PURPLE  	(0x00800080)
-#define RGB_TRANSPARENT	(0x01000000)
+#define RGB_WHITE     (0x00ffffff)
+#define RGB_BLACK     (0x00000000)
+#define RGB_RED     (0x000000ff)
+#define RGB_GREEN     (0x0000ff00)
+#define RGB_BLUE    (0x00ff0000)
+#define RGB_ORANGE    (0x0000a5ff)
+#define RGB_PURPLE    (0x00800080)
+#define RGB_TRANSPARENT  (0x01000000)
 
-#define RGB_VAL(v,c)    	(((v)>>(16-((c)*8)))&0xff)
+#define RGB_VAL(v,c)    (((v)>>(16-((c)*8)))&0xff)
 
 /* RGB or RGBA macros */
-#define BLUE_VAL_RGBA(v)	(((v)>>16)&0xff)
-#define GREEN_VAL_RGBA(v)	(((v)>>8)&0xff)
-#define RED_VAL_RGBA(v) 	((v)&0xff)
-#define ALPHA_VAL_RGBA(v)	((v)>>24)&0xff)
-#define RED_PTR_RGBA(ptr)	(*((uint8_t*)ptr))
-#define GREEN_PTR_RGBA(ptr)	(*((uint8_t*)ptr+1))
-#define BLUE_PTR_RGBA(ptr)	(*((uint8_t*)ptr+2))
-#define ALPHA_PTR_RGBA(ptr)	(*((uint8_t*)ptr+3))
+#define BLUE_VAL_RGBA(v)  (((v)>>16)&0xff)
+#define GREEN_VAL_RGBA(v)  (((v)>>8)&0xff)
+#define RED_VAL_RGBA(v)   ((v)&0xff)
+#define ALPHA_VAL_RGBA(v)  ((v)>>24)&0xff)
+#define RED_PTR_RGBA(ptr)  (*((uint8_t*)ptr))
+#define GREEN_PTR_RGBA(ptr)  (*((uint8_t*)ptr+1))
+#define BLUE_PTR_RGBA(ptr)  (*((uint8_t*)ptr+2))
+#define ALPHA_PTR_RGBA(ptr)  (*((uint8_t*)ptr+3))
 
 /* BGR or BGRA */
-#define RED_VAL_BGRA(v) 	(((v)>>16)&0xff)
-#define GREEN_VAL_BGRA(v)	(((v)>>8)&0xff)
-#define BLUE_VAL_BGRA(v)	((v)&0xff)
-#define ALPHA_VAL_BGRA(v)	((v)>>24)&0xff)
-#define RED_PTR_BGRA(ptr)	(*((uint8_t*)ptr+2))
-#define GREEN_PTR_BGRA(ptr)	(*((uint8_t*)ptr+1))
-#define BLUE_PTR_BGRA(ptr)	(*((uint8_t*)ptr))
-#define ALPHA_PTR_BGRA(ptr)	(*((uint8_t*)ptr+3))
+#define RED_VAL_BGRA(v)   (((v)>>16)&0xff)
+#define GREEN_VAL_BGRA(v)  (((v)>>8)&0xff)
+#define BLUE_VAL_BGRA(v)  ((v)&0xff)
+#define ALPHA_VAL_BGRA(v)  ((v)>>24)&0xff)
+#define RED_PTR_BGRA(ptr)  (*((uint8_t*)ptr+2))
+#define GREEN_PTR_BGRA(ptr)  (*((uint8_t*)ptr+1))
+#define BLUE_PTR_BGRA(ptr)  (*((uint8_t*)ptr))
+#define ALPHA_PTR_BGRA(ptr)  (*((uint8_t*)ptr+3))
 
 /* ARGB */
-#define BLUE_VAL_ARGB(v)	(((v)>>24)&0xff)
-#define GREEN_VAL_ARGB(v)	(((v)>>16)&0xff)
-#define RED_VAL_ARGB(v) 	(((v)>>8)&0xff)
-#define ALPHA_VAL_ARGB(v)	((v)&0xff)
-#define RED_PTR_ARGB(ptr)	(*((uint8_t*)ptr+1))
-#define GREEN_PTR_ARGB(ptr)	(*((uint8_t*)ptr+2))
-#define BLUE_PTR_ARGB(ptr)	(*((uint8_t*)ptr+3))
-#define ALPHA_PTR_ARGB(ptr)	(*((uint8_t*)ptr))
+#define BLUE_VAL_ARGB(v)  (((v)>>24)&0xff)
+#define GREEN_VAL_ARGB(v)  (((v)>>16)&0xff)
+#define RED_VAL_ARGB(v)   (((v)>>8)&0xff)
+#define ALPHA_VAL_ARGB(v)  ((v)&0xff)
+#define RED_PTR_ARGB(ptr)  (*((uint8_t*)ptr+1))
+#define GREEN_PTR_ARGB(ptr)  (*((uint8_t*)ptr+2))
+#define BLUE_PTR_ARGB(ptr)  (*((uint8_t*)ptr+3))
+#define ALPHA_PTR_ARGB(ptr)  (*((uint8_t*)ptr))
 
 /* ABGR */
-#define BLUE_VAL_ABGR(v)	(((v)>>8)&0xff)
-#define GREEN_VAL_ABGR(v)	(((v)>>16)&0xff)
-#define RED_VAL_ABGR(v) 	(((v)>>24)&0xff)
-#define ALPHA_VAL_ABGR(v)	((v)&0xff)
-#define RED_PTR_ABGR(ptr)	(*((uint8_t*)ptr+3))
-#define GREEN_PTR_ABGR(ptr)	(*((uint8_t*)ptr+2))
-#define BLUE_PTR_ABGR(ptr)	(*((uint8_t*)ptr+1))
-#define ALPHA_PTR_ABGR(ptr)	(*((uint8_t*)ptr))
+#define BLUE_VAL_ABGR(v)  (((v)>>8)&0xff)
+#define GREEN_VAL_ABGR(v)  (((v)>>16)&0xff)
+#define RED_VAL_ABGR(v)   (((v)>>24)&0xff)
+#define ALPHA_VAL_ABGR(v)  ((v)&0xff)
+#define RED_PTR_ABGR(ptr)  (*((uint8_t*)ptr+3))
+#define GREEN_PTR_ABGR(ptr)  (*((uint8_t*)ptr+2))
+#define BLUE_PTR_ABGR(ptr)  (*((uint8_t*)ptr+1))
+#define ALPHA_PTR_ABGR(ptr)  (*((uint8_t*)ptr))
 
 
-#define RGBA_BGRA_ZEROALPHA(v)	((v)&0x00ffffff)
-#define ARGB_ABGR_ZEROALPHA(v)	((v)&0xffffff00)
+#define RGBA_BGRA_ZEROALPHA(v)  ((v)&0x00ffffff)
+#define ARGB_ABGR_ZEROALPHA(v)  ((v)&0xffffff00)
 
 /* ITU-R BT.709: Y = (0.2126 * R) + (0.7152 * G) + (0.0722 * B) */
 /* ITU-R BT.601: Y = (0.299  * R) + (0.587  * G) + (0.114  * B) */
 /* The formulas below produce an almost identical result to the weighted algorithms from the ITU-R BT.601 standard and the newer ITU-R BT.709 standard, but a lot faster */
-// #define RGB_FASTLUM_SINGLE_ITU709(v)		((RED(v)+RED(v)+BLUE(v)+GREEN(v)+GREEN(v)+GREEN(v)+GREEN(v)+GREEN(v))>>3)
-// #define RGB_FASTLUM_VALUES_ITU709(ra,ga,ba)	(((ra)+(ra)+(ba)+(ga)+(ga)+(ga)+(ga)+(ga))>>3)
-// #define RGB_FASTLUM_SINGLE_ITU601(v)		((RED(v)+RED(v)+RED(v)+BLUE(v)+GREEN(v)+GREEN(v)+GREEN(v)+GREEN(v))>>3)
-// #define RGB_FASTLUM_VALUES_ITU601(ra,ga,ba)	(((ra)+(ra)+(ra)+(ba)+(ga)+(ga)+(ga)+(ga))>>3)
+// #define RGB_FASTLUM_SINGLE_ITU709(v)    ((RED(v)+RED(v)+BLUE(v)+GREEN(v)+GREEN(v)+GREEN(v)+GREEN(v)+GREEN(v))>>3)
+// #define RGB_FASTLUM_VALUES_ITU709(ra,ga,ba)  (((ra)+(ra)+(ba)+(ga)+(ga)+(ga)+(ga)+(ga))>>3)
+// #define RGB_FASTLUM_SINGLE_ITU601(v)    ((RED(v)+RED(v)+RED(v)+BLUE(v)+GREEN(v)+GREEN(v)+GREEN(v)+GREEN(v))>>3)
+// #define RGB_FASTLUM_VALUES_ITU601(ra,ga,ba)  (((ra)+(ra)+(ra)+(ba)+(ga)+(ga)+(ga)+(ga))>>3)
 
 /* ZM colours */
 #define ZM_COLOUR_RGB32 4
@@ -112,46 +112,46 @@ typedef uint32_t Rgb;	// RGB colour type
 
 /* A macro to use default subpixel order for a specified colour. */
 /* for grayscale it will use NONE, for 3 colours it will use R,G,B, for 4 colours it will use R,G,B,A */
-#define ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(c)	((c)<<1)
+#define ZM_SUBPIX_ORDER_DEFAULT_FOR_COLOUR(c)  ((c)<<1)
 
 /* Convert RGB colour value into BGR\ARGB\ABGR */
 inline Rgb rgb_convert(Rgb p_col, int p_subpixorder) {
-	Rgb result;
-	
-	switch(p_subpixorder) {
-	  
-	  case ZM_SUBPIX_ORDER_BGR:
-	  case ZM_SUBPIX_ORDER_BGRA:
-	  {
-	    BLUE_PTR_BGRA(&result) = BLUE_VAL_RGBA(p_col);
-	    GREEN_PTR_BGRA(&result) = GREEN_VAL_RGBA(p_col);
-	    RED_PTR_BGRA(&result) = RED_VAL_RGBA(p_col);
-	  }
-	  break;
-	  case ZM_SUBPIX_ORDER_ARGB:
-	  {
-	    BLUE_PTR_ARGB(&result) = BLUE_VAL_RGBA(p_col);
-	    GREEN_PTR_ARGB(&result) = GREEN_VAL_RGBA(p_col);
-	    RED_PTR_ARGB(&result) = RED_VAL_RGBA(p_col);
-	  }
-	  break;
-	  case ZM_SUBPIX_ORDER_ABGR:
-	  {
-	    BLUE_PTR_ABGR(&result) = BLUE_VAL_RGBA(p_col);
-	    GREEN_PTR_ABGR(&result) = GREEN_VAL_RGBA(p_col);
-	    RED_PTR_ABGR(&result) = RED_VAL_RGBA(p_col);
-	  }
-	  break;
-	  /* Grayscale */
-	  case ZM_SUBPIX_ORDER_NONE:
-	    result = p_col & 0xff;
-	    break;
-	  default:
-	    return p_col;
-	    break;
-	}
-	
-	return result;
+  Rgb result;
+  
+  switch(p_subpixorder) {
+    
+    case ZM_SUBPIX_ORDER_BGR:
+    case ZM_SUBPIX_ORDER_BGRA:
+    {
+    BLUE_PTR_BGRA(&result) = BLUE_VAL_RGBA(p_col);
+    GREEN_PTR_BGRA(&result) = GREEN_VAL_RGBA(p_col);
+    RED_PTR_BGRA(&result) = RED_VAL_RGBA(p_col);
+    }
+    break;
+    case ZM_SUBPIX_ORDER_ARGB:
+    {
+    BLUE_PTR_ARGB(&result) = BLUE_VAL_RGBA(p_col);
+    GREEN_PTR_ARGB(&result) = GREEN_VAL_RGBA(p_col);
+    RED_PTR_ARGB(&result) = RED_VAL_RGBA(p_col);
+    }
+    break;
+    case ZM_SUBPIX_ORDER_ABGR:
+    {
+    BLUE_PTR_ABGR(&result) = BLUE_VAL_RGBA(p_col);
+    GREEN_PTR_ABGR(&result) = GREEN_VAL_RGBA(p_col);
+    RED_PTR_ABGR(&result) = RED_VAL_RGBA(p_col);
+    }
+    break;
+    /* Grayscale */
+    case ZM_SUBPIX_ORDER_NONE:
+    result = p_col & 0xff;
+    break;
+    default:
+    return p_col;
+    break;
+  }
+  
+  return result;
 }
 
 #endif // ZM_RGB_H
diff --git a/src/zm_rtp_ctrl.cpp b/src/zm_rtp_ctrl.cpp
index 1a0604137..5ff23b31d 100644
--- a/src/zm_rtp_ctrl.cpp
+++ b/src/zm_rtp_ctrl.cpp
@@ -34,343 +34,343 @@ RtpCtrlThread::RtpCtrlThread( RtspThread &rtspThread, RtpSource &rtpSource ) : m
 
 int RtpCtrlThread::recvPacket( const unsigned char *packet, ssize_t packetLen )
 {
-    const RtcpPacket *rtcpPacket;
-    rtcpPacket = (RtcpPacket *)packet;
+  const RtcpPacket *rtcpPacket;
+  rtcpPacket = (RtcpPacket *)packet;
 
-    int consumed = 0;
+  int consumed = 0;
 
-    //printf( "C: " );
-    //for ( int i = 0; i < packetLen; i++ )
-        //printf( "%02x ", (unsigned char)packet[i] );
-    //printf( "\n" );
-    int ver = rtcpPacket->header.version;
-    int count = rtcpPacket->header.count;
-    int pt = rtcpPacket->header.pt;
-    int len = ntohs(rtcpPacket->header.lenN);
+  //printf( "C: " );
+  //for ( int i = 0; i < packetLen; i++ )
+    //printf( "%02x ", (unsigned char)packet[i] );
+  //printf( "\n" );
+  int ver = rtcpPacket->header.version;
+  int count = rtcpPacket->header.count;
+  int pt = rtcpPacket->header.pt;
+  int len = ntohs(rtcpPacket->header.lenN);
 
-    Debug( 5, "RTCP Ver: %d", ver );
-    Debug( 5, "RTCP Count: %d", count );
-    Debug( 5, "RTCP Pt: %d", pt );
-    Debug( 5, "RTCP len: %d", len );
+  Debug( 5, "RTCP Ver: %d", ver );
+  Debug( 5, "RTCP Count: %d", count );
+  Debug( 5, "RTCP Pt: %d", pt );
+  Debug( 5, "RTCP len: %d", len );
 
-    switch( pt )
+  switch( pt )
+  {
+    case RTCP_SR :
     {
-        case RTCP_SR :
-        {
-            uint32_t ssrc = ntohl(rtcpPacket->body.sr.ssrcN);
+      uint32_t ssrc = ntohl(rtcpPacket->body.sr.ssrcN);
 
-            Debug( 5, "RTCP Got SR (%x)", ssrc );
-            if ( mRtpSource.getSsrc() )
-            {
-                if ( ssrc != mRtpSource.getSsrc() )
-                {
-                    Warning( "Discarding packet for unrecognised ssrc %x", ssrc );
-                    return( -1 );
-                }
-            }
-            else if ( ssrc )
-            {
-                mRtpSource.setSsrc( ssrc );
-            }
+      Debug( 5, "RTCP Got SR (%x)", ssrc );
+      if ( mRtpSource.getSsrc() )
+      {
+        if ( ssrc != mRtpSource.getSsrc() )
+        {
+          Warning( "Discarding packet for unrecognised ssrc %x", ssrc );
+          return( -1 );
+        }
+      }
+      else if ( ssrc )
+      {
+        mRtpSource.setSsrc( ssrc );
+      }
 
-            if ( len > 1 )
-            {
-                //printf( "NTPts:%d.%d, RTPts:%d\n", $ntptsmsb, $ntptslsb, $rtpts );
-                uint16_t ntptsmsb = ntohl(rtcpPacket->body.sr.ntpSecN);
-                uint16_t ntptslsb = ntohl(rtcpPacket->body.sr.ntpFracN);
-                //printf( "NTPts:%x.%04x, RTPts:%x\n", $ntptsmsb, $ntptslsb, $rtpts );
-                //printf( "Pkts:$sendpkts, Octs:$sendocts\n" );
-                uint32_t rtpTime = ntohl(rtcpPacket->body.sr.rtpTsN);
+      if ( len > 1 )
+      {
+        //printf( "NTPts:%d.%d, RTPts:%d\n", $ntptsmsb, $ntptslsb, $rtpts );
+        uint16_t ntptsmsb = ntohl(rtcpPacket->body.sr.ntpSecN);
+        uint16_t ntptslsb = ntohl(rtcpPacket->body.sr.ntpFracN);
+        //printf( "NTPts:%x.%04x, RTPts:%x\n", $ntptsmsb, $ntptslsb, $rtpts );
+        //printf( "Pkts:$sendpkts, Octs:$sendocts\n" );
+        uint32_t rtpTime = ntohl(rtcpPacket->body.sr.rtpTsN);
 
-                mRtpSource.updateRtcpData( ntptsmsb, ntptslsb, rtpTime );
-            }
-            break;
-        }
-        case RTCP_SDES :
-        {
-            ssize_t contentLen = packetLen - sizeof(rtcpPacket->header);
-            while ( contentLen )
-            {
-                Debug( 5, "RTCP CL: %zd", contentLen );
-                uint32_t ssrc = ntohl(rtcpPacket->body.sdes.srcN);
-
-                Debug( 5, "RTCP Got SDES (%x), %d items", ssrc, count );
-                if ( mRtpSource.getSsrc() && (ssrc != mRtpSource.getSsrc()) )
-                {
-                    Warning( "Discarding packet for unrecognised ssrc %x", ssrc );
-                    return( -1 );
-                }
-
-                unsigned char *sdesPtr = (unsigned char *)&rtcpPacket->body.sdes.item;
-                for ( int i = 0; i < count; i++ )
-                {
-                    RtcpSdesItem *item = (RtcpSdesItem *)sdesPtr;
-                    Debug( 5, "RTCP Item length %d", item->len );
-                    switch( item->type )
-                    {
-                        case RTCP_SDES_CNAME :
-                        {
-                            std::string cname( item->data, item->len );
-                            Debug( 5, "RTCP Got CNAME %s", cname.c_str() );
-                            break;
-                        }
-                        case RTCP_SDES_END :
-                        case RTCP_SDES_NAME :
-                        case RTCP_SDES_EMAIL :
-                        case RTCP_SDES_PHONE :
-                        case RTCP_SDES_LOC :
-                        case RTCP_SDES_TOOL :
-                        case RTCP_SDES_NOTE :
-                        case RTCP_SDES_PRIV :
-                        default :
-                        {
-                            Error( "Received unexpected SDES item type %d, ignoring", item->type );
-                            return( -1 );
-                        }
-                    }
-                    int paddedLen = 4+2+item->len+1; // Add null byte
-                    paddedLen = (((paddedLen-1)/4)+1)*4; // Round to nearest multiple of 4
-                    Debug( 5, "RTCP PL:%d", paddedLen );
-                    sdesPtr += paddedLen;
-                    contentLen = ( paddedLen <= contentLen ) ? ( contentLen - paddedLen ) : 0;
-                }
-            }
-            break;
-        }
-        case RTCP_BYE :
-        {
-            Debug( 5, "RTCP Got BYE" );
-            mStop = true;
-            break;
-        }
-        case RTCP_APP :
-        {
-            // Ignoring as per RFC 3550
-            Debug( 5, "Received RTCP_APP packet, ignoring.");
-            break;
-        }
-        case RTCP_RR :
-        {
-            Error( "Received RTCP_RR packet." );
-            return( -1 );
-        }
-        default :
-        {
-            // Ignore unknown packet types. Some cameras do this by design.
-            Debug( 5, "Received unexpected packet type %d, ignoring", pt );
-            break;
-        }
+        mRtpSource.updateRtcpData( ntptsmsb, ntptslsb, rtpTime );
+      }
+      break;
     }
-    consumed = sizeof(uint32_t)*(len+1);
-    return( consumed );
+    case RTCP_SDES :
+    {
+      ssize_t contentLen = packetLen - sizeof(rtcpPacket->header);
+      while ( contentLen )
+      {
+        Debug( 5, "RTCP CL: %zd", contentLen );
+        uint32_t ssrc = ntohl(rtcpPacket->body.sdes.srcN);
+
+        Debug( 5, "RTCP Got SDES (%x), %d items", ssrc, count );
+        if ( mRtpSource.getSsrc() && (ssrc != mRtpSource.getSsrc()) )
+        {
+          Warning( "Discarding packet for unrecognised ssrc %x", ssrc );
+          return( -1 );
+        }
+
+        unsigned char *sdesPtr = (unsigned char *)&rtcpPacket->body.sdes.item;
+        for ( int i = 0; i < count; i++ )
+        {
+          RtcpSdesItem *item = (RtcpSdesItem *)sdesPtr;
+          Debug( 5, "RTCP Item length %d", item->len );
+          switch( item->type )
+          {
+            case RTCP_SDES_CNAME :
+            {
+              std::string cname( item->data, item->len );
+              Debug( 5, "RTCP Got CNAME %s", cname.c_str() );
+              break;
+            }
+            case RTCP_SDES_END :
+            case RTCP_SDES_NAME :
+            case RTCP_SDES_EMAIL :
+            case RTCP_SDES_PHONE :
+            case RTCP_SDES_LOC :
+            case RTCP_SDES_TOOL :
+            case RTCP_SDES_NOTE :
+            case RTCP_SDES_PRIV :
+            default :
+            {
+              Error( "Received unexpected SDES item type %d, ignoring", item->type );
+              return( -1 );
+            }
+          }
+          int paddedLen = 4+2+item->len+1; // Add null byte
+          paddedLen = (((paddedLen-1)/4)+1)*4; // Round to nearest multiple of 4
+          Debug( 5, "RTCP PL:%d", paddedLen );
+          sdesPtr += paddedLen;
+          contentLen = ( paddedLen <= contentLen ) ? ( contentLen - paddedLen ) : 0;
+        }
+      }
+      break;
+    }
+    case RTCP_BYE :
+    {
+      Debug( 5, "RTCP Got BYE" );
+      mStop = true;
+      break;
+    }
+    case RTCP_APP :
+    {
+      // Ignoring as per RFC 3550
+      Debug( 5, "Received RTCP_APP packet, ignoring.");
+      break;
+    }
+    case RTCP_RR :
+    {
+      Error( "Received RTCP_RR packet." );
+      return( -1 );
+    }
+    default :
+    {
+      // Ignore unknown packet types. Some cameras do this by design.
+      Debug( 5, "Received unexpected packet type %d, ignoring", pt );
+      break;
+    }
+  }
+  consumed = sizeof(uint32_t)*(len+1);
+  return( consumed );
 }
 
 int RtpCtrlThread::generateRr( const unsigned char *packet, ssize_t packetLen )
 {
-    RtcpPacket *rtcpPacket = (RtcpPacket *)packet;
+  RtcpPacket *rtcpPacket = (RtcpPacket *)packet;
 
-    int byteLen = sizeof(rtcpPacket->header)+sizeof(rtcpPacket->body.rr)+sizeof(rtcpPacket->body.rr.rr[0]);
-    int wordLen = ((byteLen-1)/sizeof(uint32_t))+1;
+  int byteLen = sizeof(rtcpPacket->header)+sizeof(rtcpPacket->body.rr)+sizeof(rtcpPacket->body.rr.rr[0]);
+  int wordLen = ((byteLen-1)/sizeof(uint32_t))+1;
 
-    rtcpPacket->header.version = RTP_VERSION;
-    rtcpPacket->header.p = 0;
-    rtcpPacket->header.pt = RTCP_RR;
-    rtcpPacket->header.count = 1;
-    rtcpPacket->header.lenN = htons(wordLen-1);
+  rtcpPacket->header.version = RTP_VERSION;
+  rtcpPacket->header.p = 0;
+  rtcpPacket->header.pt = RTCP_RR;
+  rtcpPacket->header.count = 1;
+  rtcpPacket->header.lenN = htons(wordLen-1);
 
-    mRtpSource.updateRtcpStats();
+  mRtpSource.updateRtcpStats();
 
-    Debug( 5, "Ssrc = %d", mRtspThread.getSsrc()+1 );
-    Debug( 5, "Ssrc_1 = %d", mRtpSource.getSsrc() );
-    Debug( 5, "Last Seq = %d", mRtpSource.getMaxSeq() );
-    Debug( 5, "Jitter = %d", mRtpSource.getJitter() );
-    Debug( 5, "Last SR = %d", mRtpSource.getLastSrTimestamp() );
+  Debug( 5, "Ssrc = %d", mRtspThread.getSsrc()+1 );
+  Debug( 5, "Ssrc_1 = %d", mRtpSource.getSsrc() );
+  Debug( 5, "Last Seq = %d", mRtpSource.getMaxSeq() );
+  Debug( 5, "Jitter = %d", mRtpSource.getJitter() );
+  Debug( 5, "Last SR = %d", mRtpSource.getLastSrTimestamp() );
 
-    rtcpPacket->body.rr.ssrcN = htonl(mRtspThread.getSsrc()+1);
-    rtcpPacket->body.rr.rr[0].ssrcN = htonl(mRtpSource.getSsrc());
-    rtcpPacket->body.rr.rr[0].lost = mRtpSource.getLostPackets();
-    rtcpPacket->body.rr.rr[0].fraction = mRtpSource.getLostFraction();
-    rtcpPacket->body.rr.rr[0].lastSeqN = htonl(mRtpSource.getMaxSeq());
-    rtcpPacket->body.rr.rr[0].jitterN = htonl(mRtpSource.getJitter());
-    rtcpPacket->body.rr.rr[0].lsrN = htonl(mRtpSource.getLastSrTimestamp());
-    rtcpPacket->body.rr.rr[0].dlsrN = 0;
+  rtcpPacket->body.rr.ssrcN = htonl(mRtspThread.getSsrc()+1);
+  rtcpPacket->body.rr.rr[0].ssrcN = htonl(mRtpSource.getSsrc());
+  rtcpPacket->body.rr.rr[0].lost = mRtpSource.getLostPackets();
+  rtcpPacket->body.rr.rr[0].fraction = mRtpSource.getLostFraction();
+  rtcpPacket->body.rr.rr[0].lastSeqN = htonl(mRtpSource.getMaxSeq());
+  rtcpPacket->body.rr.rr[0].jitterN = htonl(mRtpSource.getJitter());
+  rtcpPacket->body.rr.rr[0].lsrN = htonl(mRtpSource.getLastSrTimestamp());
+  rtcpPacket->body.rr.rr[0].dlsrN = 0;
 
-    return( wordLen*sizeof(uint32_t) );
+  return( wordLen*sizeof(uint32_t) );
 }
 
 int RtpCtrlThread::generateSdes( const unsigned char *packet, ssize_t packetLen )
 {
-    RtcpPacket *rtcpPacket = (RtcpPacket *)packet;
+  RtcpPacket *rtcpPacket = (RtcpPacket *)packet;
 
-    const std::string &cname = mRtpSource.getCname();
+  const std::string &cname = mRtpSource.getCname();
 
-    int byteLen = sizeof(rtcpPacket->header)+sizeof(rtcpPacket->body.sdes)+sizeof(rtcpPacket->body.sdes.item[0])+cname.size();
-    int wordLen = ((byteLen-1)/sizeof(uint32_t))+1;
+  int byteLen = sizeof(rtcpPacket->header)+sizeof(rtcpPacket->body.sdes)+sizeof(rtcpPacket->body.sdes.item[0])+cname.size();
+  int wordLen = ((byteLen-1)/sizeof(uint32_t))+1;
 
-    rtcpPacket->header.version = RTP_VERSION;
-    rtcpPacket->header.p = 0;
-    rtcpPacket->header.pt = RTCP_SDES;
-    rtcpPacket->header.count = 1;
-    rtcpPacket->header.lenN = htons(wordLen-1);
+  rtcpPacket->header.version = RTP_VERSION;
+  rtcpPacket->header.p = 0;
+  rtcpPacket->header.pt = RTCP_SDES;
+  rtcpPacket->header.count = 1;
+  rtcpPacket->header.lenN = htons(wordLen-1);
 
-    rtcpPacket->body.sdes.srcN = htonl(mRtpSource.getSsrc()+1);
-    rtcpPacket->body.sdes.item[0].type = RTCP_SDES_CNAME;
-    rtcpPacket->body.sdes.item[0].len = cname.size();
-    memcpy( rtcpPacket->body.sdes.item[0].data, cname.data(), cname.size() );
+  rtcpPacket->body.sdes.srcN = htonl(mRtpSource.getSsrc()+1);
+  rtcpPacket->body.sdes.item[0].type = RTCP_SDES_CNAME;
+  rtcpPacket->body.sdes.item[0].len = cname.size();
+  memcpy( rtcpPacket->body.sdes.item[0].data, cname.data(), cname.size() );
 
-    return( wordLen*sizeof(uint32_t) );
+  return( wordLen*sizeof(uint32_t) );
 }
 
 int RtpCtrlThread::generateBye( const unsigned char *packet, ssize_t packetLen )
 {
-    RtcpPacket *rtcpPacket = (RtcpPacket *)packet;
+  RtcpPacket *rtcpPacket = (RtcpPacket *)packet;
 
-    int byteLen = sizeof(rtcpPacket->header)+sizeof(rtcpPacket->body.bye)+sizeof(rtcpPacket->body.bye.srcN[0]);
-    int wordLen = ((byteLen-1)/sizeof(uint32_t))+1;
+  int byteLen = sizeof(rtcpPacket->header)+sizeof(rtcpPacket->body.bye)+sizeof(rtcpPacket->body.bye.srcN[0]);
+  int wordLen = ((byteLen-1)/sizeof(uint32_t))+1;
 
-    rtcpPacket->header.version = RTP_VERSION;
-    rtcpPacket->header.p = 0;
-    rtcpPacket->header.pt = RTCP_BYE;
-    rtcpPacket->header.count = 1;
-    rtcpPacket->header.lenN = htons(wordLen-1);
+  rtcpPacket->header.version = RTP_VERSION;
+  rtcpPacket->header.p = 0;
+  rtcpPacket->header.pt = RTCP_BYE;
+  rtcpPacket->header.count = 1;
+  rtcpPacket->header.lenN = htons(wordLen-1);
 
-    rtcpPacket->body.bye.srcN[0] = htonl(mRtpSource.getSsrc());
+  rtcpPacket->body.bye.srcN[0] = htonl(mRtpSource.getSsrc());
 
-    return( wordLen*sizeof(uint32_t) );
+  return( wordLen*sizeof(uint32_t) );
 }
 
 int RtpCtrlThread::recvPackets( unsigned char *buffer, ssize_t nBytes )
 {
-    unsigned char *bufferPtr = buffer;
+  unsigned char *bufferPtr = buffer;
 
-    // u_int32 len;        /* length of compound RTCP packet in words */
-    // rtcp_t *r;          /* RTCP header */
-    // rtcp_t *end;        /* end of compound RTCP packet */
+  // u_int32 len;    /* length of compound RTCP packet in words */
+  // rtcp_t *r;      /* RTCP header */
+  // rtcp_t *end;    /* end of compound RTCP packet */
 
-    // if ((*(u_int16 *)r & RTCP_VALID_MASK) != RTCP_VALID_VALUE) {
-        // /* something wrong with packet format */
-    // }
-    // end = (rtcp_t *)((u_int32 *)r + len);
+  // if ((*(u_int16 *)r & RTCP_VALID_MASK) != RTCP_VALID_VALUE) {
+    // /* something wrong with packet format */
+  // }
+  // end = (rtcp_t *)((u_int32 *)r + len);
 
-    // do r = (rtcp_t *)((u_int32 *)r + r->common.length + 1);
-    // while (r < end && r->common.version == 2);
+  // do r = (rtcp_t *)((u_int32 *)r + r->common.length + 1);
+  // while (r < end && r->common.version == 2);
 
-    // if (r != end) {
-        // /* something wrong with packet format */
-    // }
+  // if (r != end) {
+    // /* something wrong with packet format */
+  // }
 
-    while ( nBytes > 0 )
-    {
-        int consumed = recvPacket( bufferPtr, nBytes );
-        if ( consumed <= 0 )
-            break;
-        bufferPtr += consumed;
-        nBytes -= consumed;
-    }
-    return( nBytes );
+  while ( nBytes > 0 )
+  {
+    int consumed = recvPacket( bufferPtr, nBytes );
+    if ( consumed <= 0 )
+      break;
+    bufferPtr += consumed;
+    nBytes -= consumed;
+  }
+  return( nBytes );
 }
 
 int RtpCtrlThread::run()
 {
-    Debug( 2, "Starting control thread %x on port %d", mRtpSource.getSsrc(), mRtpSource.getLocalCtrlPort() );
-    SockAddrInet localAddr, remoteAddr;
+  Debug( 2, "Starting control thread %x on port %d", mRtpSource.getSsrc(), mRtpSource.getLocalCtrlPort() );
+  SockAddrInet localAddr, remoteAddr;
 
-    bool sendReports;
-    UdpInetSocket rtpCtrlServer;
-    if ( mRtpSource.getLocalHost() != "" )
+  bool sendReports;
+  UdpInetSocket rtpCtrlServer;
+  if ( mRtpSource.getLocalHost() != "" )
+  {
+    localAddr.resolve( mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort(), "udp" );
+    if ( !rtpCtrlServer.bind( localAddr ) )
+      Fatal( "Failed to bind RTCP server" );
+    sendReports = false;
+    Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort() );
+  }
+  else
+  {
+    localAddr.resolve( mRtpSource.getLocalCtrlPort(), "udp" );
+    if ( !rtpCtrlServer.bind( localAddr ) )
+      Fatal( "Failed to bind RTCP server" );
+    Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort() );
+    remoteAddr.resolve( mRtpSource.getRemoteHost().c_str(), mRtpSource.getRemoteCtrlPort(), "udp" );
+    if ( !rtpCtrlServer.connect( remoteAddr ) )
+      Fatal( "Failed to connect RTCP server" );
+    Debug( 3, "Connected to %s:%d",  mRtpSource.getRemoteHost().c_str(), mRtpSource.getRemoteCtrlPort() );
+    sendReports = true;
+  }
+
+  // The only reason I can think of why we would have a timeout period is so that we can regularly send RR packets.
+  // Why 10 seconds? If anything I think this should be whatever timeout value was given in the DESCRIBE response
+  Select select( 10 );
+  select.addReader( &rtpCtrlServer );
+
+  unsigned char buffer[ZM_NETWORK_BUFSIZ];
+
+  time_t  last_receive = time(NULL);
+  bool  timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
+
+  while ( !mStop && select.wait() >= 0 ) {
+
+    time_t now = time(NULL);
+    Select::CommsList readable = select.getReadable();
+    if ( readable.size() == 0 )
     {
-        localAddr.resolve( mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort(), "udp" );
-        if ( !rtpCtrlServer.bind( localAddr ) )
-            Fatal( "Failed to bind RTCP server" );
-        sendReports = false;
-        Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort() );
+      if ( ! timeout ) {
+        // With this code here, we will send an SDES and RR packet every 10 seconds
+        ssize_t nBytes;
+        unsigned char *bufferPtr = buffer;
+        bufferPtr += generateRr( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
+        bufferPtr += generateSdes( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
+        Debug( 3, "Preventing timeout by sending %zd bytes on sd %d. Time since last receive: %d", bufferPtr-buffer, rtpCtrlServer.getWriteDesc(), ( now-last_receive) );
+        if ( (nBytes = rtpCtrlServer.send( buffer, bufferPtr-buffer )) < 0 )
+          Error( "Unable to send: %s", strerror( errno ) );
+        timeout = true;
+        continue;
+      } else {
+        //Error( "RTCP timed out" );
+        Debug(1, "RTCP timed out. Time since last receive: %d", ( now-last_receive) );
+        continue;
+        //break;
+      }
+    } else {
+      timeout = false;
+      last_receive = time(NULL);
     }
-    else
+    for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
     {
-        localAddr.resolve( mRtpSource.getLocalCtrlPort(), "udp" );
-        if ( !rtpCtrlServer.bind( localAddr ) )
-            Fatal( "Failed to bind RTCP server" );
-        Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalCtrlPort() );
-        remoteAddr.resolve( mRtpSource.getRemoteHost().c_str(), mRtpSource.getRemoteCtrlPort(), "udp" );
-        if ( !rtpCtrlServer.connect( remoteAddr ) )
-            Fatal( "Failed to connect RTCP server" );
-        Debug( 3, "Connected to %s:%d",  mRtpSource.getRemoteHost().c_str(), mRtpSource.getRemoteCtrlPort() );
-        sendReports = true;
-    }
+      if ( UdpInetSocket *socket = dynamic_cast<UdpInetSocket *>(*iter) )
+      {
+        ssize_t nBytes = socket->recv( buffer, sizeof(buffer) );
+        Debug( 4, "Read %zd bytes on sd %d", nBytes, socket->getReadDesc() );
 
-	// The only reason I can think of why we would have a timeout period is so that we can regularly send RR packets.
-	// Why 10 seconds? If anything I think this should be whatever timeout value was given in the DESCRIBE response
-    Select select( 10 );
-    select.addReader( &rtpCtrlServer );
-
-    unsigned char buffer[ZM_NETWORK_BUFSIZ];
-
-	time_t	last_receive = time(NULL);
-	bool	timeout = false; // used as a flag that we had a timeout, and then sent an RR to see if we wake back up. Real timeout will happen when this is true.
-
-    while ( !mStop && select.wait() >= 0 ) {
-
-		time_t now = time(NULL);
-        Select::CommsList readable = select.getReadable();
-        if ( readable.size() == 0 )
+        if ( nBytes )
         {
-			if ( ! timeout ) {
-				// With this code here, we will send an SDES and RR packet every 10 seconds
-				ssize_t nBytes;
-				unsigned char *bufferPtr = buffer;
-				bufferPtr += generateRr( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
-				bufferPtr += generateSdes( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
-				Debug( 3, "Preventing timeout by sending %zd bytes on sd %d. Time since last receive: %d", bufferPtr-buffer, rtpCtrlServer.getWriteDesc(), ( now-last_receive) );
-				if ( (nBytes = rtpCtrlServer.send( buffer, bufferPtr-buffer )) < 0 )
-					Error( "Unable to send: %s", strerror( errno ) );
-				timeout = true;
-				continue;
-			} else {
-				//Error( "RTCP timed out" );
-				Debug(1, "RTCP timed out. Time since last receive: %d", ( now-last_receive) );
-				continue;
-				//break;
-			}
-		} else {
-			timeout = false;
-			last_receive = time(NULL);
-        }
-        for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
-        {
-            if ( UdpInetSocket *socket = dynamic_cast<UdpInetSocket *>(*iter) )
-            {
-                ssize_t nBytes = socket->recv( buffer, sizeof(buffer) );
-                Debug( 4, "Read %zd bytes on sd %d", nBytes, socket->getReadDesc() );
+          recvPackets( buffer, nBytes );
 
-                if ( nBytes )
-                {
-                    recvPackets( buffer, nBytes );
-
-                    if ( sendReports )
-                    {
-                        unsigned char *bufferPtr = buffer;
-                        bufferPtr += generateRr( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
-                        bufferPtr += generateSdes( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
-                        Debug( 3, "Sending %zd bytes on sd %d", bufferPtr-buffer, rtpCtrlServer.getWriteDesc() );
-                        if ( (nBytes = rtpCtrlServer.send( buffer, bufferPtr-buffer )) < 0 )
-                            Error( "Unable to send: %s", strerror( errno ) );
-                        //Debug( 4, "Sent %d bytes on sd %d", nBytes, rtpCtrlServer.getWriteDesc() );
-                    }
-                } else {
-					// Here is another case of not receiving some data causing us to terminate... why?  Sometimes there are pauses in the interwebs.
-                    mStop = true;
-                    break;
-                }
-            }
-            else
-            {
-                Panic( "Barfed" );
-            }
+          if ( sendReports )
+          {
+            unsigned char *bufferPtr = buffer;
+            bufferPtr += generateRr( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
+            bufferPtr += generateSdes( bufferPtr, sizeof(buffer)-(bufferPtr-buffer) );
+            Debug( 3, "Sending %zd bytes on sd %d", bufferPtr-buffer, rtpCtrlServer.getWriteDesc() );
+            if ( (nBytes = rtpCtrlServer.send( buffer, bufferPtr-buffer )) < 0 )
+              Error( "Unable to send: %s", strerror( errno ) );
+            //Debug( 4, "Sent %d bytes on sd %d", nBytes, rtpCtrlServer.getWriteDesc() );
+          }
+        } else {
+          // Here is another case of not receiving some data causing us to terminate... why?  Sometimes there are pauses in the interwebs.
+          mStop = true;
+          break;
         }
+      }
+      else
+      {
+        Panic( "Barfed" );
+      }
     }
-    rtpCtrlServer.close();
-    mRtspThread.stop();
-    return( 0 );
+  }
+  rtpCtrlServer.close();
+  mRtspThread.stop();
+  return( 0 );
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtp_ctrl.h b/src/zm_rtp_ctrl.h
index 9b44b752b..2526f22ce 100644
--- a/src/zm_rtp_ctrl.h
+++ b/src/zm_rtp_ctrl.h
@@ -25,7 +25,7 @@
 #include "zm_thread.h"
 
 // Defined in ffmpeg rtp.h
-//#define RTP_MAX_SDES 255      // maximum text length for SDES
+//#define RTP_MAX_SDES 255    // maximum text length for SDES
 
 // Big-endian mask for version, padding bit and packet type pair
 #define RTCP_VALID_MASK (0xc000 | 0x2000 | 0xfe)
@@ -39,119 +39,119 @@ class RtpCtrlThread : public Thread
 friend class RtspThread;
 
 private:
-    typedef enum
+  typedef enum
+  {
+    RTCP_SR   = 200,
+    RTCP_RR   = 201,
+    RTCP_SDES = 202,
+    RTCP_BYE  = 203,
+    RTCP_APP  = 204
+  } RtcpType;
+
+  typedef enum
+  {
+    RTCP_SDES_END   = 0,
+    RTCP_SDES_CNAME = 1,
+    RTCP_SDES_NAME  = 2,
+    RTCP_SDES_EMAIL = 3,
+    RTCP_SDES_PHONE = 4,
+    RTCP_SDES_LOC   = 5,
+    RTCP_SDES_TOOL  = 6,
+    RTCP_SDES_NOTE  = 7,
+    RTCP_SDES_PRIV  = 8
+  } RtcpSdesType;
+
+  struct RtcpCommonHeader
+  {
+    uint8_t count:5;    // varies by packet type
+    uint8_t p:1;      // padding flag
+    uint8_t version:2;  // protocol version
+    uint8_t pt;       // RTCP packet type
+    uint16_t lenN;    // pkt len in words, w/o this word, network order 
+  };
+
+  // Reception report block
+  struct RtcpRr
+  {
+    uint32_t ssrcN;     // data source being reported
+    int32_t lost:24;   // cumul. no. pkts lost (signed!)
+    uint32_t fraction:8;  // fraction lost since last SR/RR
+    uint32_t lastSeqN;  // extended last seq. no. received, network order
+    uint32_t jitterN;   // interarrival jitter, network order
+    uint32_t lsrN;    // last SR packet from this source, network order
+    uint32_t dlsrN;     // delay since last SR packet, network order
+  };
+
+  // SDES item
+  struct RtcpSdesItem
+  {
+    uint8_t type;     // type of item (rtcp_sdes_type_t)
+    uint8_t len;      // length of item (in octets)
+    char data[];   // text, not null-terminated
+  };
+
+  // RTCP packet
+  struct RtcpPacket
+  {
+    RtcpCommonHeader header; // common header
+    union
     {
-        RTCP_SR   = 200,
-        RTCP_RR   = 201,
-        RTCP_SDES = 202,
-        RTCP_BYE  = 203,
-        RTCP_APP  = 204
-    } RtcpType;
+      // Sender Report (SR)
+      struct Sr
+      {
+        uint32_t  ssrcN;  // sender generating this report, network order
+        uint32_t  ntpSecN;  // NTP timestamp, network order
+        uint32_t  ntpFracN;
+        uint32_t  rtpTsN;   // RTP timestamp, network order
+        uint32_t  pSentN;   // packets sent, network order
+        uint32_t  oSentN;   // octets sent, network order
+        RtcpRr rr[];   // variable-length list
+      } sr;
 
-    typedef enum
-    {
-        RTCP_SDES_END   = 0,
-        RTCP_SDES_CNAME = 1,
-        RTCP_SDES_NAME  = 2,
-        RTCP_SDES_EMAIL = 3,
-        RTCP_SDES_PHONE = 4,
-        RTCP_SDES_LOC   = 5,
-        RTCP_SDES_TOOL  = 6,
-        RTCP_SDES_NOTE  = 7,
-        RTCP_SDES_PRIV  = 8
-    } RtcpSdesType;
+      // Reception Report (RR)
+      struct Rr
+      {
+        uint32_t ssrcN;    // receiver generating this report
+        RtcpRr rr[];   // variable-length list
+      } rr;
 
-    struct RtcpCommonHeader
-    {
-        uint8_t count:5;      // varies by packet type
-        uint8_t p:1;          // padding flag
-        uint8_t version:2;    // protocol version
-        uint8_t pt;           // RTCP packet type
-        uint16_t lenN;        // pkt len in words, w/o this word, network order 
-    };
+      // source description (SDES)
+      struct Sdes
+      {
+        uint32_t srcN;    // first SSRC/CSRC
+        RtcpSdesItem item[]; // list of SDES items
+      } sdes;
 
-    // Reception report block
-    struct RtcpRr
-    {
-        uint32_t ssrcN;       // data source being reported
-        int32_t lost:24;     // cumul. no. pkts lost (signed!)
-        uint32_t fraction:8;  // fraction lost since last SR/RR
-        uint32_t lastSeqN;    // extended last seq. no. received, network order
-        uint32_t jitterN;     // interarrival jitter, network order
-        uint32_t lsrN;        // last SR packet from this source, network order
-        uint32_t dlsrN;       // delay since last SR packet, network order
-    };
-
-    // SDES item
-    struct RtcpSdesItem
-    {
-        uint8_t type;         // type of item (rtcp_sdes_type_t)
-        uint8_t len;          // length of item (in octets)
-        char data[];     // text, not null-terminated
-    };
-
-    // RTCP packet
-    struct RtcpPacket
-    {
-        RtcpCommonHeader header; // common header
-        union
-        {
-            // Sender Report (SR)
-            struct Sr
-            {
-                uint32_t    ssrcN;    // sender generating this report, network order
-                uint32_t    ntpSecN;  // NTP timestamp, network order
-                uint32_t    ntpFracN;
-                uint32_t    rtpTsN;   // RTP timestamp, network order
-                uint32_t    pSentN;   // packets sent, network order
-                uint32_t    oSentN;   // octets sent, network order
-                RtcpRr rr[];     // variable-length list
-            } sr;
-
-            // Reception Report (RR)
-            struct Rr
-            {
-                uint32_t ssrcN;        // receiver generating this report
-                RtcpRr rr[];     // variable-length list
-            } rr;
-
-            // source description (SDES)
-            struct Sdes
-            {
-                uint32_t srcN;        // first SSRC/CSRC
-                RtcpSdesItem item[]; // list of SDES items
-            } sdes;
-
-            // BYE
-            struct Bye
-            {
-                uint32_t srcN[];     // list of sources
-                // can't express trailing text for reason (what does this mean? it's not even english!)
-            } bye;
-         } body;
-    };
+      // BYE
+      struct Bye
+      {
+        uint32_t srcN[];   // list of sources
+        // can't express trailing text for reason (what does this mean? it's not even english!)
+      } bye;
+     } body;
+  };
 
 private:
-    RtspThread &mRtspThread;
-    RtpSource &mRtpSource;
-    int mPort;
-    bool mStop;
+  RtspThread &mRtspThread;
+  RtpSource &mRtpSource;
+  int mPort;
+  bool mStop;
 
 private:
-    int recvPacket( const unsigned char *packet, ssize_t packetLen );
-    int generateRr( const unsigned char *packet, ssize_t packetLen );
-    int generateSdes( const unsigned char *packet, ssize_t packetLen );
-    int generateBye( const unsigned char *packet, ssize_t packetLen );
-    int recvPackets( unsigned char *buffer, ssize_t nBytes );
-    int run();
+  int recvPacket( const unsigned char *packet, ssize_t packetLen );
+  int generateRr( const unsigned char *packet, ssize_t packetLen );
+  int generateSdes( const unsigned char *packet, ssize_t packetLen );
+  int generateBye( const unsigned char *packet, ssize_t packetLen );
+  int recvPackets( unsigned char *buffer, ssize_t nBytes );
+  int run();
 
 public:
-    RtpCtrlThread( RtspThread &rtspThread, RtpSource &rtpSource );
+  RtpCtrlThread( RtspThread &rtspThread, RtpSource &rtpSource );
 
-    void stop() 
-    {
-        mStop = true;
-    }
+  void stop() 
+  {
+    mStop = true;
+  }
 };
 
 #endif // ZM_RTP_CTRL_H
diff --git a/src/zm_rtp_data.cpp b/src/zm_rtp_data.cpp
index 257f46947..687a4995e 100644
--- a/src/zm_rtp_data.cpp
+++ b/src/zm_rtp_data.cpp
@@ -33,88 +33,88 @@ RtpDataThread::RtpDataThread( RtspThread &rtspThread, RtpSource &rtpSource ) : m
 
 bool RtpDataThread::recvPacket( const unsigned char *packet, size_t packetLen )
 {
-    const RtpDataHeader *rtpHeader;
-    rtpHeader = (RtpDataHeader *)packet;
+  const RtpDataHeader *rtpHeader;
+  rtpHeader = (RtpDataHeader *)packet;
 
-    //printf( "D: " );
-    //for ( int i = 0; i < 32; i++ )
-        //printf( "%02x ", (unsigned char)packet[i] );
-    //printf( "\n" );
+  //printf( "D: " );
+  //for ( int i = 0; i < 32; i++ )
+    //printf( "%02x ", (unsigned char)packet[i] );
+  //printf( "\n" );
 
-    Debug( 5, "Ver: %d", rtpHeader->version );
-    Debug( 5, "P: %d", rtpHeader->p );
-    Debug( 5, "Pt: %d", rtpHeader->pt );
-    Debug( 5, "Mk: %d", rtpHeader->m );
-    Debug( 5, "Seq: %d", ntohs(rtpHeader->seqN) );
-    Debug( 5, "T/S: %x", ntohl(rtpHeader->timestampN) );
-    Debug( 5, "SSRC: %x", ntohl(rtpHeader->ssrcN) );
+  Debug( 5, "Ver: %d", rtpHeader->version );
+  Debug( 5, "P: %d", rtpHeader->p );
+  Debug( 5, "Pt: %d", rtpHeader->pt );
+  Debug( 5, "Mk: %d", rtpHeader->m );
+  Debug( 5, "Seq: %d", ntohs(rtpHeader->seqN) );
+  Debug( 5, "T/S: %x", ntohl(rtpHeader->timestampN) );
+  Debug( 5, "SSRC: %x", ntohl(rtpHeader->ssrcN) );
 
-    //unsigned short seq = ntohs(rtpHeader->seqN);
-    unsigned long ssrc = ntohl(rtpHeader->ssrcN);
+  //unsigned short seq = ntohs(rtpHeader->seqN);
+  unsigned long ssrc = ntohl(rtpHeader->ssrcN);
 
-    if ( mRtpSource.getSsrc() && (ssrc != mRtpSource.getSsrc()) )
-    {
-         Warning( "Discarding packet for unrecognised ssrc %lx", ssrc );
-         return( false );
-    }
+  if ( mRtpSource.getSsrc() && (ssrc != mRtpSource.getSsrc()) )
+  {
+     Warning( "Discarding packet for unrecognised ssrc %lx", ssrc );
+     return( false );
+  }
 
-    return( mRtpSource.handlePacket( packet, packetLen ) );
+  return( mRtpSource.handlePacket( packet, packetLen ) );
 }
 
 int RtpDataThread::run()
 {
-    Debug( 2, "Starting data thread %d on port %d", mRtpSource.getSsrc(), mRtpSource.getLocalDataPort() );
+  Debug( 2, "Starting data thread %d on port %d", mRtpSource.getSsrc(), mRtpSource.getLocalDataPort() );
 
-    SockAddrInet localAddr;
-    UdpInetServer rtpDataSocket;
-    if ( mRtpSource.getLocalHost() != "" )
-        localAddr.resolve( mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort(), "udp" );
-    else
-        localAddr.resolve( mRtpSource.getLocalDataPort(), "udp" );
-    if ( !rtpDataSocket.bind( localAddr ) )
-        Fatal( "Failed to bind RTP server" );
-    Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort() );
+  SockAddrInet localAddr;
+  UdpInetServer rtpDataSocket;
+  if ( mRtpSource.getLocalHost() != "" )
+    localAddr.resolve( mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort(), "udp" );
+  else
+    localAddr.resolve( mRtpSource.getLocalDataPort(), "udp" );
+  if ( !rtpDataSocket.bind( localAddr ) )
+    Fatal( "Failed to bind RTP server" );
+  Debug( 3, "Bound to %s:%d",  mRtpSource.getLocalHost().c_str(), mRtpSource.getLocalDataPort() );
 
-    Select select( 3 );
-    select.addReader( &rtpDataSocket );
+  Select select( 3 );
+  select.addReader( &rtpDataSocket );
 
-    unsigned char buffer[ZM_NETWORK_BUFSIZ];
-    while ( !mStop && select.wait() >= 0 )
-    {
-         if ( mStop )
-            break;
-         Select::CommsList readable = select.getReadable();
-         if ( readable.size() == 0 )
+  unsigned char buffer[ZM_NETWORK_BUFSIZ];
+  while ( !mStop && select.wait() >= 0 )
+  {
+     if ( mStop )
+      break;
+     Select::CommsList readable = select.getReadable();
+     if ( readable.size() == 0 )
+     {
+       Error( "RTP timed out" );
+       mStop = true;
+       break;
+     }
+     for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
+     {
+       if ( UdpInetServer *socket = dynamic_cast<UdpInetServer *>(*iter) )
+       {
+         int nBytes = socket->recv( buffer, sizeof(buffer) );
+         Debug( 4, "Got %d bytes on sd %d", nBytes, socket->getReadDesc() );
+         if ( nBytes )
          {
-             Error( "RTP timed out" );
-             mStop = true;
-             break;
+            recvPacket( buffer, nBytes );
          }
-         for ( Select::CommsList::iterator iter = readable.begin(); iter != readable.end(); iter++ )
+         else
          {
-             if ( UdpInetServer *socket = dynamic_cast<UdpInetServer *>(*iter) )
-             {
-                 int nBytes = socket->recv( buffer, sizeof(buffer) );
-                 Debug( 4, "Got %d bytes on sd %d", nBytes, socket->getReadDesc() );
-                 if ( nBytes )
-                 {
-                      recvPacket( buffer, nBytes );
-                 }
-                 else
-                 {
-                    mStop = true;
-                    break;
-                 }
-             }
-             else
-             {
-                 Panic( "Barfed" );
-             }
+          mStop = true;
+          break;
          }
-    }
-    rtpDataSocket.close();
-    mRtspThread.stop();
-    return( 0 );
+       }
+       else
+       {
+         Panic( "Barfed" );
+       }
+     }
+  }
+  rtpDataSocket.close();
+  mRtspThread.stop();
+  return( 0 );
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtp_data.h b/src/zm_rtp_data.h
index 6c957a3ad..378c5e2e6 100644
--- a/src/zm_rtp_data.h
+++ b/src/zm_rtp_data.h
@@ -30,16 +30,16 @@ class RtpSource;
 
 struct RtpDataHeader
 {
-    uint8_t cc:4;         // CSRC count
-    uint8_t x:1;          // header extension flag
-    uint8_t p:1;          // padding flag
-    uint8_t version:2;    // protocol version
-    uint8_t pt:7;         // payload type
-    uint8_t m:1;          // marker bit
-    uint16_t seqN;        // sequence number, network order
-    uint32_t timestampN;  // timestamp, network order
-    uint32_t ssrcN;       // synchronization source, network order
-    uint32_t csrc[];      // optional CSRC list
+  uint8_t cc:4;     // CSRC count
+  uint8_t x:1;      // header extension flag
+  uint8_t p:1;      // padding flag
+  uint8_t version:2;  // protocol version
+  uint8_t pt:7;     // payload type
+  uint8_t m:1;      // marker bit
+  uint16_t seqN;    // sequence number, network order
+  uint32_t timestampN;  // timestamp, network order
+  uint32_t ssrcN;     // synchronization source, network order
+  uint32_t csrc[];    // optional CSRC list
 };
 
 class RtpDataThread : public Thread
@@ -47,21 +47,21 @@ class RtpDataThread : public Thread
 friend class RtspThread;
 
 private:
-    RtspThread &mRtspThread;
-    RtpSource &mRtpSource;
-    bool mStop;
+  RtspThread &mRtspThread;
+  RtpSource &mRtpSource;
+  bool mStop;
 
 private:
-    bool recvPacket( const unsigned char *packet, size_t packetLen );
-    int run();
+  bool recvPacket( const unsigned char *packet, size_t packetLen );
+  int run();
 
 public:
-    RtpDataThread( RtspThread &rtspThread, RtpSource &rtpSource );
+  RtpDataThread( RtspThread &rtspThread, RtpSource &rtpSource );
 
-    void stop()
-    {
-        mStop = true;
-    }
+  void stop()
+  {
+    mStop = true;
+  }
 };
 
 #endif // ZM_RTP_DATA_H
diff --git a/src/zm_rtp_source.cpp b/src/zm_rtp_source.cpp
index a61bfffe3..44027a318 100644
--- a/src/zm_rtp_source.cpp
+++ b/src/zm_rtp_source.cpp
@@ -27,358 +27,371 @@
 #if HAVE_LIBAVCODEC
 
 RtpSource::RtpSource( int id, const std::string &localHost, int localPortBase, const std::string &remoteHost, int remotePortBase, uint32_t ssrc, uint16_t seq, uint32_t rtpClock, uint32_t rtpTime, _AVCODECID codecId ) :
-    mId( id ),
-    mSsrc( ssrc ),
-    mLocalHost( localHost ),
-    mRemoteHost( remoteHost ),
-    mRtpClock( rtpClock ),
-    mCodecId( codecId ),
-    mFrame( 65536 ),
-    mFrameCount( 0 ),
-    mFrameGood( true ),
-    mFrameReady( false ),
-    mFrameProcessed( false )
+  mId( id ),
+  mSsrc( ssrc ),
+  mLocalHost( localHost ),
+  mRemoteHost( remoteHost ),
+  mRtpClock( rtpClock ),
+  mCodecId( codecId ),
+  mFrame( 65536 ),
+  mFrameCount( 0 ),
+  mFrameGood( true ),
+  mFrameReady( false ),
+  mFrameProcessed( false )
 {
-    char hostname[256] = "";
-    gethostname( hostname, sizeof(hostname) );
+  char hostname[256] = "";
+  gethostname( hostname, sizeof(hostname) );
 
-    mCname = stringtf( "zm-%d@%s", mId, hostname );
-    Debug( 3, "RTP CName = %s", mCname.c_str() );
+  mCname = stringtf( "zm-%d@%s", mId, hostname );
+  Debug( 3, "RTP CName = %s", mCname.c_str() );
 
-    init( seq );
-    mMaxSeq = seq - 1;
-    mProbation = MIN_SEQUENTIAL;
+  init( seq );
+  mMaxSeq = seq - 1;
+  mProbation = MIN_SEQUENTIAL;
 
-    mLocalPortChans[0] = localPortBase;
-    mLocalPortChans[1] = localPortBase+1;
+  mLocalPortChans[0] = localPortBase;
+  mLocalPortChans[1] = localPortBase+1;
 
-    mRemotePortChans[0] = remotePortBase;
-    mRemotePortChans[1] = remotePortBase+1;
+  mRemotePortChans[0] = remotePortBase;
+  mRemotePortChans[1] = remotePortBase+1;
 
-    mRtpFactor = mRtpClock;
+  mRtpFactor = mRtpClock;
 
-    mBaseTimeReal = tvNow();
-    mBaseTimeNtp = tvZero();
-    mBaseTimeRtp = rtpTime;
+  mBaseTimeReal = tvNow();
+  mBaseTimeNtp = tvZero();
+  mBaseTimeRtp = rtpTime;
 
-    mLastSrTimeReal = tvZero();
-    mLastSrTimeNtp = tvZero();
-    mLastSrTimeRtp = 0;
-    
-    if(mCodecId != AV_CODEC_ID_H264 && mCodecId != AV_CODEC_ID_MPEG4)
-        Warning( "The device is using a codec that may not be supported. Do not be surprised if things don't work." );
+  mLastSrTimeReal = tvZero();
+  mLastSrTimeNtp = tvZero();
+  mLastSrTimeRtp = 0;
+  
+  if(mCodecId != AV_CODEC_ID_H264 && mCodecId != AV_CODEC_ID_MPEG4)
+    Warning( "The device is using a codec that may not be supported. Do not be surprised if things don't work." );
 }
 
 void RtpSource::init( uint16_t seq )
 {
-    Debug( 3, "Initialising sequence" );
-    mBaseSeq = seq;
-    mMaxSeq = seq;
-    mBadSeq = RTP_SEQ_MOD + 1;  // so seq == mBadSeq is false
-    mCycles = 0;
-    mReceivedPackets = 0;
-    mReceivedPrior = 0;
-    mExpectedPrior = 0;
-    // other initialization
-    mJitter = 0;
-    mTransit = 0;
+  Debug( 3, "Initialising sequence" );
+  mBaseSeq = seq;
+  mMaxSeq = seq;
+  mBadSeq = RTP_SEQ_MOD + 1;  // so seq == mBadSeq is false
+  mCycles = 0;
+  mReceivedPackets = 0;
+  mReceivedPrior = 0;
+  mExpectedPrior = 0;
+  // other initialization
+  mJitter = 0;
+  mTransit = 0;
 }
 
 bool RtpSource::updateSeq( uint16_t seq )
 {
-    uint16_t uDelta = seq - mMaxSeq;
+  uint16_t uDelta = seq - mMaxSeq;
 
-    // Source is not valid until MIN_SEQUENTIAL packets with
-    // sequential sequence numbers have been received.
-    Debug( 5, "Seq: %d", seq );
+  // Source is not valid until MIN_SEQUENTIAL packets with
+  // sequential sequence numbers have been received.
+  Debug( 5, "Seq: %d", seq );
 
-    if ( mProbation)
+  if ( mProbation)
+  {
+    // packet is in sequence
+    if ( seq == mMaxSeq + 1)
     {
-        // packet is in sequence
-        if ( seq == mMaxSeq + 1)
-        {
-            Debug( 3, "Sequence in probation %d, in sequence", mProbation );
-            mProbation--;
-            mMaxSeq = seq;
-            if ( mProbation == 0 )
-            {
-                init( seq );
-                mReceivedPackets++;
-                return( true );
-            }
-        }
-        else
-        {
-            Warning( "Sequence in probation %d, out of sequence", mProbation );
-            mProbation = MIN_SEQUENTIAL - 1;
-            mMaxSeq = seq;
-            return( false );
-        }
+      Debug( 3, "Sequence in probation %d, in sequence", mProbation );
+      mProbation--;
+      mMaxSeq = seq;
+      if ( mProbation == 0 )
+      {
+        init( seq );
+        mReceivedPackets++;
         return( true );
-    }
-    else if ( uDelta < MAX_DROPOUT )
-    {
-        if ( uDelta == 1 )
-        {
-            Debug( 3, "Packet in sequence, gap %d", uDelta );
-        }
-        else
-        {
-            Warning( "Packet in sequence, gap %d", uDelta );
-        }
-
-        // in order, with permissible gap
-        if ( seq < mMaxSeq )
-        {
-            // Sequence number wrapped - count another 64K cycle.
-            mCycles += RTP_SEQ_MOD;
-        }
-        mMaxSeq = seq;
-    }
-    else if ( uDelta <= RTP_SEQ_MOD - MAX_MISORDER )
-    {
-        Warning( "Packet out of sequence, gap %d", uDelta );
-        // the sequence number made a very large jump
-        if ( seq == mBadSeq )
-        {
-            Debug( 3, "Restarting sequence" );
-            // Two sequential packets -- assume that the other side
-            // restarted without telling us so just re-sync
-            // (i.e., pretend this was the first packet).
-            init( seq );
-        }
-        else
-        {
-            mBadSeq = (seq + 1) & (RTP_SEQ_MOD-1);
-            return( false );
-        }
+      }
     }
     else
     {
-        Warning( "Packet duplicate or reordered, gap %d", uDelta );
-        // duplicate or reordered packet
-        return( false );
+      Warning( "Sequence in probation %d, out of sequence", mProbation );
+      mProbation = MIN_SEQUENTIAL - 1;
+      mMaxSeq = seq;
+      return( false );
     }
-    mReceivedPackets++;
-    return( uDelta==1?true:false );
+    return( true );
+  }
+  else if ( uDelta < MAX_DROPOUT )
+  {
+    if ( uDelta == 1 )
+    {
+      Debug( 3, "Packet in sequence, gap %d", uDelta );
+    }
+    else
+    {
+      Warning( "Packet in sequence, gap %d", uDelta );
+    }
+
+    // in order, with permissible gap
+    if ( seq < mMaxSeq )
+    {
+      // Sequence number wrapped - count another 64K cycle.
+      mCycles += RTP_SEQ_MOD;
+    }
+    mMaxSeq = seq;
+  }
+  else if ( uDelta <= RTP_SEQ_MOD - MAX_MISORDER )
+  {
+    Warning( "Packet out of sequence, gap %d", uDelta );
+    // the sequence number made a very large jump
+    if ( seq == mBadSeq )
+    {
+      Debug( 3, "Restarting sequence" );
+      // Two sequential packets -- assume that the other side
+      // restarted without telling us so just re-sync
+      // (i.e., pretend this was the first packet).
+      init( seq );
+    }
+    else
+    {
+      mBadSeq = (seq + 1) & (RTP_SEQ_MOD-1);
+      return( false );
+    }
+  }
+  else
+  {
+    Warning( "Packet duplicate or reordered, gap %d", uDelta );
+    // duplicate or reordered packet
+    return( false );
+  }
+  mReceivedPackets++;
+  return( uDelta==1?true:false );
 }
 
 void RtpSource::updateJitter( const RtpDataHeader *header )
 {
-    if ( mRtpFactor > 0 )
-    {
-        Debug( 5, "Delta rtp = %.6f", tvDiffSec( mBaseTimeReal ) );
-        uint32_t localTimeRtp = mBaseTimeRtp + uint32_t( tvDiffSec( mBaseTimeReal ) * mRtpFactor );
-        Debug( 5, "Local RTP time = %x", localTimeRtp );
-        Debug( 5, "Packet RTP time = %x", ntohl(header->timestampN) );
-        uint32_t packetTransit = localTimeRtp - ntohl(header->timestampN);
-        Debug( 5, "Packet transit RTP time = %x", packetTransit );
+  if ( mRtpFactor > 0 )
+  {
+    Debug( 5, "Delta rtp = %.6f", tvDiffSec( mBaseTimeReal ) );
+    uint32_t localTimeRtp = mBaseTimeRtp + uint32_t( tvDiffSec( mBaseTimeReal ) * mRtpFactor );
+    Debug( 5, "Local RTP time = %x", localTimeRtp );
+    Debug( 5, "Packet RTP time = %x", ntohl(header->timestampN) );
+    uint32_t packetTransit = localTimeRtp - ntohl(header->timestampN);
+    Debug( 5, "Packet transit RTP time = %x", packetTransit );
 
-        if ( mTransit > 0 )
-        {
-            // Jitter
-            int d = packetTransit - mTransit;
-            Debug( 5, "Jitter D = %d", d );
-            if ( d < 0 )
-                d = -d;
-            //mJitter += (1./16.) * ((double)d - mJitter);
-            mJitter += d - ((mJitter + 8) >> 4);
-        }
-        mTransit = packetTransit;
-    }
-    else
+    if ( mTransit > 0 )
     {
-        mJitter = 0;
+      // Jitter
+      int d = packetTransit - mTransit;
+      Debug( 5, "Jitter D = %d", d );
+      if ( d < 0 )
+        d = -d;
+      //mJitter += (1./16.) * ((double)d - mJitter);
+      mJitter += d - ((mJitter + 8) >> 4);
     }
-    Debug( 5, "RTP Jitter: %d", mJitter );
+    mTransit = packetTransit;
+  }
+  else
+  {
+    mJitter = 0;
+  }
+  Debug( 5, "RTP Jitter: %d", mJitter );
 }
 
 void RtpSource::updateRtcpData( uint32_t ntpTimeSecs, uint32_t ntpTimeFrac, uint32_t rtpTime )
 {
-    struct timeval ntpTime = tvMake( ntpTimeSecs, suseconds_t((USEC_PER_SEC*(ntpTimeFrac>>16))/(1<<16)) );
+  struct timeval ntpTime = tvMake( ntpTimeSecs, suseconds_t((USEC_PER_SEC*(ntpTimeFrac>>16))/(1<<16)) );
 
+  Debug( 5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
+                           
+  if ( mBaseTimeNtp.tv_sec == 0 )
+  {
+    mBaseTimeReal = tvNow();
+    mBaseTimeNtp = ntpTime;
+    mBaseTimeRtp = rtpTime;
+  }
+  else if ( !mRtpClock )
+  {
+    Debug( 5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x", mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime );
     Debug( 5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
-                                                     
-    if ( mBaseTimeNtp.tv_sec == 0 )
-    {
-        mBaseTimeReal = tvNow();
-        mBaseTimeNtp = ntpTime;
-        mBaseTimeRtp = rtpTime;
-    }
-    else if ( !mRtpClock )
-    {
-        Debug( 5, "lastSrNtpTime: %ld.%06ld, rtpTime: %x", mLastSrTimeNtp.tv_sec, mLastSrTimeNtp.tv_usec, rtpTime );
-        Debug( 5, "ntpTime: %ld.%06ld, rtpTime: %x", ntpTime.tv_sec, ntpTime.tv_usec, rtpTime );
 
-        double diffNtpTime = tvDiffSec( mBaseTimeNtp, ntpTime );
-        uint32_t diffRtpTime = rtpTime - mBaseTimeRtp;
+    double diffNtpTime = tvDiffSec( mBaseTimeNtp, ntpTime );
+    uint32_t diffRtpTime = rtpTime - mBaseTimeRtp;
 
-        //Debug( 5, "Real-diff: %.6f", diffRealTime );
-        Debug( 5, "NTP-diff: %.6f", diffNtpTime );
-        Debug( 5, "RTP-diff: %d", diffRtpTime );
+    //Debug( 5, "Real-diff: %.6f", diffRealTime );
+    Debug( 5, "NTP-diff: %.6f", diffNtpTime );
+    Debug( 5, "RTP-diff: %d", diffRtpTime );
 
-        mRtpFactor = (uint32_t)(diffRtpTime / diffNtpTime);
+    mRtpFactor = (uint32_t)(diffRtpTime / diffNtpTime);
 
-        Debug( 5, "RTPfactor: %d", mRtpFactor );
-    }
-    mLastSrTimeNtpSecs = ntpTimeSecs;
-    mLastSrTimeNtpFrac = ntpTimeFrac;
-    mLastSrTimeNtp = ntpTime;
-    mLastSrTimeRtp = rtpTime;
+    Debug( 5, "RTPfactor: %d", mRtpFactor );
+  }
+  mLastSrTimeNtpSecs = ntpTimeSecs;
+  mLastSrTimeNtpFrac = ntpTimeFrac;
+  mLastSrTimeNtp = ntpTime;
+  mLastSrTimeRtp = rtpTime;
 }
 
 void RtpSource::updateRtcpStats()
 {
-    uint32_t extendedMax = mCycles + mMaxSeq;
-    mExpectedPackets = extendedMax - mBaseSeq + 1;
+  uint32_t extendedMax = mCycles + mMaxSeq;
+  mExpectedPackets = extendedMax - mBaseSeq + 1;
 
-    Debug( 5, "Expected packets = %d", mExpectedPackets );
+  Debug( 5, "Expected packets = %d", mExpectedPackets );
 
-    // The number of packets lost is defined to be the number of packets
-    // expected less the number of packets actually received:
-    mLostPackets = mExpectedPackets - mReceivedPackets;
-    Debug( 5, "Lost packets = %d", mLostPackets );
+  // The number of packets lost is defined to be the number of packets
+  // expected less the number of packets actually received:
+  mLostPackets = mExpectedPackets - mReceivedPackets;
+  Debug( 5, "Lost packets = %d", mLostPackets );
 
-    uint32_t expectedInterval = mExpectedPackets - mExpectedPrior;
-    Debug( 5, "Expected interval = %d", expectedInterval );
-    mExpectedPrior = mExpectedPackets;
-    uint32_t receivedInterval = mReceivedPackets - mReceivedPrior;
-    Debug( 5, "Received interval = %d", receivedInterval );
-    mReceivedPrior = mReceivedPackets;
-    uint32_t lostInterval = expectedInterval - receivedInterval;
-    Debug( 5, "Lost interval = %d", lostInterval );
+  uint32_t expectedInterval = mExpectedPackets - mExpectedPrior;
+  Debug( 5, "Expected interval = %d", expectedInterval );
+  mExpectedPrior = mExpectedPackets;
+  uint32_t receivedInterval = mReceivedPackets - mReceivedPrior;
+  Debug( 5, "Received interval = %d", receivedInterval );
+  mReceivedPrior = mReceivedPackets;
+  uint32_t lostInterval = expectedInterval - receivedInterval;
+  Debug( 5, "Lost interval = %d", lostInterval );
 
-    if ( expectedInterval == 0 || lostInterval <= 0 )
-        mLostFraction = 0;
-    else
-        mLostFraction = (lostInterval << 8) / expectedInterval;
-    Debug( 5, "Lost fraction = %d", mLostFraction );
+  if ( expectedInterval == 0 || lostInterval <= 0 )
+    mLostFraction = 0;
+  else
+    mLostFraction = (lostInterval << 8) / expectedInterval;
+  Debug( 5, "Lost fraction = %d", mLostFraction );
 }
 
 bool RtpSource::handlePacket( const unsigned char *packet, size_t packetLen )
 {
-    const RtpDataHeader *rtpHeader;
-    rtpHeader = (RtpDataHeader *)packet;
-	int rtpHeaderSize = 12 + rtpHeader->cc * 4;
-    // No need to check for nal type as non fragmented packets already have 001 start sequence appended
-    bool h264FragmentEnd = (mCodecId == AV_CODEC_ID_H264) && (packet[rtpHeaderSize+1] & 0x40);
-    bool thisM = rtpHeader->m || h264FragmentEnd;
+  const RtpDataHeader *rtpHeader;
+  rtpHeader = (RtpDataHeader *)packet;
+  int rtpHeaderSize = 12 + rtpHeader->cc * 4;
+  // No need to check for nal type as non fragmented packets already have 001 start sequence appended
+  bool h264FragmentEnd = (mCodecId == AV_CODEC_ID_H264) && (packet[rtpHeaderSize+1] & 0x40);
+  // M stands for Marker, it is the 8th bit
+  // The interpretation of the marker is defined by a profile. It is intended
+  // to allow significant events such as frame boundaries to be marked in the
+  //  packet stream. A profile may define additional marker bits or specify
+  //  that there is no marker bit by changing the number of bits in the payload type field.
+  bool thisM = rtpHeader->m || h264FragmentEnd;
 
-    if ( updateSeq( ntohs(rtpHeader->seqN) ) )
+  if ( updateSeq( ntohs(rtpHeader->seqN) ) )
+  {
+    Hexdump( 4, packet+rtpHeaderSize, 16 );
+
+    if ( mFrameGood )
     {
-        Hexdump( 4, packet+rtpHeaderSize, 16 );
-
-        if ( mFrameGood )
+      int extraHeader = 0;
+      
+      if( mCodecId == AV_CODEC_ID_H264 )
+      {
+        int nalType = (packet[rtpHeaderSize] & 0x1f);
+        Debug( 3, "Have H264 frame: nal type is %d", nalType );
+        
+        switch (nalType)
         {
-            int extraHeader = 0;
-            
-            if( mCodecId == AV_CODEC_ID_H264 )
+          case 24: // STAP-A
+          {
+            extraHeader = 2;
+            break;
+          }
+          case 25: // STAP-B
+          case 26: // MTAP-16
+          case 27: // MTAP-24
+          {
+            extraHeader = 3;
+            break;
+          }
+          // FU-A and FU-B
+          case 28: case 29:
+          {
+            // Is this NAL the first NAL in fragmentation sequence
+            if ( packet[rtpHeaderSize+1] & 0x80 )
             {
-                int nalType = (packet[rtpHeaderSize] & 0x1f);
-                
-                switch (nalType)
-                {
-                    case 24:
-                    {
-                        extraHeader = 2;
-                        break;
-                    }
-                    case 25: case 26: case 27:
-                    {
-                        extraHeader = 3;
-                        break;
-                    }
-                    // FU-A and FU-B
-                    case 28: case 29:
-                    {
-                        // Is this NAL the first NAL in fragmentation sequence
-                        if ( packet[rtpHeaderSize+1] & 0x80 )
-                        {
-                            // Now we will form new header of frame
-                            mFrame.append( "\x0\x0\x1\x0", 4 );
-                            // Reconstruct NAL header from FU headers
-                            *(mFrame+3) = (packet[rtpHeaderSize+1] & 0x1f) |
-                                          (packet[rtpHeaderSize] & 0xe0);
-                        }
-                    
-                        extraHeader = 2;
-                        break;
-                    }
-                }
-                
-                // Append NAL frame start code
-                if ( !mFrame.size() )
-                    mFrame.append( "\x0\x0\x1", 3 );
+              // Now we will form new header of frame
+              mFrame.append( "\x0\x0\x1\x0", 4 );
+              // Reconstruct NAL header from FU headers
+              *(mFrame+3) = (packet[rtpHeaderSize+1] & 0x1f) |
+                      (packet[rtpHeaderSize] & 0xe0);
             }
-            mFrame.append( packet+rtpHeaderSize+extraHeader, packetLen-rtpHeaderSize-extraHeader ); 
-        }
-
-        Hexdump( 4, mFrame.head(), 16 );
-
-        if ( thisM )
-        {
-            if ( mFrameGood )
-            {
-                Debug( 2, "Got new frame %d, %d bytes", mFrameCount, mFrame.size() );
-
-                mFrameProcessed.setValueImmediate( false );
-                mFrameReady.updateValueSignal( true );
-                if ( !mFrameProcessed.getValueImmediate() )
-                {
-                    for ( int count = 0; !mFrameProcessed.getUpdatedValue( 1 ); count++ )
-                        if( count > 1 )
-                            return( false );
-                }
-                mFrameCount++;
-            }
-            else
-            {
-                Warning( "Discarding incomplete frame %d, %d bytes", mFrameCount, mFrame.size() );
-            }
-            mFrame.clear();
+          
+            extraHeader = 2;
+            break;
+          }
+          default: {
+            Debug(3, "Unhandled nalType %d", nalType );
+          }
         }
+        
+        // Append NAL frame start code
+        if ( !mFrame.size() )
+          mFrame.append( "\x0\x0\x1", 3 );
+      }
+      mFrame.append( packet+rtpHeaderSize+extraHeader, packetLen-rtpHeaderSize-extraHeader ); 
+      } else {
+        Debug( 3, "NOT H264 frame: type is %d", mCodecId );
     }
-    else
-    {
-        if ( mFrame.size() )
-        {
-            Warning( "Discarding partial frame %d, %d bytes", mFrameCount, mFrame.size() );
-        }
-        else
-        {
-            Warning( "Discarding frame %d", mFrameCount );
-        }
-        mFrameGood = false;
-        mFrame.clear();
-    }
+
+    Hexdump( 4, mFrame.head(), 16 );
+
     if ( thisM )
     {
-        mFrameGood = true;
-        prevM = true;
+      if ( mFrameGood )
+      {
+        Debug( 2, "Got new frame %d, %d bytes", mFrameCount, mFrame.size() );
+
+        mFrameProcessed.setValueImmediate( false );
+        mFrameReady.updateValueSignal( true );
+        if ( !mFrameProcessed.getValueImmediate() )
+        {
+          for ( int count = 0; !mFrameProcessed.getUpdatedValue( 1 ); count++ )
+            if( count > 1 )
+              return( false );
+        }
+        mFrameCount++;
+      }
+      else
+      {
+        Warning( "Discarding incomplete frame %d, %d bytes", mFrameCount, mFrame.size() );
+      }
+      mFrame.clear();
+    }
+  }
+  else
+  {
+    if ( mFrame.size() )
+    {
+      Warning( "Discarding partial frame %d, %d bytes", mFrameCount, mFrame.size() );
     }
     else
-		prevM = false;
+    {
+      Warning( "Discarding frame %d", mFrameCount );
+    }
+    mFrameGood = false;
+    mFrame.clear();
+  }
+  if ( thisM )
+  {
+    mFrameGood = true;
+    prevM = true;
+  }
+  else
+    prevM = false;
 
-    updateJitter( rtpHeader );
+  updateJitter( rtpHeader );
 
-    return( true );
+  return( true );
 }
 
 bool RtpSource::getFrame( Buffer &buffer )
 {
-    Debug( 3, "Getting frame" );
-    if ( !mFrameReady.getValueImmediate() )
-    {
-        // Allow for a couple of spurious returns
-        for ( int count = 0; !mFrameReady.getUpdatedValue( 1 ); count++ )
-            if ( count > 1 )
-                return( false );
-    }
-    buffer = mFrame;
-    mFrameReady.setValueImmediate( false );
-    mFrameProcessed.updateValueSignal( true );
-    Debug( 3, "Copied %d bytes", buffer.size() );
-    return( true );
+  Debug( 3, "Getting frame" );
+  if ( !mFrameReady.getValueImmediate() )
+  {
+    // Allow for a couple of spurious returns
+    for ( int count = 0; !mFrameReady.getUpdatedValue( 1 ); count++ )
+      if ( count > 1 )
+        return( false );
+  }
+  buffer = mFrame;
+  mFrameReady.setValueImmediate( false );
+  mFrameProcessed.updateValueSignal( true );
+  Debug( 3, "Copied %d bytes", buffer.size() );
+  return( true );
 }
 
 #endif // HAVE_LIBAVCODEC
diff --git a/src/zm_rtp_source.h b/src/zm_rtp_source.h
index cd41424ac..b86577e01 100644
--- a/src/zm_rtp_source.h
+++ b/src/zm_rtp_source.h
@@ -35,152 +35,152 @@ struct RtpDataHeader;
 class RtpSource
 {
 public: 
-    typedef enum { EMPTY, FILLING, READY } FrameState;
+  typedef enum { EMPTY, FILLING, READY } FrameState;
 private:
-    static const int RTP_SEQ_MOD = 1<<16;
-    static const int MAX_DROPOUT = 3000;
-    static const int MAX_MISORDER = 100;
-    static const int MIN_SEQUENTIAL = 2;
+  static const int RTP_SEQ_MOD = 1<<16;
+  static const int MAX_DROPOUT = 3000;
+  static const int MAX_MISORDER = 100;
+  static const int MIN_SEQUENTIAL = 2;
 
 private:
-    // Identity
-    int mId;                 // General id (usually monitor id)
-    std::string mCname;      // Canonical name, for SDES
+  // Identity
+  int mId;         // General id (usually monitor id)
+  std::string mCname;    // Canonical name, for SDES
 
-    // RTP/RTCP fields
-    uint32_t mSsrc;
-    uint16_t mMaxSeq;             // highest seq. number seen
-    uint32_t mCycles;             // shifted count of seq. number cycles
-    uint32_t mBaseSeq;            // base seq number
-    uint32_t mBadSeq;             // last 'bad' seq number + 1
-    uint32_t mProbation;          // sequ. packets till source is valid
-    uint32_t mReceivedPackets;    // packets received
-    uint32_t mExpectedPrior;      // packet expected at last interval
-    uint32_t mReceivedPrior;      // packet received at last interval
-    uint32_t mTransit;            // relative trans time for prev pkt
-    uint32_t mJitter;             // estimated jitter
-    
-    // Ports/Channels
-    std::string mLocalHost;
-    int mLocalPortChans[2]; 
-    std::string mRemoteHost;
-    int mRemotePortChans[2]; 
+  // RTP/RTCP fields
+  uint32_t mSsrc;
+  uint16_t mMaxSeq;       // highest seq. number seen
+  uint32_t mCycles;       // shifted count of seq. number cycles
+  uint32_t mBaseSeq;      // base seq number
+  uint32_t mBadSeq;       // last 'bad' seq number + 1
+  uint32_t mProbation;      // sequ. packets till source is valid
+  uint32_t mReceivedPackets;  // packets received
+  uint32_t mExpectedPrior;    // packet expected at last interval
+  uint32_t mReceivedPrior;    // packet received at last interval
+  uint32_t mTransit;      // relative trans time for prev pkt
+  uint32_t mJitter;       // estimated jitter
+  
+  // Ports/Channels
+  std::string mLocalHost;
+  int mLocalPortChans[2]; 
+  std::string mRemoteHost;
+  int mRemotePortChans[2]; 
 
-    // Time keys
-    uint32_t mRtpClock;
-    uint32_t mRtpFactor;
-    struct timeval mBaseTimeReal;
-    struct timeval mBaseTimeNtp;
-    uint32_t mBaseTimeRtp;
+  // Time keys
+  uint32_t mRtpClock;
+  uint32_t mRtpFactor;
+  struct timeval mBaseTimeReal;
+  struct timeval mBaseTimeNtp;
+  uint32_t mBaseTimeRtp;
 
-    struct timeval mLastSrTimeReal;
-    uint32_t mLastSrTimeNtpSecs;
-    uint32_t mLastSrTimeNtpFrac;
-    struct timeval mLastSrTimeNtp;
-    uint32_t mLastSrTimeRtp;
+  struct timeval mLastSrTimeReal;
+  uint32_t mLastSrTimeNtpSecs;
+  uint32_t mLastSrTimeNtpFrac;
+  struct timeval mLastSrTimeNtp;
+  uint32_t mLastSrTimeRtp;
 
-    // Stats, intermittently updated
-    uint32_t mExpectedPackets;
-    uint32_t mLostPackets;
-    uint8_t  mLostFraction;
+  // Stats, intermittently updated
+  uint32_t mExpectedPackets;
+  uint32_t mLostPackets;
+  uint8_t  mLostFraction;
 
-    _AVCODECID mCodecId;
+  _AVCODECID mCodecId;
 
-    Buffer mFrame;
-    int mFrameCount;
-    bool mFrameGood;
-    bool prevM;
-    ThreadData<bool> mFrameReady;
-    ThreadData<bool> mFrameProcessed;
+  Buffer mFrame;
+  int mFrameCount;
+  bool mFrameGood;
+  bool prevM;
+  ThreadData<bool> mFrameReady;
+  ThreadData<bool> mFrameProcessed;
 
 private:
-    void init( uint16_t seq );
+  void init( uint16_t seq );
 
 public:
-    RtpSource( int id, const std::string &localHost, int localPortBase, const std::string &remoteHost, int remotePortBase, uint32_t ssrc, uint16_t seq, uint32_t rtpClock, uint32_t rtpTime, _AVCODECID codecId );
-    
-    bool updateSeq( uint16_t seq );
-    void updateJitter( const RtpDataHeader *header );
-    void updateRtcpData( uint32_t ntpTimeSecs, uint32_t ntpTimeFrac, uint32_t rtpTime );
-    void updateRtcpStats();
+  RtpSource( int id, const std::string &localHost, int localPortBase, const std::string &remoteHost, int remotePortBase, uint32_t ssrc, uint16_t seq, uint32_t rtpClock, uint32_t rtpTime, _AVCODECID codecId );
+  
+  bool updateSeq( uint16_t seq );
+  void updateJitter( const RtpDataHeader *header );
+  void updateRtcpData( uint32_t ntpTimeSecs, uint32_t ntpTimeFrac, uint32_t rtpTime );
+  void updateRtcpStats();
 
-    bool handlePacket( const unsigned char *packet, size_t packetLen );
+  bool handlePacket( const unsigned char *packet, size_t packetLen );
 
-    uint32_t getSsrc() const
-    {
-        return( mSsrc );
-    }
-    void setSsrc( uint32_t ssrc )
-    {
-        mSsrc = ssrc;
-    }
+  uint32_t getSsrc() const
+  {
+    return( mSsrc );
+  }
+  void setSsrc( uint32_t ssrc )
+  {
+    mSsrc = ssrc;
+  }
 
-    bool getFrame( Buffer &buffer );
+  bool getFrame( Buffer &buffer );
 
-    const std::string &getCname() const
-    {
-        return( mCname );
-    }
+  const std::string &getCname() const
+  {
+    return( mCname );
+  }
 
-    const std::string &getLocalHost() const
-    {
-        return( mLocalHost );
-    }
+  const std::string &getLocalHost() const
+  {
+    return( mLocalHost );
+  }
 
-    int getLocalDataPort() const
-    {
-        return( mLocalPortChans[0] );
-    }
+  int getLocalDataPort() const
+  {
+    return( mLocalPortChans[0] );
+  }
 
-    int getLocalCtrlPort() const
-    {
-        return( mLocalPortChans[1] );
-    }
+  int getLocalCtrlPort() const
+  {
+    return( mLocalPortChans[1] );
+  }
 
-    const std::string &getRemoteHost() const
-    {
-        return( mRemoteHost );
-    }
+  const std::string &getRemoteHost() const
+  {
+    return( mRemoteHost );
+  }
 
-    int getRemoteDataPort() const
-    {
-        return( mRemotePortChans[0] );
-    }
+  int getRemoteDataPort() const
+  {
+    return( mRemotePortChans[0] );
+  }
 
-    int getRemoteCtrlPort() const
-    {
-        return( mRemotePortChans[1] );
-    }
+  int getRemoteCtrlPort() const
+  {
+    return( mRemotePortChans[1] );
+  }
 
-    uint32_t getMaxSeq() const
-    {
-        return( mCycles + mMaxSeq );
-    }
+  uint32_t getMaxSeq() const
+  {
+    return( mCycles + mMaxSeq );
+  }
 
-    uint32_t getExpectedPackets() const
-    {
-        return( mExpectedPackets );
-    }
-    
-    uint32_t getLostPackets() const
-    {
-        return( mLostPackets );
-    }
+  uint32_t getExpectedPackets() const
+  {
+    return( mExpectedPackets );
+  }
+  
+  uint32_t getLostPackets() const
+  {
+    return( mLostPackets );
+  }
 
-    uint8_t getLostFraction() const
-    {
-        return( mLostFraction );
-    }
+  uint8_t getLostFraction() const
+  {
+    return( mLostFraction );
+  }
 
-    uint32_t getJitter() const
-    {
-        return( mJitter >> 4 );
-    }
+  uint32_t getJitter() const
+  {
+    return( mJitter >> 4 );
+  }
 
-    uint32_t getLastSrTimestamp() const
-    {
-        return( ((mLastSrTimeNtpSecs&0xffff)<<16)|(mLastSrTimeNtpFrac>>16) );
-    }
+  uint32_t getLastSrTimestamp() const
+  {
+    return( ((mLastSrTimeNtpSecs&0xffff)<<16)|(mLastSrTimeNtpFrac>>16) );
+  }
 };
 
 #endif // HAVE_LIBAVCODEC
diff --git a/src/zm_rtsp.cpp b/src/zm_rtsp.cpp
index 7ac80e9b6..b248d1f05 100644
--- a/src/zm_rtsp.cpp
+++ b/src/zm_rtsp.cpp
@@ -38,860 +38,860 @@ RtspThread::PortSet  RtspThread::smAssignedPorts;
 
 bool RtspThread::sendCommand( std::string message )
 {
-	if ( mNeedAuth ) {
-	    StringVector parts = split( message, " " );
-	    if (parts.size() > 1)
-	    	message += mAuthenticator->getAuthHeader(parts[0], parts[1]);
-	}
-    message += stringtf( "User-Agent: ZoneMinder/%s\r\n", ZM_VERSION );
-    message += stringtf( "CSeq: %d\r\n\r\n", ++mSeq );
-    Debug( 2, "Sending RTSP message: %s", message.c_str() );
-    if ( mMethod == RTP_RTSP_HTTP )
+  if ( mNeedAuth ) {
+    StringVector parts = split( message, " " );
+    if (parts.size() > 1)
+      message += mAuthenticator->getAuthHeader(parts[0], parts[1]);
+  }
+  message += stringtf( "User-Agent: ZoneMinder/%s\r\n", ZM_VERSION );
+  message += stringtf( "CSeq: %d\r\n\r\n", ++mSeq );
+  Debug( 2, "Sending RTSP message: %s", message.c_str() );
+  if ( mMethod == RTP_RTSP_HTTP )
+  {
+    message = base64Encode( message );
+    Debug( 2, "Sending encoded RTSP message: %s", message.c_str() );
+    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() )
     {
-        message = base64Encode( message );
-        Debug( 2, "Sending encoded RTSP message: %s", message.c_str() );
-        if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() )
-        {
-            Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
-            return( false );
-        }
+      Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
+      return( false );
     }
-    else
+  }
+  else
+  {
+    if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
     {
-        if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
-        {
-            Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
-            return( false );
-        }
+      Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
+      return( false );
     }
-    return( true );
+  }
+  return( true );
 }
 
 bool RtspThread::recvResponse( std::string &response )
 {
-    if ( mRtspSocket.recv( response ) < 0 )
-        Error( "Recv failed; %s", strerror(errno) );
-    Debug( 2, "Received RTSP response: %s (%zd bytes)", response.c_str(), response.size() );
-    float respVer = 0;
-    respCode = -1;
-    char respText[ZM_NETWORK_BUFSIZ];
-    if ( sscanf( response.c_str(), "RTSP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
+  if ( mRtspSocket.recv( response ) < 0 )
+    Error( "Recv failed; %s", strerror(errno) );
+  Debug( 2, "Received RTSP response: %s (%zd bytes)", response.c_str(), response.size() );
+  float respVer = 0;
+  respCode = -1;
+  char respText[ZM_NETWORK_BUFSIZ];
+  if ( sscanf( response.c_str(), "RTSP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
+  {
+    if ( isalnum(response[0]) )
     {
-        if ( isalnum(response[0]) )
-        {
-            Error( "Response parse failure in '%s'", response.c_str() );
-        }
-        else
-        {
-            Error( "Response parse failure, %zd bytes follow", response.size() );
-            if ( response.size() )
-                Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
-        }
-        return( false );
+      Error( "Response parse failure in '%s'", response.c_str() );
     }
-    if ( respCode == 401)
+    else
     {
-    	Debug( 2, "Got 401 access denied response code, check WWW-Authenticate header and retry");
-    	mAuthenticator->checkAuthResponse(response);
-    	mNeedAuth = true;
-    	return( false );
-    } 
-    else if ( respCode != 200 )
-    {
-        Error( "Unexpected response code %d, text is '%s'", respCode, respText );
-        return( false );
+      Error( "Response parse failure, %zd bytes follow", response.size() );
+      if ( response.size() )
+        Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
     }
-    return( true );
+    return( false );
+  }
+  if ( respCode == 401)
+  {
+    Debug( 2, "Got 401 access denied response code, check WWW-Authenticate header and retry");
+    mAuthenticator->checkAuthResponse(response);
+    mNeedAuth = true;
+    return( false );
+  } 
+  else if ( respCode != 200 )
+  {
+    Error( "Unexpected response code %d, text is '%s'", respCode, respText );
+    return( false );
+  }
+  return( true );
 }
 
 int RtspThread::requestPorts()
 {
-    if ( !smMinDataPort )
+  if ( !smMinDataPort )
+  {
+    char sql[ZM_SQL_SML_BUFSIZ];
+    strncpy( sql, "select Id from Monitors where Function != 'None' and Type = 'Remote' and Protocol = 'rtsp' and Method = 'rtpUni' order by Id asc", sizeof(sql) );
+    if ( mysql_query( &dbconn, sql ) )
     {
-        char sql[ZM_SQL_SML_BUFSIZ];
-        strncpy( sql, "select Id from Monitors where Function != 'None' and Type = 'Remote' and Protocol = 'rtsp' and Method = 'rtpUni' order by Id asc", sizeof(sql) );
-        if ( mysql_query( &dbconn, sql ) )
-        {
-            Error( "Can't run query: %s", mysql_error( &dbconn ) );
-            exit( mysql_errno( &dbconn ) );
-        }
+      Error( "Can't run query: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
+    }
 
-        MYSQL_RES *result = mysql_store_result( &dbconn );
-        if ( !result )
-        {
-            Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-            exit( mysql_errno( &dbconn ) );
-        }
-        int nMonitors = mysql_num_rows( result );
-        int position = 0;
-        if ( nMonitors )
-        {
-            for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-            {
-                int id = atoi(dbrow[0]);
-                if ( mId == id )
-                {
-                    position = i;
-                    break;
-                }
-            }
-        }
-        else
-        {
-            // Minor hack for testing when not strictly enabled
-            nMonitors = 1;
-            position = 0;
-        }
-        mysql_free_result(result);
-        int portRange = int(((config.max_rtp_port-config.min_rtp_port)+1)/nMonitors);
-        smMinDataPort = config.min_rtp_port + (position * portRange);
-        smMaxDataPort = smMinDataPort + portRange - 1;
-        Debug( 2, "Assigned RTP port range is %d-%d", smMinDataPort, smMaxDataPort );
-    }
-    for ( int i = smMinDataPort; i <= smMaxDataPort; i++ )
+    MYSQL_RES *result = mysql_store_result( &dbconn );
+    if ( !result )
     {
-        PortSet::const_iterator iter = smAssignedPorts.find( i );
-        if ( iter == smAssignedPorts.end() )
-        {
-            smAssignedPorts.insert( i );
-            return( i );
-        }
+      Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+      exit( mysql_errno( &dbconn ) );
     }
-    Panic( "Can assign RTP port, no ports left in pool" );
-    return( -1 );
+    int nMonitors = mysql_num_rows( result );
+    int position = 0;
+    if ( nMonitors )
+    {
+      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+      {
+        int id = atoi(dbrow[0]);
+        if ( mId == id )
+        {
+          position = i;
+          break;
+        }
+      }
+    }
+    else
+    {
+      // Minor hack for testing when not strictly enabled
+      nMonitors = 1;
+      position = 0;
+    }
+    mysql_free_result(result);
+    int portRange = int(((config.max_rtp_port-config.min_rtp_port)+1)/nMonitors);
+    smMinDataPort = config.min_rtp_port + (position * portRange);
+    smMaxDataPort = smMinDataPort + portRange - 1;
+    Debug( 2, "Assigned RTP port range is %d-%d", smMinDataPort, smMaxDataPort );
+  }
+  for ( int i = smMinDataPort; i <= smMaxDataPort; i++ )
+  {
+    PortSet::const_iterator iter = smAssignedPorts.find( i );
+    if ( iter == smAssignedPorts.end() )
+    {
+      smAssignedPorts.insert( i );
+      return( i );
+    }
+  }
+  Panic( "Can assign RTP port, no ports left in pool" );
+  return( -1 );
 }
 
 void RtspThread::releasePorts( int port )
 {
-    if ( port > 0 )
-        smAssignedPorts.erase( port );
+  if ( port > 0 )
+    smAssignedPorts.erase( port );
 }
 
 RtspThread::RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth, bool rtsp_describe) :
-    mId( id ),
-    mMethod( method ),
-    mProtocol( protocol ),
-    mHost( host ),
-    mPort( port ),
-    mPath( path ),
-    mRtspDescribe( rtsp_describe ),
-    mSessDesc( 0 ),
-    mFormatContext( 0 ),
-    mSeq( 0 ),
-    mSession( 0 ),
-    mSsrc( 0 ),
-    mDist( UNDEFINED ),
-    mRtpTime( 0 ),
-    mStop( false )
+  mId( id ),
+  mMethod( method ),
+  mProtocol( protocol ),
+  mHost( host ),
+  mPort( port ),
+  mPath( path ),
+  mRtspDescribe( rtsp_describe ),
+  mSessDesc( 0 ),
+  mFormatContext( 0 ),
+  mSeq( 0 ),
+  mSession( 0 ),
+  mSsrc( 0 ),
+  mDist( UNDEFINED ),
+  mRtpTime( 0 ),
+  mStop( false )
 {
-    mUrl = mProtocol+"://"+mHost+":"+mPort;
-    if ( !mPath.empty() )
-    {
-        if ( mPath[0] == '/' )
-            mUrl += mPath;
-        else
-            mUrl += '/'+mPath;
-    }
-
-    mSsrc = rand();
-
-    Debug( 2, "RTSP Local SSRC is %x", mSsrc );
-
-    if ( mMethod == RTP_RTSP_HTTP )
-        mHttpSession = stringtf( "%d", rand() );
-    
-    mNeedAuth = false;
-    StringVector parts = split(auth,":");
-    if (parts.size() > 1) 
-    	mAuthenticator = new zm::Authenticator(parts[0], parts[1]);
+  mUrl = mProtocol+"://"+mHost+":"+mPort;
+  if ( !mPath.empty() )
+  {
+    if ( mPath[0] == '/' )
+      mUrl += mPath;
     else
-    	mAuthenticator = new zm::Authenticator(parts[0], "");
+      mUrl += '/'+mPath;
+  }
+
+  mSsrc = rand();
+
+  Debug( 2, "RTSP Local SSRC is %x", mSsrc );
+
+  if ( mMethod == RTP_RTSP_HTTP )
+    mHttpSession = stringtf( "%d", rand() );
+  
+  mNeedAuth = false;
+  StringVector parts = split(auth,":");
+  if (parts.size() > 1) 
+    mAuthenticator = new zm::Authenticator(parts[0], parts[1]);
+  else
+    mAuthenticator = new zm::Authenticator(parts[0], "");
 }
 
 RtspThread::~RtspThread()
 {
-    if ( mFormatContext )
-    {
+  if ( mFormatContext )
+  {
 #if LIBAVFORMAT_VERSION_CHECK(52, 96, 0, 96, 0)
-        avformat_free_context( mFormatContext );
+    avformat_free_context( mFormatContext );
 #else
-        av_free_format_context( mFormatContext );
+    av_free_format_context( mFormatContext );
 #endif
-        mFormatContext = NULL;
-    }
-    if ( mSessDesc )
-    {
-        delete mSessDesc;
-        mSessDesc = NULL;
-    }
-    delete mAuthenticator;
+    mFormatContext = NULL;
+  }
+  if ( mSessDesc )
+  {
+    delete mSessDesc;
+    mSessDesc = NULL;
+  }
+  delete mAuthenticator;
 }
 
 int RtspThread::run()
 {
-    std::string message;
-    std::string response;
+  std::string message;
+  std::string response;
 
-    response.reserve( ZM_NETWORK_BUFSIZ );
+  response.reserve( ZM_NETWORK_BUFSIZ );
 
-    if ( !mRtspSocket.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
-        Fatal( "Unable to connect RTSP socket" );
+  if ( !mRtspSocket.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
+    Fatal( "Unable to connect RTSP socket" );
+  //Select select( 0.25 );
+  //select.addReader( &mRtspSocket );
+  //while ( select.wait() )
+  //{
+    //mRtspSocket.recv( response );
+    //Debug( 4, "Drained %d bytes from RTSP socket", response.size() );
+  //}
+
+  
+  bool authTried = false; 
+  if ( mMethod == RTP_RTSP_HTTP )
+  {
+    if ( !mRtspSocket2.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
+      Fatal( "Unable to connect auxiliary RTSP/HTTP socket" );
     //Select select( 0.25 );
-    //select.addReader( &mRtspSocket );
+    //select.addReader( &mRtspSocket2 );
     //while ( select.wait() )
     //{
-        //mRtspSocket.recv( response );
-        //Debug( 4, "Drained %d bytes from RTSP socket", response.size() );
+      //mRtspSocket2.recv( response );
+      //Debug( 4, "Drained %d bytes from HTTP socket", response.size() );
     //}
-
     
-    bool authTried = false; 
-    if ( mMethod == RTP_RTSP_HTTP )
+    //possibly retry sending the message for authentication 
+    int respCode = -1;
+    char respText[256];
+    do {
+      message = "GET "+mPath+" HTTP/1.0\r\n";
+      message += "X-SessionCookie: "+mHttpSession+"\r\n";
+      if ( mNeedAuth ) {
+        message += mAuthenticator->getAuthHeader("GET", mPath);
+        authTried = true;
+      }
+      message += "Accept: application/x-rtsp-tunnelled\r\n";
+      message += "\r\n";
+      Debug( 2, "Sending HTTP message: %s", message.c_str() );
+      if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
+      {
+        Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
+        return( -1 );
+      }
+      if ( mRtspSocket.recv( response ) < 0 )
+      {
+        Error( "Recv failed; %s", strerror(errno) );
+        return( -1 );
+      }
+    
+      Debug( 2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size() );
+      float respVer = 0;
+      respCode = -1;
+      if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
+      {
+        if ( isalnum(response[0]) )
+        {
+        Error( "Response parse failure in '%s'", response.c_str() );
+        }
+        else
+        {
+        Error( "Response parse failure, %zd bytes follow", response.size() );
+        if ( response.size() )
+          Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
+        }
+        return( -1 );
+      }
+      // If Server requests authentication, check WWW-Authenticate header and fill required fields
+      // for requested authentication method
+      if (respCode == 401 && !authTried) {
+        mNeedAuth = true;
+        mAuthenticator->checkAuthResponse(response);
+        Debug(2, "Processed 401 response");
+        mRtspSocket.close();
+        if ( !mRtspSocket.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
+          Fatal( "Unable to reconnect RTSP socket" );
+        Debug(2, "connection should be reopened now");
+      }
+      
+    } while (respCode == 401 && !authTried);  
+    
+    if ( respCode != 200 )
     {
-        if ( !mRtspSocket2.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
-            Fatal( "Unable to connect auxiliary RTSP/HTTP socket" );
-        //Select select( 0.25 );
-        //select.addReader( &mRtspSocket2 );
-        //while ( select.wait() )
-        //{
-            //mRtspSocket2.recv( response );
-            //Debug( 4, "Drained %d bytes from HTTP socket", response.size() );
-        //}
-        
-        //possibly retry sending the message for authentication 
-        int respCode = -1;
-        char respText[256];
-        do {
-			message = "GET "+mPath+" HTTP/1.0\r\n";
-			message += "X-SessionCookie: "+mHttpSession+"\r\n";
-			if ( mNeedAuth ) {
-				message += mAuthenticator->getAuthHeader("GET", mPath);
-				authTried = true;
-			}
-		    message += "Accept: application/x-rtsp-tunnelled\r\n";
-			message += "\r\n";
-			Debug( 2, "Sending HTTP message: %s", message.c_str() );
-			if ( mRtspSocket.send( message.c_str(), message.size() ) != (int)message.length() )
-			{
-				Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
-				return( -1 );
-			}
-			if ( mRtspSocket.recv( response ) < 0 )
-			{
-				Error( "Recv failed; %s", strerror(errno) );
-				return( -1 );
-			}
-		
-			Debug( 2, "Received HTTP response: %s (%zd bytes)", response.c_str(), response.size() );
-			float respVer = 0;
-			respCode = -1;
-			if ( sscanf( response.c_str(), "HTTP/%f %3d %[^\r\n]\r\n", &respVer, &respCode, respText ) != 3 )
-			{
-				if ( isalnum(response[0]) )
-				{
-				Error( "Response parse failure in '%s'", response.c_str() );
-				}
-				else
-				{
-				Error( "Response parse failure, %zd bytes follow", response.size() );
-				if ( response.size() )
-					Hexdump( Logger::ERROR, response.data(), min(response.size(),16) );
-				}
-				return( -1 );
-			}
-			// If Server requests authentication, check WWW-Authenticate header and fill required fields
-			// for requested authentication method
-			if (respCode == 401 && !authTried) {
-				mNeedAuth = true;
-				mAuthenticator->checkAuthResponse(response);
-				Debug(2, "Processed 401 response");
-				mRtspSocket.close();
-			    if ( !mRtspSocket.connect( mHost.c_str(), strtol( mPort.c_str(), NULL, 10 ) ) )
-			        Fatal( "Unable to reconnect RTSP socket" );
-			    Debug(2, "connection should be reopened now");
-			}
-			
-		} while (respCode == 401 && !authTried);  
-		
-        if ( respCode != 200 )
-        {
-            Error( "Unexpected response code %d, text is '%s'", respCode, respText );
-            return( -1 );
-        }
-
-        message = "POST "+mPath+" HTTP/1.0\r\n";
-        message += "X-SessionCookie: "+mHttpSession+"\r\n";
-		if ( mNeedAuth )
-			message += mAuthenticator->getAuthHeader("POST", mPath);
-        message += "Content-Length: 32767\r\n";
-        message += "Content-Type: application/x-rtsp-tunnelled\r\n";
-        message += "\r\n";
-        Debug( 2, "Sending HTTP message: %s", message.c_str() );
-        if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() )
-        {
-            Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
-            return( -1 );
-        }
+      Error( "Unexpected response code %d, text is '%s'", respCode, respText );
+      return( -1 );
     }
 
-    std::string localHost = "";
-    int localPorts[2] = { 0, 0 };
+    message = "POST "+mPath+" HTTP/1.0\r\n";
+    message += "X-SessionCookie: "+mHttpSession+"\r\n";
+    if ( mNeedAuth )
+      message += mAuthenticator->getAuthHeader("POST", mPath);
+    message += "Content-Length: 32767\r\n";
+    message += "Content-Type: application/x-rtsp-tunnelled\r\n";
+    message += "\r\n";
+    Debug( 2, "Sending HTTP message: %s", message.c_str() );
+    if ( mRtspSocket2.send( message.c_str(), message.size() ) != (int)message.length() )
+    {
+      Error( "Unable to send message '%s': %s", message.c_str(), strerror(errno) );
+      return( -1 );
+    }
+  }
 
-    // Request supported RTSP commands by the server
-    message = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
-    if ( !sendCommand( message ) )
+  std::string localHost = "";
+  int localPorts[2] = { 0, 0 };
+
+  // Request supported RTSP commands by the server
+  message = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
+  if ( !sendCommand( message ) )
+    return( -1 );
+
+  // A negative return here may indicate auth failure, but we will have setup the auth mechanisms so we need to retry.
+  if ( !recvResponse( response ) ) {
+    if ( mNeedAuth ) {
+      Debug( 2, "Resending OPTIONS due to possible auth requirement" );
+      if ( !sendCommand( message ) )
         return( -1 );
+      if ( !recvResponse( response ) )
+        return( -1 );
+    } else {
+      return( -1 );
+    }
+  } // end if failed response maybe due to auth
 
-	// A negative return here may indicate auth failure, but we will have setup the auth mechanisms so we need to retry.
-    if ( !recvResponse( response ) ) {
-		if ( mNeedAuth ) {
-			Debug( 2, "Resending OPTIONS due to possible auth requirement" );
-			if ( !sendCommand( message ) )
-				return( -1 );
-			if ( !recvResponse( response ) )
-				return( -1 );
-		} else {
-			return( -1 );
-		}
-	} // end if failed response maybe due to auth
+  char publicLine[256] = "";
+  StringVector lines = split( response, "\r\n" );
+  for ( size_t i = 0; i < lines.size(); i++ )
+    sscanf( lines[i].c_str(), "Public: %[^\r\n]\r\n", publicLine );
 
-    char publicLine[256] = "";
-    StringVector lines = split( response, "\r\n" );
+  // Check if the server supports the GET_PARAMETER command
+  // If yes, it is likely that the server will request this command as a keepalive message
+  bool sendKeepalive = false;
+  if ( publicLine[0] && strstr(publicLine, "GET_PARAMETER") )
+    sendKeepalive = true;
+
+  message = "DESCRIBE "+mUrl+" RTSP/1.0\r\n";
+  bool res;
+  do {
+    if (mNeedAuth)
+      authTried = true;
+    sendCommand( message );
+    sleep( 1 );
+    res = recvResponse( response );
+    if (!res && respCode==401)
+      mNeedAuth = true;
+  } while (!res && respCode==401 && !authTried);
+
+  const std::string endOfHeaders = "\r\n\r\n";
+  size_t sdpStart = response.find( endOfHeaders );
+  if( sdpStart == std::string::npos )
+    return( -1 );
+
+  if ( mRtspDescribe )
+  {
+    std::string DescHeader = response.substr( 0,sdpStart );
+    Debug( 1, "Processing DESCRIBE response header '%s'", DescHeader.c_str() );
+
+    lines = split( DescHeader, "\r\n" );
     for ( size_t i = 0; i < lines.size(); i++ )
-        sscanf( lines[i].c_str(), "Public: %[^\r\n]\r\n", publicLine );
+      {
+        // If the device sends us a url value for Content-Base in the response header, we should use that instead
+        if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) )
+          {
+            mUrl = trimSpaces( lines[i].substr( 13 ) );
+            Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() );
+            break;
+          }
+      }
+  }
 
-    // Check if the server supports the GET_PARAMETER command
-    // If yes, it is likely that the server will request this command as a keepalive message
-    bool sendKeepalive = false;
-    if ( publicLine[0] && strstr(publicLine, "GET_PARAMETER") )
-        sendKeepalive = true;
+  sdpStart += endOfHeaders.length();
 
-    message = "DESCRIBE "+mUrl+" RTSP/1.0\r\n";
-	bool res;
-	do {
-		if (mNeedAuth)
-			authTried = true;
-		sendCommand( message );
-		sleep( 1 );
-		res = recvResponse( response );
-		if (!res && respCode==401)
-			mNeedAuth = true;
-	} while (!res && respCode==401 && !authTried);
+  std::string sdp = response.substr( sdpStart );
+  Debug( 1, "Processing SDP '%s'", sdp.c_str() );
 
-    const std::string endOfHeaders = "\r\n\r\n";
-    size_t sdpStart = response.find( endOfHeaders );
-    if( sdpStart == std::string::npos )
-        return( -1 );
-
-    if ( mRtspDescribe )
-    {
-        std::string DescHeader = response.substr( 0,sdpStart );
-        Debug( 1, "Processing DESCRIBE response header '%s'", DescHeader.c_str() );
-
-        lines = split( DescHeader, "\r\n" );
-        for ( size_t i = 0; i < lines.size(); i++ )
-    	    {
-                // If the device sends us a url value for Content-Base in the response header, we should use that instead
-                if ( ( lines[i].size() > 13 ) && ( lines[i].substr( 0, 13 ) == "Content-Base:" ) )
-                    {
-                        mUrl = trimSpaces( lines[i].substr( 13 ) );
-                        Info("Received new Content-Base in DESCRIBE response header. Updated device Url to: '%s'", mUrl.c_str() );
-                        break;
-                    }
-            }
-    }
-
-    sdpStart += endOfHeaders.length();
-
-    std::string sdp = response.substr( sdpStart );
-    Debug( 1, "Processing SDP '%s'", sdp.c_str() );
-
-    try
-    {
-        mSessDesc = new SessionDescriptor( mUrl, sdp );
-        mFormatContext = mSessDesc->generateFormatContext();
-    }
-    catch( const Exception &e )
-    {
-        Error( e.getMessage().c_str() );
-        return( -1 );
-    }
+  try
+  {
+    mSessDesc = new SessionDescriptor( mUrl, sdp );
+    mFormatContext = mSessDesc->generateFormatContext();
+  }
+  catch( const Exception &e )
+  {
+    Error( e.getMessage().c_str() );
+    return( -1 );
+  }
 
 #if 0
-    // New method using ffmpeg native functions
-    std::string authUrl = mUrl;
-    if ( !mAuth.empty() )
-        authUrl.insert( authUrl.find( "://" )+3, mAuth+"@" );
+  // New method using ffmpeg native functions
+  std::string authUrl = mUrl;
+  if ( !mAuth.empty() )
+    authUrl.insert( authUrl.find( "://" )+3, mAuth+"@" );
 
-    if ( av_open_input_file( &mFormatContext, authUrl.c_str(), NULL, 0, NULL ) != 0 )
-    {
-        Error( "Unable to open input '%s'", authUrl.c_str() );
-        return( -1 );
-    }
+  if ( av_open_input_file( &mFormatContext, authUrl.c_str(), NULL, 0, NULL ) != 0 )
+  {
+    Error( "Unable to open input '%s'", authUrl.c_str() );
+    return( -1 );
+  }
 #endif
 
-    uint32_t rtpClock = 0;
-    std::string trackUrl = mUrl;
-    std::string controlUrl;
-    
-    _AVCODECID codecId;
-    
-    if ( mFormatContext->nb_streams >= 1 )
+  uint32_t rtpClock = 0;
+  std::string trackUrl = mUrl;
+  std::string controlUrl;
+  
+  _AVCODECID codecId;
+  
+  if ( mFormatContext->nb_streams >= 1 )
+  {
+    for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ )
     {
-        for ( unsigned int i = 0; i < mFormatContext->nb_streams; i++ )
-        {
-            SessionDescriptor::MediaDescriptor *mediaDesc = mSessDesc->getStream( i );
+      SessionDescriptor::MediaDescriptor *mediaDesc = mSessDesc->getStream( i );
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-            if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
+      if ( mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_VIDEO )
 #else
-            if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
+      if ( mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_VIDEO )
 #endif
-            {
-                // Check if control Url is absolute or relative
-                controlUrl = mediaDesc->getControlUrl();
-                if (std::equal(trackUrl.begin(), trackUrl.end(), controlUrl.begin()))
-                {
-                    trackUrl = controlUrl;
-                }
-                else
-                {
-					if ( *trackUrl.rbegin() != '/') {
-						trackUrl += "/" + controlUrl;
-					} else {
-						trackUrl += controlUrl;
-					}
-                }
-                rtpClock = mediaDesc->getClock();
-                codecId = mFormatContext->streams[i]->codec->codec_id;
-                // Hackery pokery
-                //rtpClock = mFormatContext->streams[i]->codec->sample_rate;
-                break;
-            }
+      {
+        // Check if control Url is absolute or relative
+        controlUrl = mediaDesc->getControlUrl();
+        if (std::equal(trackUrl.begin(), trackUrl.end(), controlUrl.begin()))
+        {
+          trackUrl = controlUrl;
         }
+        else
+        {
+          if ( *trackUrl.rbegin() != '/') {
+            trackUrl += "/" + controlUrl;
+          } else {
+            trackUrl += controlUrl;
+          }
+        }
+        rtpClock = mediaDesc->getClock();
+        codecId = mFormatContext->streams[i]->codec->codec_id;
+        // Hackery pokery
+        //rtpClock = mFormatContext->streams[i]->codec->sample_rate;
+        break;
+      }
     }
+  }
 
-    switch( mMethod )
+  switch( mMethod )
+  {
+    case RTP_UNICAST :
     {
-        case RTP_UNICAST :
-        {
-            localPorts[0] = requestPorts();
-            localPorts[1] = localPorts[0]+1;
+      localPorts[0] = requestPorts();
+      localPorts[1] = localPorts[0]+1;
 
-            message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;unicast;client_port="+stringtf( "%d", localPorts[0] )+"-"+stringtf( "%d", localPorts[1] )+"\r\n";
-            break;
-        }
-        case RTP_MULTICAST :
-        {
-            message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;multicast\r\n";
-            break;
-        }
-        case RTP_RTSP :
-        case RTP_RTSP_HTTP :
-        {
-            message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP/TCP;unicast\r\n";
-            break;
-        }
-        default:
-        {
-            Panic( "Got unexpected method %d", mMethod );
-            break;
-        }
+      message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;unicast;client_port="+stringtf( "%d", localPorts[0] )+"-"+stringtf( "%d", localPorts[1] )+"\r\n";
+      break;
     }
-
-    if ( !sendCommand( message ) )
-        return( -1 );
-    if ( !recvResponse( response ) )
-        return( -1 );
-
-    lines = split( response, "\r\n" );
-    std::string session;
-    int timeout = 0;
-    char transport[256] = "";
-
-    for ( size_t i = 0; i < lines.size(); i++ )
+    case RTP_MULTICAST :
     {
-        if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) )
-        {
-            StringVector sessionLine = split( lines[i].substr(9), ";" );
-            session = trimSpaces( sessionLine[0] );
-            if ( sessionLine.size() == 2 )
-                sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
-        }
-        sscanf( lines[i].c_str(), "Transport: %s", transport );
+      message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP;multicast\r\n";
+      break;
     }
-
-    if ( session.empty() )
-        Fatal( "Unable to get session identifier from response '%s'", response.c_str() );
-
-    Debug( 2, "Got RTSP session %s, timeout %d secs", session.c_str(), timeout );
-
-    if ( !transport[0] )
-        Fatal( "Unable to get transport details from response '%s'", response.c_str() );
-
-    Debug( 2, "Got RTSP transport %s", transport );
-
-    std::string method = "";
-    int remotePorts[2] = { 0, 0 };
-    int remoteChannels[2] = { 0, 0 };
-    std::string distribution = "";
-    unsigned long ssrc = 0;
-    StringVector parts = split( transport, ";" );
-    for ( size_t i = 0; i < parts.size(); i++ )
+    case RTP_RTSP :
+    case RTP_RTSP_HTTP :
     {
-        if ( parts[i] == "unicast" || parts[i] == "multicast" )
-            distribution = parts[i];
-        else if ( startsWith( parts[i], "server_port=" ) )
-        {
-            method = "RTP/UNICAST";
-            StringVector subparts = split( parts[i], "=" );
-            StringVector ports = split( subparts[1], "-" );
-            remotePorts[0] = strtol( ports[0].c_str(), NULL, 10 );
-            remotePorts[1] = strtol( ports[1].c_str(), NULL, 10 );
-        }
-        else if ( startsWith( parts[i], "interleaved=" ) )
-        {
-            method = "RTP/RTSP";
-            StringVector subparts = split( parts[i], "=" );
-            StringVector channels = split( subparts[1], "-" );
-            remoteChannels[0] = strtol( channels[0].c_str(), NULL, 10 );
-            remoteChannels[1] = strtol( channels[1].c_str(), NULL, 10 );
-        }
-        else if ( startsWith( parts[i], "port=" ) )
-        {
-            method = "RTP/MULTICAST";
-            StringVector subparts = split( parts[i], "=" );
-            StringVector ports = split( subparts[1], "-" );
-            localPorts[0] = strtol( ports[0].c_str(), NULL, 10 );
-            localPorts[1] = strtol( ports[1].c_str(), NULL, 10 );
-        }
-        else if ( startsWith( parts[i], "destination=" ) )
-        {
-            StringVector subparts = split( parts[i], "=" );
-            localHost = subparts[1];
-        }
-        else if ( startsWith( parts[i], "ssrc=" ) )
-        {
-            StringVector subparts = split( parts[i], "=" );
-            ssrc = strtoll( subparts[1].c_str(), NULL, 16 );
-        }
+      message = "SETUP "+trackUrl+" RTSP/1.0\r\nTransport: RTP/AVP/TCP;unicast\r\n";
+      break;
     }
-
-    Debug( 2, "RTSP Method is %s", method.c_str() );
-    Debug( 2, "RTSP Distribution is %s", distribution.c_str() );
-    Debug( 2, "RTSP SSRC is %lx", ssrc );
-    Debug( 2, "RTSP Local Host is %s", localHost.c_str() );
-    Debug( 2, "RTSP Local Ports are %d/%d", localPorts[0], localPorts[1] );
-    Debug( 2, "RTSP Remote Ports are %d/%d", remotePorts[0], remotePorts[1] );
-    Debug( 2, "RTSP Remote Channels are %d/%d", remoteChannels[0], remoteChannels[1] );
-
-    message = "PLAY "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\nRange: npt=0.000-\r\n";
-    if ( !sendCommand( message ) )
-        return( -1 );
-    if ( !recvResponse( response ) )
-        return( -1 );
-
-    lines = split( response, "\r\n" );
-    std::string rtpInfo;
-    for ( size_t i = 0; i < lines.size(); i++ )
+    default:
     {
-        if ( ( lines[i].size() > 9 ) && ( lines[i].substr( 0, 9 ) == "RTP-Info:" ) )
-            rtpInfo = trimSpaces( lines[i].substr( 9 ) );
-	// Check for a timeout again. Some rtsp devices don't send a timeout until after the PLAY command is sent
-        if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) && ( timeout == 0 ) )
+      Panic( "Got unexpected method %d", mMethod );
+      break;
+    }
+  }
+
+  if ( !sendCommand( message ) )
+    return( -1 );
+  if ( !recvResponse( response ) )
+    return( -1 );
+
+  lines = split( response, "\r\n" );
+  std::string session;
+  int timeout = 0;
+  char transport[256] = "";
+
+  for ( size_t i = 0; i < lines.size(); i++ )
+  {
+    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) )
+    {
+      StringVector sessionLine = split( lines[i].substr(9), ";" );
+      session = trimSpaces( sessionLine[0] );
+      if ( sessionLine.size() == 2 )
+        sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
+    }
+    sscanf( lines[i].c_str(), "Transport: %s", transport );
+  }
+
+  if ( session.empty() )
+    Fatal( "Unable to get session identifier from response '%s'", response.c_str() );
+
+  Debug( 2, "Got RTSP session %s, timeout %d secs", session.c_str(), timeout );
+
+  if ( !transport[0] )
+    Fatal( "Unable to get transport details from response '%s'", response.c_str() );
+
+  Debug( 2, "Got RTSP transport %s", transport );
+
+  std::string method = "";
+  int remotePorts[2] = { 0, 0 };
+  int remoteChannels[2] = { 0, 0 };
+  std::string distribution = "";
+  unsigned long ssrc = 0;
+  StringVector parts = split( transport, ";" );
+  for ( size_t i = 0; i < parts.size(); i++ )
+  {
+    if ( parts[i] == "unicast" || parts[i] == "multicast" )
+      distribution = parts[i];
+    else if ( startsWith( parts[i], "server_port=" ) )
+    {
+      method = "RTP/UNICAST";
+      StringVector subparts = split( parts[i], "=" );
+      StringVector ports = split( subparts[1], "-" );
+      remotePorts[0] = strtol( ports[0].c_str(), NULL, 10 );
+      remotePorts[1] = strtol( ports[1].c_str(), NULL, 10 );
+    }
+    else if ( startsWith( parts[i], "interleaved=" ) )
+    {
+      method = "RTP/RTSP";
+      StringVector subparts = split( parts[i], "=" );
+      StringVector channels = split( subparts[1], "-" );
+      remoteChannels[0] = strtol( channels[0].c_str(), NULL, 10 );
+      remoteChannels[1] = strtol( channels[1].c_str(), NULL, 10 );
+    }
+    else if ( startsWith( parts[i], "port=" ) )
+    {
+      method = "RTP/MULTICAST";
+      StringVector subparts = split( parts[i], "=" );
+      StringVector ports = split( subparts[1], "-" );
+      localPorts[0] = strtol( ports[0].c_str(), NULL, 10 );
+      localPorts[1] = strtol( ports[1].c_str(), NULL, 10 );
+    }
+    else if ( startsWith( parts[i], "destination=" ) )
+    {
+      StringVector subparts = split( parts[i], "=" );
+      localHost = subparts[1];
+    }
+    else if ( startsWith( parts[i], "ssrc=" ) )
+    {
+      StringVector subparts = split( parts[i], "=" );
+      ssrc = strtoll( subparts[1].c_str(), NULL, 16 );
+    }
+  }
+
+  Debug( 2, "RTSP Method is %s", method.c_str() );
+  Debug( 2, "RTSP Distribution is %s", distribution.c_str() );
+  Debug( 2, "RTSP SSRC is %lx", ssrc );
+  Debug( 2, "RTSP Local Host is %s", localHost.c_str() );
+  Debug( 2, "RTSP Local Ports are %d/%d", localPorts[0], localPorts[1] );
+  Debug( 2, "RTSP Remote Ports are %d/%d", remotePorts[0], remotePorts[1] );
+  Debug( 2, "RTSP Remote Channels are %d/%d", remoteChannels[0], remoteChannels[1] );
+
+  message = "PLAY "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\nRange: npt=0.000-\r\n";
+  if ( !sendCommand( message ) )
+    return( -1 );
+  if ( !recvResponse( response ) )
+    return( -1 );
+
+  lines = split( response, "\r\n" );
+  std::string rtpInfo;
+  for ( size_t i = 0; i < lines.size(); i++ )
+  {
+    if ( ( lines[i].size() > 9 ) && ( lines[i].substr( 0, 9 ) == "RTP-Info:" ) )
+      rtpInfo = trimSpaces( lines[i].substr( 9 ) );
+  // Check for a timeout again. Some rtsp devices don't send a timeout until after the PLAY command is sent
+    if ( ( lines[i].size() > 8 ) && ( lines[i].substr( 0, 8 ) == "Session:" ) && ( timeout == 0 ) )
+    {
+      StringVector sessionLine = split( lines[i].substr(9), ";" );
+      if ( sessionLine.size() == 2 )
+        sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
+      if ( timeout > 0 )
+        Debug( 2, "Got timeout %d secs from PLAY command response", timeout );
+    }
+  }
+
+  int seq = 0;
+  unsigned long rtpTime = 0;
+  StringVector streams;
+  if ( rtpInfo.empty() )
+  {
+    Debug( 1, "RTP Info Empty. Starting values for Sequence and Rtptime shall be zero.");
+  }
+  else
+  {
+    Debug( 2, "Got RTP Info %s", rtpInfo.c_str() );
+    // More than one stream can be included in the RTP Info
+    streams = split( rtpInfo.c_str(), "," );
+    for ( size_t i = 0; i < streams.size(); i++ )
+    {
+      // We want the stream that matches the trackUrl we are using
+      if ( streams[i].find(controlUrl.c_str()) != std::string::npos )
+      {
+        // Parse the sequence and rtptime values
+        parts = split( streams[i].c_str(), ";" );
+        for ( size_t j = 0; j < parts.size(); j++ )
         {
-            StringVector sessionLine = split( lines[i].substr(9), ";" );
-            if ( sessionLine.size() == 2 )
-                sscanf( trimSpaces( sessionLine[1] ).c_str(), "timeout=%d", &timeout );
-            if ( timeout > 0 )
-                Debug( 2, "Got timeout %d secs from PLAY command response", timeout );
+          if ( startsWith( parts[j], "seq=" ) )
+          {
+            StringVector subparts = split( parts[j], "=" );
+            seq = strtol( subparts[1].c_str(), NULL, 10 );
+          }
+          else if ( startsWith( parts[j], "rtptime=" ) )
+          {
+            StringVector subparts = split( parts[j], "=" );
+            rtpTime = strtol( subparts[1].c_str(), NULL, 10 );
+          }
         }
+      break;
+      }
     }
+  }
 
-    int seq = 0;
-    unsigned long rtpTime = 0;
-    StringVector streams;
-    if ( rtpInfo.empty() )
+  Debug( 2, "RTSP Seq is %d", seq );
+  Debug( 2, "RTSP Rtptime is %ld", rtpTime );
+
+  time_t lastKeepalive = time(NULL);
+  time_t now;
+  message = "GET_PARAMETER "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+
+  switch( mMethod )
+  {
+    case RTP_UNICAST :
     {
-        Debug( 1, "RTP Info Empty. Starting values for Sequence and Rtptime shall be zero.");
-    }
-    else
-    {
-        Debug( 2, "Got RTP Info %s", rtpInfo.c_str() );
-        // More than one stream can be included in the RTP Info
-        streams = split( rtpInfo.c_str(), "," );
-        for ( size_t i = 0; i < streams.size(); i++ )
-        {
-            // We want the stream that matches the trackUrl we are using
-            if ( streams[i].find(controlUrl.c_str()) != std::string::npos )
-            {
-                // Parse the sequence and rtptime values
-                parts = split( streams[i].c_str(), ";" );
-                for ( size_t j = 0; j < parts.size(); j++ )
-                {
-                    if ( startsWith( parts[j], "seq=" ) )
-                    {
-                        StringVector subparts = split( parts[j], "=" );
-                        seq = strtol( subparts[1].c_str(), NULL, 10 );
-                    }
-                    else if ( startsWith( parts[j], "rtptime=" ) )
-                    {
-                        StringVector subparts = split( parts[j], "=" );
-                        rtpTime = strtol( subparts[1].c_str(), NULL, 10 );
-                    }
-                }
-            break;
-            }
-        }
-    }
+      RtpSource *source = new RtpSource( mId, "", localPorts[0], mHost, remotePorts[0], ssrc, seq, rtpClock, rtpTime, codecId );
+      mSources[ssrc] = source;
+      RtpDataThread rtpDataThread( *this, *source );
+      RtpCtrlThread rtpCtrlThread( *this, *source );
 
-    Debug( 2, "RTSP Seq is %d", seq );
-    Debug( 2, "RTSP Rtptime is %ld", rtpTime );
+      rtpDataThread.start();
+      rtpCtrlThread.start();
 
-    time_t lastKeepalive = time(NULL);
-	time_t now;
-    message = "GET_PARAMETER "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-
-    switch( mMethod )
-    {
-        case RTP_UNICAST :
-        {
-            RtpSource *source = new RtpSource( mId, "", localPorts[0], mHost, remotePorts[0], ssrc, seq, rtpClock, rtpTime, codecId );
-            mSources[ssrc] = source;
-            RtpDataThread rtpDataThread( *this, *source );
-            RtpCtrlThread rtpCtrlThread( *this, *source );
-
-            rtpDataThread.start();
-            rtpCtrlThread.start();
-
-            while( !mStop )
-            {
-				now = time(NULL);
-                // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
+      while( !mStop )
+      {
+        now = time(NULL);
+        // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
 Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
-                if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
-                {
-                    if ( !sendCommand( message ) )
-                        return( -1 );
-                    lastKeepalive = now;
-                }
-                usleep( 100000 );
-            }
+        if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
+        {
+          if ( !sendCommand( message ) )
+            return( -1 );
+          lastKeepalive = now;
+        }
+        usleep( 100000 );
+      }
 #if 0
-            message = "PAUSE "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-            if ( !sendCommand( message ) )
-                return( -1 );
-            if ( !recvResponse( response ) )
-                return( -1 );
+      message = "PAUSE "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+      if ( !sendCommand( message ) )
+        return( -1 );
+      if ( !recvResponse( response ) )
+        return( -1 );
 #endif
 
-            message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-            if ( !sendCommand( message ) )
-                return( -1 );
-            if ( !recvResponse( response ) )
-                return( -1 );
+      message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+      if ( !sendCommand( message ) )
+        return( -1 );
+      if ( !recvResponse( response ) )
+        return( -1 );
 
-            rtpDataThread.stop();
-            rtpCtrlThread.stop();
+      rtpDataThread.stop();
+      rtpCtrlThread.stop();
 
-            //rtpDataThread.kill( SIGTERM );
-            //rtpCtrlThread.kill( SIGTERM );
+      //rtpDataThread.kill( SIGTERM );
+      //rtpCtrlThread.kill( SIGTERM );
 
-            rtpDataThread.join();
-            rtpCtrlThread.join();
-         
-            delete mSources[ssrc];
-            mSources.clear();
+      rtpDataThread.join();
+      rtpCtrlThread.join();
+     
+      delete mSources[ssrc];
+      mSources.clear();
 
-            releasePorts( localPorts[0] );
+      releasePorts( localPorts[0] );
 
-            break;
-        }
-        case RTP_RTSP :
-        case RTP_RTSP_HTTP :
-        {
-            RtpSource *source = new RtpSource( mId, "", remoteChannels[0], mHost, remoteChannels[0], ssrc, seq, rtpClock, rtpTime, codecId );
-            mSources[ssrc] = source;
-            // These never actually run
-            RtpDataThread rtpDataThread( *this, *source );
-            RtpCtrlThread rtpCtrlThread( *this, *source );
-
-            Select select( double(config.http_timeout)/1000.0 );
-            select.addReader( &mRtspSocket );
-
-            Buffer buffer( ZM_NETWORK_BUFSIZ );
-            std::string keepaliveMessage = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
-            std::string keepaliveResponse = "RTSP/1.0 200 OK\r\n";
-            while ( !mStop && select.wait() >= 0 )
-            {
-                Select::CommsList readable = select.getReadable();
-                if ( readable.size() == 0 )
-                {
-                    Error( "RTSP timed out" );
-                    break;
-                }
-
-                static char tempBuffer[ZM_NETWORK_BUFSIZ];
-                ssize_t nBytes = mRtspSocket.recv( tempBuffer, sizeof(tempBuffer) );
-                buffer.append( tempBuffer, nBytes );
-                Debug( 4, "Read %zd bytes on sd %d, %d total", nBytes, mRtspSocket.getReadDesc(), buffer.size() );
-
-                while( buffer.size() > 0 )
-                {
-                    if ( buffer[0] == '$' )
-                    {
-                	if ( buffer.size() < 4 )
-                	    break;
-                        unsigned char channel = buffer[1];
-                        unsigned short len = ntohs( *((unsigned short *)(buffer+2)) );
-
-                        Debug( 4, "Got %d bytes left, expecting %d byte packet on channel %d", buffer.size(), len, channel );
-                        if ( (unsigned short)buffer.size() < (len+4) )
-                        {
-                            Debug( 4, "Missing %d bytes, rereading", (len+4)-buffer.size() );
-                            break;
-                        }
-                        if ( channel == remoteChannels[0] )
-                        {
-                            Debug( 4, "Got %d bytes on data channel %d, packet length is %d", buffer.size(), channel, len );
-                            Hexdump( 4, (char *)buffer, 16 );
-                            rtpDataThread.recvPacket( buffer+4, len );
-                            Debug( 4, "Received" );
-                        }
-                        else if ( channel == remoteChannels[1] )
-                        {
-//                            len = ntohs( *((unsigned short *)(buffer+2)) );
-//                            Debug( 4, "Got %d bytes on control channel %d", nBytes, channel );
-                            Debug( 4, "Got %d bytes on control channel %d, packet length is %d", buffer.size(), channel, len );
-                            Hexdump( 4, (char *)buffer, 16 );
-                            rtpCtrlThread.recvPackets( buffer+4, len );
-                        }
-                        else
-                        {
-                            Error( "Unexpected channel selector %d in RTSP interleaved data", buffer[1] );
-                            buffer.clear();
-                            break;
-                        }
-                        buffer.consume( len+4 );
-                        nBytes -= len+4;
-                    }
-                    else
-                    {
-                        if ( keepaliveResponse.compare( 0, keepaliveResponse.size(), (char *)buffer, keepaliveResponse.size() ) == 0 )
-                        {
-                            Debug( 4, "Got keepalive response '%s'", (char *)buffer );
-                            //buffer.consume( keepaliveResponse.size() );
-                            if ( char *charPtr = (char *)memchr( (char *)buffer, '$', buffer.size() ) )
-                            {
-                                int discardBytes = charPtr-(char *)buffer;
-                                buffer -= discardBytes;
-                            }
-                            else
-                            {
-                                buffer.clear();
-                            }
-                        }
-                        else
-                        {
-                            if ( char *charPtr = (char *)memchr( (char *)buffer, '$', buffer.size() ) )
-                            {
-                                int discardBytes = charPtr-(char *)buffer;
-                                Warning( "Unexpected format RTSP interleaved data, resyncing by %d bytes", discardBytes );
-                                Hexdump( -1, (char *)buffer, discardBytes );
-                                buffer -= discardBytes;
-                            }
-                            else
-                            {
-                                Warning( "Unexpected format RTSP interleaved data, dumping %d bytes", buffer.size() );
-                                Hexdump( -1, (char *)buffer, 32 );
-                                buffer.clear();
-                            }
-                        }
-                    }
-                }
-                // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-                // FIXME: Is this really necessary when using tcp ?
-				now = time(NULL);
-                // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
-                if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
-                {
-                    if ( !sendCommand( message ) )
-                        return( -1 );
-                    lastKeepalive = now;
-                }
-                buffer.tidy( 1 );
-            }
-#if 0
-            message = "PAUSE "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-            if ( !sendCommand( message ) )
-                return( -1 );
-            if ( !recvResponse( response ) )
-                return( -1 );
-#endif
-            // Send a teardown message but don't expect a response as this may not be implemented on the server when using TCP
-            message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-            if ( !sendCommand( message ) )
-                return( -1 );
-
-            delete mSources[ssrc];
-            mSources.clear();
-
-            break;
-        }
-        case RTP_MULTICAST :
-        {
-            RtpSource *source = new RtpSource( mId, localHost, localPorts[0], mHost, remotePorts[0], ssrc, seq, rtpClock, rtpTime, codecId );
-            mSources[ssrc] = source;
-            RtpDataThread rtpDataThread( *this, *source );
-            RtpCtrlThread rtpCtrlThread( *this, *source );
-
-            rtpDataThread.start();
-            rtpCtrlThread.start();
-
-            while( !mStop )
-            {
-                // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
-                if ( sendKeepalive && (timeout > 0) && ((time(NULL)-lastKeepalive) > (timeout-5)) )
-                {
-                    if ( !sendCommand( message ) )
-                        return( -1 );
-                    lastKeepalive = time(NULL);
-                }
-                usleep( 100000 );
-            }
-#if 0
-            message = "PAUSE "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-            if ( !sendCommand( message ) )
-                return( -1 );
-            if ( !recvResponse( response ) )
-                return( -1 );
-#endif
-            message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
-            if ( !sendCommand( message ) )
-                return( -1 );
-            if ( !recvResponse( response ) )
-                return( -1 );
-
-            rtpDataThread.stop();
-            rtpCtrlThread.stop();
-
-            rtpDataThread.join();
-            rtpCtrlThread.join();
-         
-            delete mSources[ssrc];
-            mSources.clear();
-
-            releasePorts( localPorts[0] );
-            break;
-        }
-        default:
-        {
-            Panic( "Got unexpected method %d", mMethod );
-            break;
-        }
+      break;
     }
+    case RTP_RTSP :
+    case RTP_RTSP_HTTP :
+    {
+      RtpSource *source = new RtpSource( mId, "", remoteChannels[0], mHost, remoteChannels[0], ssrc, seq, rtpClock, rtpTime, codecId );
+      mSources[ssrc] = source;
+      // These never actually run
+      RtpDataThread rtpDataThread( *this, *source );
+      RtpCtrlThread rtpCtrlThread( *this, *source );
 
-    return( 0 );
+      Select select( double(config.http_timeout)/1000.0 );
+      select.addReader( &mRtspSocket );
+
+      Buffer buffer( ZM_NETWORK_BUFSIZ );
+      std::string keepaliveMessage = "OPTIONS "+mUrl+" RTSP/1.0\r\n";
+      std::string keepaliveResponse = "RTSP/1.0 200 OK\r\n";
+      while ( !mStop && select.wait() >= 0 )
+      {
+        Select::CommsList readable = select.getReadable();
+        if ( readable.size() == 0 )
+        {
+          Error( "RTSP timed out" );
+          break;
+        }
+
+        static char tempBuffer[ZM_NETWORK_BUFSIZ];
+        ssize_t nBytes = mRtspSocket.recv( tempBuffer, sizeof(tempBuffer) );
+        buffer.append( tempBuffer, nBytes );
+        Debug( 4, "Read %zd bytes on sd %d, %d total", nBytes, mRtspSocket.getReadDesc(), buffer.size() );
+
+        while( buffer.size() > 0 )
+        {
+          if ( buffer[0] == '$' )
+          {
+          if ( buffer.size() < 4 )
+            break;
+            unsigned char channel = buffer[1];
+            unsigned short len = ntohs( *((unsigned short *)(buffer+2)) );
+
+            Debug( 4, "Got %d bytes left, expecting %d byte packet on channel %d", buffer.size(), len, channel );
+            if ( (unsigned short)buffer.size() < (len+4) )
+            {
+              Debug( 4, "Missing %d bytes, rereading", (len+4)-buffer.size() );
+              break;
+            }
+            if ( channel == remoteChannels[0] )
+            {
+              Debug( 4, "Got %d bytes on data channel %d, packet length is %d", buffer.size(), channel, len );
+              Hexdump( 4, (char *)buffer, 16 );
+              rtpDataThread.recvPacket( buffer+4, len );
+              Debug( 4, "Received" );
+            }
+            else if ( channel == remoteChannels[1] )
+            {
+//              len = ntohs( *((unsigned short *)(buffer+2)) );
+//              Debug( 4, "Got %d bytes on control channel %d", nBytes, channel );
+              Debug( 4, "Got %d bytes on control channel %d, packet length is %d", buffer.size(), channel, len );
+              Hexdump( 4, (char *)buffer, 16 );
+              rtpCtrlThread.recvPackets( buffer+4, len );
+            }
+            else
+            {
+              Error( "Unexpected channel selector %d in RTSP interleaved data", buffer[1] );
+              buffer.clear();
+              break;
+            }
+            buffer.consume( len+4 );
+            nBytes -= len+4;
+          }
+          else
+          {
+            if ( keepaliveResponse.compare( 0, keepaliveResponse.size(), (char *)buffer, keepaliveResponse.size() ) == 0 )
+            {
+              Debug( 4, "Got keepalive response '%s'", (char *)buffer );
+              //buffer.consume( keepaliveResponse.size() );
+              if ( char *charPtr = (char *)memchr( (char *)buffer, '$', buffer.size() ) )
+              {
+                int discardBytes = charPtr-(char *)buffer;
+                buffer -= discardBytes;
+              }
+              else
+              {
+                buffer.clear();
+              }
+            }
+            else
+            {
+              if ( char *charPtr = (char *)memchr( (char *)buffer, '$', buffer.size() ) )
+              {
+                int discardBytes = charPtr-(char *)buffer;
+                Warning( "Unexpected format RTSP interleaved data, resyncing by %d bytes", discardBytes );
+                Hexdump( -1, (char *)buffer, discardBytes );
+                buffer -= discardBytes;
+              }
+              else
+              {
+                Warning( "Unexpected format RTSP interleaved data, dumping %d bytes", buffer.size() );
+                Hexdump( -1, (char *)buffer, 32 );
+                buffer.clear();
+              }
+            }
+          }
+        }
+        // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
+        // FIXME: Is this really necessary when using tcp ?
+        now = time(NULL);
+        // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
+Debug(5, "sendkeepalive %d, timeout %d, now: %d last: %d since: %d", sendKeepalive, timeout, now, lastKeepalive, (now-lastKeepalive) );
+        if ( sendKeepalive && (timeout > 0) && ((now-lastKeepalive) > (timeout-5)) )
+        {
+          if ( !sendCommand( message ) )
+            return( -1 );
+          lastKeepalive = now;
+        }
+        buffer.tidy( 1 );
+      }
+#if 0
+      message = "PAUSE "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+      if ( !sendCommand( message ) )
+        return( -1 );
+      if ( !recvResponse( response ) )
+        return( -1 );
+#endif
+      // Send a teardown message but don't expect a response as this may not be implemented on the server when using TCP
+      message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+      if ( !sendCommand( message ) )
+        return( -1 );
+
+      delete mSources[ssrc];
+      mSources.clear();
+
+      break;
+    }
+    case RTP_MULTICAST :
+    {
+      RtpSource *source = new RtpSource( mId, localHost, localPorts[0], mHost, remotePorts[0], ssrc, seq, rtpClock, rtpTime, codecId );
+      mSources[ssrc] = source;
+      RtpDataThread rtpDataThread( *this, *source );
+      RtpCtrlThread rtpCtrlThread( *this, *source );
+
+      rtpDataThread.start();
+      rtpCtrlThread.start();
+
+      while( !mStop )
+      {
+        // Send a keepalive message if the server supports this feature and we are close to the timeout expiration
+        if ( sendKeepalive && (timeout > 0) && ((time(NULL)-lastKeepalive) > (timeout-5)) )
+        {
+          if ( !sendCommand( message ) )
+            return( -1 );
+          lastKeepalive = time(NULL);
+        }
+        usleep( 100000 );
+      }
+#if 0
+      message = "PAUSE "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+      if ( !sendCommand( message ) )
+        return( -1 );
+      if ( !recvResponse( response ) )
+        return( -1 );
+#endif
+      message = "TEARDOWN "+mUrl+" RTSP/1.0\r\nSession: "+session+"\r\n";
+      if ( !sendCommand( message ) )
+        return( -1 );
+      if ( !recvResponse( response ) )
+        return( -1 );
+
+      rtpDataThread.stop();
+      rtpCtrlThread.stop();
+
+      rtpDataThread.join();
+      rtpCtrlThread.join();
+     
+      delete mSources[ssrc];
+      mSources.clear();
+
+      releasePorts( localPorts[0] );
+      break;
+    }
+    default:
+    {
+      Panic( "Got unexpected method %d", mMethod );
+      break;
+    }
+  }
+
+  return( 0 );
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_rtsp.h b/src/zm_rtsp.h
index 192200d0b..bdd14da42 100644
--- a/src/zm_rtsp.h
+++ b/src/zm_rtsp.h
@@ -34,110 +34,110 @@
 class RtspThread : public Thread
 {
 public:
-    typedef enum { RTP_UNICAST, RTP_MULTICAST, RTP_RTSP, RTP_RTSP_HTTP } RtspMethod;
-    typedef enum { UNDEFINED, UNICAST, MULTICAST } RtspDist;
+  typedef enum { RTP_UNICAST, RTP_MULTICAST, RTP_RTSP, RTP_RTSP_HTTP } RtspMethod;
+  typedef enum { UNDEFINED, UNICAST, MULTICAST } RtspDist;
 
 private:
-    typedef std::set<int>    PortSet;
-    typedef std::set<uint32_t>    SsrcSet;
-    typedef std::map<uint32_t,RtpSource *>    SourceMap;
+  typedef std::set<int>  PortSet;
+  typedef std::set<uint32_t>  SsrcSet;
+  typedef std::map<uint32_t,RtpSource *>  SourceMap;
 
 private:
-    static int  smMinDataPort;
-    static int  smMaxDataPort;
-    static PortSet  smLocalSsrcs;
-    static PortSet  smAssignedPorts;
+  static int  smMinDataPort;
+  static int  smMaxDataPort;
+  static PortSet  smLocalSsrcs;
+  static PortSet  smAssignedPorts;
 
 private:
-    int mId;
+  int mId;
 
-    RtspMethod mMethod;
-    std::string mProtocol;
-    std::string mHost;
-    std::string mPort;
-    std::string mPath;
-    bool mRtspDescribe;
-    std::string mUrl;
-    
-    // Reworked authentication system
-    // First try without authentication, even if we have a username and password
-    // on receiving a 401 response, select authentication method (basic or digest)
-    // fill required fields and set needAuth
-    // subsequent requests can set the required authentication header.
-    bool mNeedAuth;
-    int respCode;
-    zm::Authenticator* mAuthenticator;
+  RtspMethod mMethod;
+  std::string mProtocol;
+  std::string mHost;
+  std::string mPort;
+  std::string mPath;
+  bool mRtspDescribe;
+  std::string mUrl;
+  
+  // Reworked authentication system
+  // First try without authentication, even if we have a username and password
+  // on receiving a 401 response, select authentication method (basic or digest)
+  // fill required fields and set needAuth
+  // subsequent requests can set the required authentication header.
+  bool mNeedAuth;
+  int respCode;
+  zm::Authenticator* mAuthenticator;
 
 
-    std::string mHttpSession;           ///< Only for RTSP over HTTP sessions
+  std::string mHttpSession;       ///< Only for RTSP over HTTP sessions
 
-    TcpInetClient mRtspSocket;
-    TcpInetClient mRtspSocket2;
+  TcpInetClient mRtspSocket;
+  TcpInetClient mRtspSocket2;
 
-    SourceMap mSources;
+  SourceMap mSources;
 
-    SessionDescriptor *mSessDesc;
-    AVFormatContext *mFormatContext;
+  SessionDescriptor *mSessDesc;
+  AVFormatContext *mFormatContext;
 
-    uint16_t mSeq;
-    uint32_t mSession;
-    uint32_t mSsrc;
+  uint16_t mSeq;
+  uint32_t mSession;
+  uint32_t mSsrc;
 
-    int mRemotePorts[2];
-    int mRemoteChannels[2];
-    RtspDist mDist;
+  int mRemotePorts[2];
+  int mRemoteChannels[2];
+  RtspDist mDist;
 
-    unsigned long mRtpTime; 
+  unsigned long mRtpTime; 
 
-    bool mStop;
+  bool mStop;
 
 private:
-    bool sendCommand( std::string message );
-    bool recvResponse( std::string &response );
-    void checkAuthResponse(std::string &response);    
+  bool sendCommand( std::string message );
+  bool recvResponse( std::string &response );
+  void checkAuthResponse(std::string &response);  
 
 public:
-    RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth, bool rtsp_describe );
-    ~RtspThread();
+  RtspThread( int id, RtspMethod method, const std::string &protocol, const std::string &host, const std::string &port, const std::string &path, const std::string &auth, bool rtsp_describe );
+  ~RtspThread();
 
 public:
-    int requestPorts();
-    void releasePorts( int port );
+  int requestPorts();
+  void releasePorts( int port );
 
-    bool isValidSsrc( uint32_t ssrc );
-    bool updateSsrc( uint32_t ssrc, const RtpDataHeader *header );
+  bool isValidSsrc( uint32_t ssrc );
+  bool updateSsrc( uint32_t ssrc, const RtpDataHeader *header );
 
-    uint32_t getSsrc() const
-    {
-        return( mSsrc );
-    }
+  uint32_t getSsrc() const
+  {
+    return( mSsrc );
+  }
 
-    bool hasSources() const
-    {
-        return( !mSources.empty() );
-    }
+  bool hasSources() const
+  {
+    return( !mSources.empty() );
+  }
 
-    AVFormatContext *getFormatContext()
-    {
-        return( mFormatContext );
-    }
-    
-    bool getFrame( Buffer &frame )
-    {
-        SourceMap::iterator iter = mSources.begin();
-        if ( iter == mSources.end() )
-            return( false );
-        return( iter->second->getFrame( frame ) );
-    }
-    int run();
-    void stop()
-    {
-        mStop = true;
-    }
-    bool stopped() const
-    {
-        return( mStop );
-    }
+  AVFormatContext *getFormatContext()
+  {
+    return( mFormatContext );
+  }
+  
+  bool getFrame( Buffer &frame )
+  {
+    SourceMap::iterator iter = mSources.begin();
+    if ( iter == mSources.end() )
+      return( false );
+    return( iter->second->getFrame( frame ) );
+  }
+  int run();
+  void stop()
+  {
+    mStop = true;
+  }
+  bool stopped() const
+  {
+    return( mStop );
+  }
 };
 
 #endif // ZM_RTSP_H
diff --git a/src/zm_rtsp_auth.cpp b/src/zm_rtsp_auth.cpp
index 10ecf3475..4f816b64a 100644
--- a/src/zm_rtsp_auth.cpp
+++ b/src/zm_rtsp_auth.cpp
@@ -28,206 +28,206 @@ namespace zm {
 
 Authenticator::Authenticator(std::string &username, std::string password) {
 #ifdef HAVE_GCRYPT_H
-    // Special initialisation for libgcrypt
-    if ( !gcry_check_version( GCRYPT_VERSION ) )
-    {
-        Fatal( "Unable to initialise libgcrypt" );
-    }
-    gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
-    gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
+  // Special initialisation for libgcrypt
+  if ( !gcry_check_version( GCRYPT_VERSION ) )
+  {
+    Fatal( "Unable to initialise libgcrypt" );
+  }
+  gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
+  gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
 #endif // HAVE_GCRYPT_H
-    
-    fAuthMethod = AUTH_UNDEFINED;
-    fUsername = username;
-    fPassword = password;
-	nc = 1;
-	fCnonce = "0a4f113b";
+  
+  fAuthMethod = AUTH_UNDEFINED;
+  fUsername = username;
+  fPassword = password;
+  nc = 1;
+  fCnonce = "0a4f113b";
 }
 
 Authenticator::~Authenticator() {
-	reset();
+  reset();
 }
 
 void Authenticator::reset() {
-	fRealm.clear(); 
-	fNonce.clear();
-	fUsername.clear(); 
-	fPassword.clear();
-	fAuthMethod = AUTH_UNDEFINED;
+  fRealm.clear(); 
+  fNonce.clear();
+  fUsername.clear(); 
+  fPassword.clear();
+  fAuthMethod = AUTH_UNDEFINED;
 }
 
 void Authenticator::authHandleHeader(std::string headerData) 
 {
-    const char* basic_match = "Basic ";
-    const char* digest_match = "Digest ";
-    size_t digest_match_len = strlen(digest_match);
-    
-    // Check if basic auth
-    if (strncasecmp(headerData.c_str(),basic_match,strlen(basic_match)) == 0)
+  const char* basic_match = "Basic ";
+  const char* digest_match = "Digest ";
+  size_t digest_match_len = strlen(digest_match);
+  
+  // Check if basic auth
+  if (strncasecmp(headerData.c_str(),basic_match,strlen(basic_match)) == 0)
+  {
+    fAuthMethod = AUTH_BASIC;
+    Debug( 2, "Set authMethod to Basic");
+  } 
+  // Check if digest auth
+  else if (strncasecmp( headerData.c_str(),digest_match,digest_match_len ) == 0)
+  {
+    fAuthMethod = AUTH_DIGEST;
+    Debug( 2, "Set authMethod to Digest");
+    StringVector subparts = split(headerData.substr(digest_match_len, headerData.length() - digest_match_len), ",");
+    // subparts are key="value"
+    for ( size_t i = 0; i < subparts.size(); i++ )
     {
-        fAuthMethod = AUTH_BASIC;
-        Debug( 2, "Set authMethod to Basic");
-    } 
-    // Check if digest auth
-    else if (strncasecmp( headerData.c_str(),digest_match,digest_match_len ) == 0)
-    {
-        fAuthMethod = AUTH_DIGEST;
-        Debug( 2, "Set authMethod to Digest");
-        StringVector subparts = split(headerData.substr(digest_match_len, headerData.length() - digest_match_len), ",");
-        // subparts are key="value"
-        for ( size_t i = 0; i < subparts.size(); i++ )
-        {
-            StringVector kvPair = split( trimSpaces( subparts[i] ), "=" );
-            std::string key = trimSpaces( kvPair[0] );
-            if (key == "realm") {
-                fRealm = trimSet( kvPair[1], "\"");
-                continue;
-            }
-            if (key == "nonce") {
-                fNonce = trimSet( kvPair[1], "\"");
-                continue;
-            }
-            if (key == "qop") {
-                fQop = trimSet( kvPair[1], "\"");
-                continue;
-            }
-        }
-        Debug( 2, "Auth data completed. User: %s, realm: %s, nonce: %s, qop: %s", username().c_str(), fRealm.c_str(), fNonce.c_str(), fQop.c_str() );
+      StringVector kvPair = split( trimSpaces( subparts[i] ), "=" );
+      std::string key = trimSpaces( kvPair[0] );
+      if (key == "realm") {
+        fRealm = trimSet( kvPair[1], "\"");
+        continue;
+      }
+      if (key == "nonce") {
+        fNonce = trimSet( kvPair[1], "\"");
+        continue;
+      }
+      if (key == "qop") {
+        fQop = trimSet( kvPair[1], "\"");
+        continue;
+      }
     }
+    Debug( 2, "Auth data completed. User: %s, realm: %s, nonce: %s, qop: %s", username().c_str(), fRealm.c_str(), fNonce.c_str(), fQop.c_str() );
+  }
 }
 
 std::string Authenticator::quote(std::string src)
 {
-    return replaceAll(replaceAll(src, "\\", "\\\\"), "\"", "\\\"");
+  return replaceAll(replaceAll(src, "\\", "\\\\"), "\"", "\\\"");
 }
 
 std::string Authenticator::getAuthHeader(std::string method, std::string uri) 
 {
-    std::string result = "Authorization: ";
-    if (fAuthMethod == AUTH_BASIC) 
-    {
-        result += "Basic " + base64Encode( username() + ":" + password() );
+  std::string result = "Authorization: ";
+  if (fAuthMethod == AUTH_BASIC) 
+  {
+    result += "Basic " + base64Encode( username() + ":" + password() );
+  }
+  else if (fAuthMethod == AUTH_DIGEST)
+  {
+    result += std::string("Digest ") + 
+          "username=\"" + quote(username()) + "\", realm=\"" + quote(realm()) + "\", " +
+          "nonce=\"" + quote(nonce()) + "\", uri=\"" + quote(uri) + "\"";
+    if ( ! fQop.empty() ) {
+      result += ", qop=" + fQop;
+      result += ", nc=" + stringtf("%08x",nc);
+      result += ", cnonce=\"" + fCnonce + "\"";
     }
-    else if (fAuthMethod == AUTH_DIGEST)
-    {
-        result += std::string("Digest ") + 
-        		  "username=\"" + quote(username()) + "\", realm=\"" + quote(realm()) + "\", " +
-                  "nonce=\"" + quote(nonce()) + "\", uri=\"" + quote(uri) + "\"";
-		if ( ! fQop.empty() ) {
-			result += ", qop=" + fQop;
-			result += ", nc=" + stringtf("%08x",nc);
-			result += ", cnonce=\"" + fCnonce + "\"";
-		}
-		result += ", response=\"" + computeDigestResponse(method, uri) + "\"";
-		result += ", algorithm=\"MD5\"";
-                  
-        //Authorization: Digest username="zm",
-        //                      realm="NC-336PW-HD-1080P",
-        //                      nonce="de8859d97609a6fcc16eaba490dcfd80",
-        //                      uri="rtsp://10.192.16.8:554/live/0/h264.sdp",
-        //                      response="4092120557d3099a163bd51a0d59744d",
-        //                      algorithm=MD5,
-        //                      opaque="5ccc069c403ebaf9f0171e9517f40e41",
-        //                      qop="auth",
-        //                      cnonce="c8051140765877dc",
-        //                      nc=00000001
-        
-    }
-    result += "\r\n";
-    return result;
+    result += ", response=\"" + computeDigestResponse(method, uri) + "\"";
+    result += ", algorithm=\"MD5\"";
+          
+    //Authorization: Digest username="zm",
+    //            realm="NC-336PW-HD-1080P",
+    //            nonce="de8859d97609a6fcc16eaba490dcfd80",
+    //            uri="rtsp://10.192.16.8:554/live/0/h264.sdp",
+    //            response="4092120557d3099a163bd51a0d59744d",
+    //            algorithm=MD5,
+    //            opaque="5ccc069c403ebaf9f0171e9517f40e41",
+    //            qop="auth",
+    //            cnonce="c8051140765877dc",
+    //            nc=00000001
+    
+  }
+  result += "\r\n";
+  return result;
 }
 
 std::string Authenticator::computeDigestResponse(std::string &method, std::string &uri) {
 #if HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
-    // The "response" field is computed as:
-    //    md5(md5(<username>:<realm>:<password>):<nonce>:md5(<cmd>:<url>))
-    size_t md5len = 16;
-    unsigned char md5buf[md5len];
-    char md5HexBuf[md5len*2+1];
-    
-    // Step 1: md5(<username>:<realm>:<password>)
-    std::string ha1Data = username() + ":" + realm() + ":" + password();
-	Debug( 2, "HA1 pre-md5: %s", ha1Data.c_str() );
+  // The "response" field is computed as:
+  //  md5(md5(<username>:<realm>:<password>):<nonce>:md5(<cmd>:<url>))
+  size_t md5len = 16;
+  unsigned char md5buf[md5len];
+  char md5HexBuf[md5len*2+1];
+  
+  // Step 1: md5(<username>:<realm>:<password>)
+  std::string ha1Data = username() + ":" + realm() + ":" + password();
+  Debug( 2, "HA1 pre-md5: %s", ha1Data.c_str() );
 #if HAVE_DECL_MD5
-    MD5((unsigned char*)ha1Data.c_str(), ha1Data.length(), md5buf);
+  MD5((unsigned char*)ha1Data.c_str(), ha1Data.length(), md5buf);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-    gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), ha1Data.length() };
-    gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha1, md5buf, &md5len );
+  gnutls_datum_t md5dataha1 = { (unsigned char*)ha1Data.c_str(), ha1Data.length() };
+  gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha1, md5buf, &md5len );
 #endif
-    for ( unsigned int j = 0; j < md5len; j++ )
-    {
-        sprintf(&md5HexBuf[2*j], "%02x", md5buf[j] );
-    }
-    md5HexBuf[md5len*2]='\0';
-    std::string ha1Hash = md5HexBuf;
-    
-    // Step 2: md5(<cmd>:<url>)
-    std::string ha2Data = method + ":" + uri;
-	Debug( 2, "HA2 pre-md5: %s", ha2Data.c_str() );
+  for ( unsigned int j = 0; j < md5len; j++ )
+  {
+    sprintf(&md5HexBuf[2*j], "%02x", md5buf[j] );
+  }
+  md5HexBuf[md5len*2]='\0';
+  std::string ha1Hash = md5HexBuf;
+  
+  // Step 2: md5(<cmd>:<url>)
+  std::string ha2Data = method + ":" + uri;
+  Debug( 2, "HA2 pre-md5: %s", ha2Data.c_str() );
 #if HAVE_DECL_MD5
-    MD5((unsigned char*)ha2Data.c_str(), ha2Data.length(), md5buf );
+  MD5((unsigned char*)ha2Data.c_str(), ha2Data.length(), md5buf );
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-    gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), ha2Data.length() };
-    gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha2, md5buf, &md5len );
+  gnutls_datum_t md5dataha2 = { (unsigned char*)ha2Data.c_str(), ha2Data.length() };
+  gnutls_fingerprint( GNUTLS_DIG_MD5, &md5dataha2, md5buf, &md5len );
 #endif
-    for ( unsigned int j = 0; j < md5len; j++ )
-    {
-        sprintf( &md5HexBuf[2*j], "%02x", md5buf[j] );
-    }
-    md5HexBuf[md5len*2]='\0';
-    std::string ha2Hash = md5HexBuf;
+  for ( unsigned int j = 0; j < md5len; j++ )
+  {
+    sprintf( &md5HexBuf[2*j], "%02x", md5buf[j] );
+  }
+  md5HexBuf[md5len*2]='\0';
+  std::string ha2Hash = md5HexBuf;
 
-    // Step 3: md5(ha1:<nonce>:ha2)
-    std::string digestData = ha1Hash + ":" + nonce();
-	if ( ! fQop.empty() ) {
-		digestData += ":" + stringtf("%08x", nc) + ":"+fCnonce + ":" + fQop;
-		nc ++;
-		// if qop was specified, then we have to include t and a cnonce and an nccount
-	}
-	digestData += ":" + ha2Hash;
-	Debug( 2, "pre-md5: %s", digestData.c_str() );
+  // Step 3: md5(ha1:<nonce>:ha2)
+  std::string digestData = ha1Hash + ":" + nonce();
+  if ( ! fQop.empty() ) {
+    digestData += ":" + stringtf("%08x", nc) + ":"+fCnonce + ":" + fQop;
+    nc ++;
+    // if qop was specified, then we have to include t and a cnonce and an nccount
+  }
+  digestData += ":" + ha2Hash;
+  Debug( 2, "pre-md5: %s", digestData.c_str() );
 #if HAVE_DECL_MD5
-    MD5((unsigned char*)digestData.c_str(), digestData.length(), md5buf);
+  MD5((unsigned char*)digestData.c_str(), digestData.length(), md5buf);
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-    gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), digestData.length() };
-    gnutls_fingerprint( GNUTLS_DIG_MD5, &md5datadigest, md5buf, &md5len );
+  gnutls_datum_t md5datadigest = { (unsigned char*)digestData.c_str(), digestData.length() };
+  gnutls_fingerprint( GNUTLS_DIG_MD5, &md5datadigest, md5buf, &md5len );
 #endif
-    for ( unsigned int j = 0; j < md5len; j++ )
-    {
-        sprintf( &md5HexBuf[2*j], "%02x", md5buf[j] );
-    }
-    md5HexBuf[md5len*2]='\0';
+  for ( unsigned int j = 0; j < md5len; j++ )
+  {
+    sprintf( &md5HexBuf[2*j], "%02x", md5buf[j] );
+  }
+  md5HexBuf[md5len*2]='\0';
    
-    return md5HexBuf;
+  return md5HexBuf;
 #else // HAVE_DECL_MD5
-	Error( "You need to build with gnutls or openssl installed to use digest authentication" );
+  Error( "You need to build with gnutls or openssl installed to use digest authentication" );
+  return( 0 );
 #endif // HAVE_DECL_MD5
-    return( 0 );
 }
 
 void Authenticator::checkAuthResponse(std::string &response) {
-	std::string authLine;
-	StringVector lines = split( response, "\r\n" );
-	const char* authenticate_match = "WWW-Authenticate:";
-	size_t authenticate_match_len = strlen(authenticate_match);
+  std::string authLine;
+  StringVector lines = split( response, "\r\n" );
+  const char* authenticate_match = "WWW-Authenticate:";
+  size_t authenticate_match_len = strlen(authenticate_match);
 
-	for ( size_t i = 0; i < lines.size(); i++ ) {
-		// stop at end of headers
-		if (lines[i].length()==0)
-			break;
+  for ( size_t i = 0; i < lines.size(); i++ ) {
+    // stop at end of headers
+    if (lines[i].length()==0)
+      break;
 
-		if (strncasecmp(lines[i].c_str(),authenticate_match,authenticate_match_len) == 0) {
-			authLine = lines[i];
-			Debug( 2, "Found auth line at %d", i);
-			break;
-		}
-	}
-	if (!authLine.empty()) {
-		Debug( 2, "Analyze auth line %s", authLine.c_str());
-		authHandleHeader( trimSpaces(authLine.substr(authenticate_match_len,authLine.length()-authenticate_match_len)) );
-	} else {
-		Debug( 2, "Didn't find auth line in %s", authLine.c_str());
-	}
+    if (strncasecmp(lines[i].c_str(),authenticate_match,authenticate_match_len) == 0) {
+      authLine = lines[i];
+      Debug( 2, "Found auth line at %d", i);
+      break;
+    }
+  }
+  if (!authLine.empty()) {
+    Debug( 2, "Analyze auth line %s", authLine.c_str());
+    authHandleHeader( trimSpaces(authLine.substr(authenticate_match_len,authLine.length()-authenticate_match_len)) );
+  } else {
+    Debug( 2, "Didn't find auth line in %s", authLine.c_str());
+  }
 }
 
 } // namespace zm
diff --git a/src/zm_rtsp_auth.h b/src/zm_rtsp_auth.h
index 079dec639..9249a15e2 100644
--- a/src/zm_rtsp_auth.h
+++ b/src/zm_rtsp_auth.h
@@ -37,20 +37,20 @@ namespace zm {
 enum AuthMethod { AUTH_UNDEFINED = 0, AUTH_BASIC = 1, AUTH_DIGEST = 2 };
 class Authenticator {
 public:
-    Authenticator(std::string &username, std::string password);
-    virtual ~Authenticator();
-    void reset();
+  Authenticator(std::string &username, std::string password);
+  virtual ~Authenticator();
+  void reset();
 
-    std::string realm() { return fRealm; }
-    std::string nonce() { return fNonce; }
-    std::string username() { return fUsername; }
-	AuthMethod	auth_method() const { return fAuthMethod; } 
-    
-    std::string computeDigestResponse( std::string &cmd, std::string &url );
-    void authHandleHeader( std::string headerData );
-    std::string getAuthHeader( std::string method, std::string path );
-	void checkAuthResponse(std::string &response);
-    
+  std::string realm() { return fRealm; }
+  std::string nonce() { return fNonce; }
+  std::string username() { return fUsername; }
+  AuthMethod  auth_method() const { return fAuthMethod; } 
+  
+  std::string computeDigestResponse( std::string &cmd, std::string &url );
+  void authHandleHeader( std::string headerData );
+  std::string getAuthHeader( std::string method, std::string path );
+  void checkAuthResponse(std::string &response);
+  
 private:
   std::string password() { return fPassword; }
   AuthMethod fAuthMethod;
@@ -61,7 +61,7 @@ private:
   std::string fUsername; 
   std::string fPassword;
   std::string quote( std::string src );
-	int nc;
+  int nc;
 };
 
 } // namespace zm
diff --git a/src/zm_sdp.cpp b/src/zm_sdp.cpp
index dbc63a82f..7bfc4b1f9 100644
--- a/src/zm_sdp.cpp
+++ b/src/zm_sdp.cpp
@@ -25,489 +25,489 @@
 
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
 SessionDescriptor::StaticPayloadDesc SessionDescriptor::smStaticPayloads[] = {
-    { 0, "PCMU",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_MULAW,  8000,  1 },
-    { 3, "GSM",    AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 4, "G723",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 5, "DVI4",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 6, "DVI4",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       16000, 1 },
-    { 7, "LPC",    AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 8, "PCMA",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_ALAW,   8000,  1 },
-    { 9, "G722",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 10, "L16",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_S16BE,  44100, 2 },
-    { 11, "L16",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_S16BE,  44100, 1 },
-    { 12, "QCELP", AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_QCELP,      8000,  1 },
-    { 13, "CN",    AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 14, "MPA",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_MP2,        -1,    -1 },
-    { 14, "MPA",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_MP3,        -1,    -1 },
-    { 15, "G728",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 16, "DVI4",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       11025, 1 },
-    { 17, "DVI4",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       22050, 1 },
-    { 18, "G729",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,       8000,  1 },
-    { 25, "CelB",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_NONE,       90000, -1 },
-    { 26, "JPEG",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_MJPEG,      90000, -1 },
-    { 28, "nv",    AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_NONE,       90000, -1 },
-    { 31, "H261",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_H261,       90000, -1 },
-    { 32, "MPV",   AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_MPEG1VIDEO, 90000, -1 },
-    { 32, "MPV",   AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_MPEG2VIDEO, 90000, -1 },
-    { 33, "MP2T",  AVMEDIA_TYPE_DATA,    AV_CODEC_ID_MPEG2TS,    90000, -1 },
-    { 34, "H263",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_H263,       90000, -1 },
-    { -1, "",      AVMEDIA_TYPE_UNKNOWN, AV_CODEC_ID_NONE,       -1,    -1 }
+  { 0, "PCMU",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_MULAW,  8000,  1 },
+  { 3, "GSM",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 4, "G723",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 5, "DVI4",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 6, "DVI4",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     16000, 1 },
+  { 7, "LPC",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 8, "PCMA",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_ALAW,   8000,  1 },
+  { 9, "G722",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 10, "L16",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_S16BE,  44100, 2 },
+  { 11, "L16",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_PCM_S16BE,  44100, 1 },
+  { 12, "QCELP", AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_QCELP,    8000,  1 },
+  { 13, "CN",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 14, "MPA",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_MP2,    -1,  -1 },
+  { 14, "MPA",   AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_MP3,    -1,  -1 },
+  { 15, "G728",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 16, "DVI4",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     11025, 1 },
+  { 17, "DVI4",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     22050, 1 },
+  { 18, "G729",  AVMEDIA_TYPE_AUDIO,   AV_CODEC_ID_NONE,     8000,  1 },
+  { 25, "CelB",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_NONE,     90000, -1 },
+  { 26, "JPEG",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_MJPEG,    90000, -1 },
+  { 28, "nv",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_NONE,     90000, -1 },
+  { 31, "H261",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_H261,     90000, -1 },
+  { 32, "MPV",   AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_MPEG1VIDEO, 90000, -1 },
+  { 32, "MPV",   AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_MPEG2VIDEO, 90000, -1 },
+  { 33, "MP2T",  AVMEDIA_TYPE_DATA,  AV_CODEC_ID_MPEG2TS,  90000, -1 },
+  { 34, "H263",  AVMEDIA_TYPE_VIDEO,   AV_CODEC_ID_H263,     90000, -1 },
+  { -1, "",    AVMEDIA_TYPE_UNKNOWN, AV_CODEC_ID_NONE,     -1,  -1 }
 };
 
 SessionDescriptor::DynamicPayloadDesc SessionDescriptor::smDynamicPayloads[] = {
-    { "MP4V-ES", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 },
-    { "mpeg4-generic", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC },
-    { "H264", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 },
-    { "AMR", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AMR_NB },
-    { "vnd.onvif.metadata", AVMEDIA_TYPE_DATA, AV_CODEC_ID_NONE }
+  { "MP4V-ES", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_MPEG4 },
+  { "mpeg4-generic", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AAC },
+  { "H264", AVMEDIA_TYPE_VIDEO, AV_CODEC_ID_H264 },
+  { "AMR", AVMEDIA_TYPE_AUDIO, AV_CODEC_ID_AMR_NB },
+  { "vnd.onvif.metadata", AVMEDIA_TYPE_DATA, AV_CODEC_ID_NONE }
 };
 #else
 SessionDescriptor::StaticPayloadDesc SessionDescriptor::smStaticPayloads[] = {
-    { 0, "PCMU",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_MULAW,  8001,  1 },
-    { 3, "GSM",    CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 4, "G723",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 5, "DVI4",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 6, "DVI4",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       16000, 1 },
-    { 7, "LPC",    CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 8, "PCMA",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_ALAW,   8000,  1 },
-    { 9, "G722",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 10, "L16",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_S16BE,  44100, 2 },
-    { 11, "L16",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_S16BE,  44100, 1 },
-    { 12, "QCELP", CODEC_TYPE_AUDIO,   CODEC_ID_QCELP,      8000,  1 },
-    { 13, "CN",    CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 14, "MPA",   CODEC_TYPE_AUDIO,   CODEC_ID_MP2,        -1,    -1 },
-    { 14, "MPA",   CODEC_TYPE_AUDIO,   CODEC_ID_MP3,        -1,    -1 },
-    { 15, "G728",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 16, "DVI4",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       11025, 1 },
-    { 17, "DVI4",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       22050, 1 },
-    { 18, "G729",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,       8000,  1 },
-    { 25, "CelB",  CODEC_TYPE_VIDEO,   CODEC_ID_NONE,       90000, -1 },
-    { 26, "JPEG",  CODEC_TYPE_VIDEO,   CODEC_ID_MJPEG,      90000, -1 },
-    { 28, "nv",    CODEC_TYPE_VIDEO,   CODEC_ID_NONE,       90000, -1 },
-    { 31, "H261",  CODEC_TYPE_VIDEO,   CODEC_ID_H261,       90000, -1 },
-    { 32, "MPV",   CODEC_TYPE_VIDEO,   CODEC_ID_MPEG1VIDEO, 90000, -1 },
-    { 32, "MPV",   CODEC_TYPE_VIDEO,   CODEC_ID_MPEG2VIDEO, 90000, -1 },
-    { 33, "MP2T",  CODEC_TYPE_DATA,    CODEC_ID_MPEG2TS,    90000, -1 },
-    { 34, "H263",  CODEC_TYPE_VIDEO,   CODEC_ID_H263,       90000, -1 },
-    { -1, "",      CODEC_TYPE_UNKNOWN, CODEC_ID_NONE,       -1,    -1 }
+  { 0, "PCMU",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_MULAW,  8001,  1 },
+  { 3, "GSM",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 4, "G723",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 5, "DVI4",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 6, "DVI4",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     16000, 1 },
+  { 7, "LPC",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 8, "PCMA",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_ALAW,   8000,  1 },
+  { 9, "G722",   CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 10, "L16",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_S16BE,  44100, 2 },
+  { 11, "L16",   CODEC_TYPE_AUDIO,   CODEC_ID_PCM_S16BE,  44100, 1 },
+  { 12, "QCELP", CODEC_TYPE_AUDIO,   CODEC_ID_QCELP,    8000,  1 },
+  { 13, "CN",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 14, "MPA",   CODEC_TYPE_AUDIO,   CODEC_ID_MP2,    -1,  -1 },
+  { 14, "MPA",   CODEC_TYPE_AUDIO,   CODEC_ID_MP3,    -1,  -1 },
+  { 15, "G728",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 16, "DVI4",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     11025, 1 },
+  { 17, "DVI4",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     22050, 1 },
+  { 18, "G729",  CODEC_TYPE_AUDIO,   CODEC_ID_NONE,     8000,  1 },
+  { 25, "CelB",  CODEC_TYPE_VIDEO,   CODEC_ID_NONE,     90000, -1 },
+  { 26, "JPEG",  CODEC_TYPE_VIDEO,   CODEC_ID_MJPEG,    90000, -1 },
+  { 28, "nv",  CODEC_TYPE_VIDEO,   CODEC_ID_NONE,     90000, -1 },
+  { 31, "H261",  CODEC_TYPE_VIDEO,   CODEC_ID_H261,     90000, -1 },
+  { 32, "MPV",   CODEC_TYPE_VIDEO,   CODEC_ID_MPEG1VIDEO, 90000, -1 },
+  { 32, "MPV",   CODEC_TYPE_VIDEO,   CODEC_ID_MPEG2VIDEO, 90000, -1 },
+  { 33, "MP2T",  CODEC_TYPE_DATA,  CODEC_ID_MPEG2TS,  90000, -1 },
+  { 34, "H263",  CODEC_TYPE_VIDEO,   CODEC_ID_H263,     90000, -1 },
+  { -1, "",    CODEC_TYPE_UNKNOWN, CODEC_ID_NONE,     -1,  -1 }
 };
 
 SessionDescriptor::DynamicPayloadDesc SessionDescriptor::smDynamicPayloads[] = {
-    { "MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4 },
-    { "mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_AAC },
-    { "H264", CODEC_TYPE_VIDEO, CODEC_ID_H264 },
-    { "AMR", CODEC_TYPE_AUDIO, CODEC_ID_AMR_NB },
-    { "vnd.onvif.metadata", CODEC_TYPE_DATA, CODEC_ID_NONE }
+  { "MP4V-ES", CODEC_TYPE_VIDEO, CODEC_ID_MPEG4 },
+  { "mpeg4-generic", CODEC_TYPE_AUDIO, CODEC_ID_AAC },
+  { "H264", CODEC_TYPE_VIDEO, CODEC_ID_H264 },
+  { "AMR", CODEC_TYPE_AUDIO, CODEC_ID_AMR_NB },
+  { "vnd.onvif.metadata", CODEC_TYPE_DATA, CODEC_ID_NONE }
 };
 #endif
 
 SessionDescriptor::ConnInfo::ConnInfo( const std::string &connInfo ) :
-    mTtl( 16 ),
-    mNoAddresses( 0 )
+  mTtl( 16 ),
+  mNoAddresses( 0 )
 {
-    StringVector tokens = split( connInfo, " " );
-    if ( tokens.size() < 3 )
-        throw Exception( "Unable to parse SDP connection info from '"+connInfo+"'" );
-    mNetworkType = tokens[0];
-    if ( mNetworkType != "IN" )
-        throw Exception( "Invalid SDP network type '"+mNetworkType+"' in connection info '"+connInfo+"'" );
-    mAddressType = tokens[1];
-    if ( mAddressType != "IP4" )
-        throw Exception( "Invalid SDP address type '"+mAddressType+"' in connection info '"+connInfo+"'" );
-    StringVector addressTokens = split( tokens[2], "/" );
-    if ( addressTokens.size() < 1 ) 
-        throw Exception( "Invalid SDP address '"+tokens[2]+"' in connection info '"+connInfo+"'" );
-    mAddress = addressTokens[0];
-    if ( addressTokens.size() >= 2 )
-        mTtl = atoi(addressTokens[1].c_str());
-    if ( addressTokens.size() >= 3 )
-        mNoAddresses = atoi(addressTokens[2].c_str());
+  StringVector tokens = split( connInfo, " " );
+  if ( tokens.size() < 3 )
+    throw Exception( "Unable to parse SDP connection info from '"+connInfo+"'" );
+  mNetworkType = tokens[0];
+  if ( mNetworkType != "IN" )
+    throw Exception( "Invalid SDP network type '"+mNetworkType+"' in connection info '"+connInfo+"'" );
+  mAddressType = tokens[1];
+  if ( mAddressType != "IP4" )
+    throw Exception( "Invalid SDP address type '"+mAddressType+"' in connection info '"+connInfo+"'" );
+  StringVector addressTokens = split( tokens[2], "/" );
+  if ( addressTokens.size() < 1 ) 
+    throw Exception( "Invalid SDP address '"+tokens[2]+"' in connection info '"+connInfo+"'" );
+  mAddress = addressTokens[0];
+  if ( addressTokens.size() >= 2 )
+    mTtl = atoi(addressTokens[1].c_str());
+  if ( addressTokens.size() >= 3 )
+    mNoAddresses = atoi(addressTokens[2].c_str());
 }
 
 SessionDescriptor::BandInfo::BandInfo( const std::string &bandInfo ) :
-    mValue( 0 )
+  mValue( 0 )
 {
-    StringVector tokens = split( bandInfo, ":" );
-    if ( tokens.size() < 2 )
-        throw Exception( "Unable to parse SDP bandwidth info from '"+bandInfo+"'" );
-    mType = tokens[0];
-    //if ( mNetworkType != "IN" )
-        //throw Exception( "Invalid SDP network type '"+mNetworkType+"' in connection info '"+connInfo+"'" );
-    mValue = atoi(tokens[1].c_str());
+  StringVector tokens = split( bandInfo, ":" );
+  if ( tokens.size() < 2 )
+    throw Exception( "Unable to parse SDP bandwidth info from '"+bandInfo+"'" );
+  mType = tokens[0];
+  //if ( mNetworkType != "IN" )
+    //throw Exception( "Invalid SDP network type '"+mNetworkType+"' in connection info '"+connInfo+"'" );
+  mValue = atoi(tokens[1].c_str());
 }
 
 SessionDescriptor::MediaDescriptor::MediaDescriptor( const std::string &type, int port, int numPorts, const std::string &transport, int payloadType ) :
-    mType( type ),
-    mPort( port ),
-    mNumPorts( numPorts ),
-    mTransport( transport ),
-    mPayloadType( payloadType ),
-    mFrameRate( 0.0 ),
-    mClock( 0 ),
-    mWidth( 0 ),
-    mHeight( 0 ),
-    mSprops( "" ),
-    mConnInfo( 0 )
+  mType( type ),
+  mPort( port ),
+  mNumPorts( numPorts ),
+  mTransport( transport ),
+  mPayloadType( payloadType ),
+  mFrameRate( 0.0 ),
+  mClock( 0 ),
+  mWidth( 0 ),
+  mHeight( 0 ),
+  mSprops( "" ),
+  mConnInfo( 0 )
 {
 }
 
 SessionDescriptor::SessionDescriptor( const std::string &url, const std::string &sdp ) : 
-    mUrl( url ),
-    mConnInfo( 0 ),
-    mBandInfo( 0 )
+  mUrl( url ),
+  mConnInfo( 0 ),
+  mBandInfo( 0 )
 {
-    MediaDescriptor *currMedia = 0;
+  MediaDescriptor *currMedia = 0;
 
-    StringVector lines = split( sdp, "\r\n" );
-    for ( StringVector::const_iterator iter = lines.begin(); iter != lines.end(); iter++ )
+  StringVector lines = split( sdp, "\r\n" );
+  for ( StringVector::const_iterator iter = lines.begin(); iter != lines.end(); iter++ )
+  {
+    std::string line = *iter;
+    if ( line.empty() )
+      break;
+
+    Debug( 3, "Processing SDP line '%s'", line.c_str() );
+    const char sdpType = line[0];
+    if ( line[1] != '=' )
+      throw Exception( "Invalid SDP format at '"+line+"'" );
+
+    line.erase( 0, 2 );
+    switch( sdpType )
     {
-        std::string line = *iter;
-        if ( line.empty() )
-            break;
-
-        Debug( 3, "Processing SDP line '%s'", line.c_str() );
-        const char sdpType = line[0];
-        if ( line[1] != '=' )
-            throw Exception( "Invalid SDP format at '"+line+"'" );
-
-        line.erase( 0, 2 );
-        switch( sdpType )
+      case 'v' :
+        mVersion = line;
+        break;
+      case 'o' :
+        mOwner = line;
+        break;
+      case 's' :
+        mName = line;
+        break;
+      case 'i' :
+        mInfo = line;
+        break;
+      case 'c' :
+        // This prevent a memory leak if the field appears more than one time
+        if ( mConnInfo )
+          delete mConnInfo;
+        mConnInfo = new ConnInfo( line );
+        break;
+      case 'b' :
+        // This prevent a memory leak if the field appears more than one time
+        if ( mBandInfo )
+          delete mBandInfo;
+        mBandInfo = new BandInfo( line );
+        break;
+      case 't' :
+        mTimeInfo = line;
+        break;
+      case 'a' :
+      {
+        mAttributes.push_back( line );
+        StringVector tokens = split( line, ":", 2 );
+        std::string attrName = tokens[0];
+        if ( currMedia )
         {
-            case 'v' :
-                mVersion = line;
-                break;
-            case 'o' :
-                mOwner = line;
-                break;
-            case 's' :
-                mName = line;
-                break;
-            case 'i' :
-                mInfo = line;
-                break;
-            case 'c' :
-                // This prevent a memory leak if the field appears more than one time
-                if ( mConnInfo )
-                    delete mConnInfo;
-                mConnInfo = new ConnInfo( line );
-                break;
-            case 'b' :
-                // This prevent a memory leak if the field appears more than one time
-                if ( mBandInfo )
-                    delete mBandInfo;
-                mBandInfo = new BandInfo( line );
-                break;
-            case 't' :
-                mTimeInfo = line;
-                break;
-            case 'a' :
+          if ( attrName == "control" )
+          {
+            if ( tokens.size() < 2 )
+              throw Exception( "Unable to parse SDP control attribute '"+line+"' for media '"+currMedia->getType()+"'" );
+            currMedia->setControlUrl( tokens[1] );
+          }
+          else if ( attrName == "range" )
+          {
+          }
+          else if ( attrName == "rtpmap" )
+          {
+            // a=rtpmap:96 MP4V-ES/90000
+            if ( tokens.size() < 2 )
+              throw Exception( "Unable to parse SDP rtpmap attribute '"+line+"' for media '"+currMedia->getType()+"'" );
+            StringVector attrTokens = split( tokens[1], " " );
+            int payloadType = atoi(attrTokens[0].c_str());
+            if ( payloadType != currMedia->getPayloadType() )
+              throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
+            std::string payloadDesc = attrTokens[1];
+            //currMedia->setPayloadType( payloadType );
+            if ( attrTokens.size() > 1 )
             {
-                mAttributes.push_back( line );
-                StringVector tokens = split( line, ":", 2 );
-                std::string attrName = tokens[0];
-                if ( currMedia )
-                {
-                    if ( attrName == "control" )
-                    {
-                        if ( tokens.size() < 2 )
-                            throw Exception( "Unable to parse SDP control attribute '"+line+"' for media '"+currMedia->getType()+"'" );
-                        currMedia->setControlUrl( tokens[1] );
-                    }
-                    else if ( attrName == "range" )
-                    {
-                    }
-                    else if ( attrName == "rtpmap" )
-                    {
-                        // a=rtpmap:96 MP4V-ES/90000
-                        if ( tokens.size() < 2 )
-                            throw Exception( "Unable to parse SDP rtpmap attribute '"+line+"' for media '"+currMedia->getType()+"'" );
-                        StringVector attrTokens = split( tokens[1], " " );
-                        int payloadType = atoi(attrTokens[0].c_str());
-                        if ( payloadType != currMedia->getPayloadType() )
-                            throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
-                        std::string payloadDesc = attrTokens[1];
-                        //currMedia->setPayloadType( payloadType );
-                        if ( attrTokens.size() > 1 )
-                        {
-                            StringVector payloadTokens = split( attrTokens[1], "/" );
-                            std::string payloadDesc = payloadTokens[0];
-                            int payloadClock = atoi(payloadTokens[1].c_str());
-                            currMedia->setPayloadDesc( payloadDesc );
-                            currMedia->setClock( payloadClock );
-                        }
-                    }
-                    else if ( attrName == "framesize" )
-                    {
-                        // a=framesize:96 320-240
-                        if ( tokens.size() < 2 )
-                            throw Exception( "Unable to parse SDP framesize attribute '"+line+"' for media '"+currMedia->getType()+"'" );
-                        StringVector attrTokens = split( tokens[1], " " );
-                        int payloadType = atoi(attrTokens[0].c_str());
-                        if ( payloadType != currMedia->getPayloadType() )
-                            throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
-                        //currMedia->setPayloadType( payloadType );
-                        StringVector sizeTokens = split( attrTokens[1], "-" );
-                        int width = atoi(sizeTokens[0].c_str());
-                        int height = atoi(sizeTokens[1].c_str());
-                        currMedia->setFrameSize( width, height );
-                    }
-                    else if ( attrName == "framerate" )
-                    {
-                        // a=framerate:5.0
-                        if ( tokens.size() < 2 )
-                            throw Exception( "Unable to parse SDP framerate attribute '"+line+"' for media '"+currMedia->getType()+"'" );
-                        double frameRate = atof(tokens[1].c_str());
-                        currMedia->setFrameRate( frameRate );
-                    }
-                    else if ( attrName == "fmtp" )
-                    {
-                        // a=fmtp:96 profile-level-id=247; config=000001B0F7000001B509000001000000012008D48D8803250F042D14440F
-                        if ( tokens.size() < 2 )
-                            throw Exception( "Unable to parse SDP fmtp attribute '"+line+"' for media '"+currMedia->getType()+"'" );
-                        StringVector attrTokens = split( tokens[1], " ", 2 );
-                        int payloadType = atoi(attrTokens[0].c_str());
-                        if ( payloadType != currMedia->getPayloadType() )
-                            throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
-                        //currMedia->setPayloadType( payloadType );
-                        if ( attrTokens.size() > 1 )
-                        {
-                            StringVector attr2Tokens = split( attrTokens[1], "; " );
-                            for ( unsigned int i = 0; i < attr2Tokens.size(); i++ )
-                            {
-                                StringVector attr3Tokens = split( attr2Tokens[i], "=" );
-                                //Info( "Name = %s, Value = %s", attr3Tokens[0].c_str(), attr3Tokens[1].c_str() );
-                                if ( attr3Tokens[0] == "profile-level-id" )
-                                {
-                                }
-                                else if ( attr3Tokens[0] == "config" )
-                                {
-                                }
-                                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
-                                {
-                              		size_t t = attr2Tokens[i].find("=");
-                              		char *c = (char *)attr2Tokens[i].c_str() + t + 1;
-                              		Debug(4, "sprop-parameter-sets value %s", c);
-                            		currMedia->setSprops(std::string(c));
-                                }
-                                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
-                                {
-                              		size_t t = attr2Tokens[i].find("=");
-                              		char *c = (char *)attr2Tokens[i].c_str() + t + 1;
-                              		Debug(4, "sprop-parameter-sets value %s", c);
-                            		currMedia->setSprops(std::string(c));
-                                }
-                                else 
-                                {
-                                    Debug( 3, "Ignoring SDP fmtp attribute '%s' for media '%s'", attr3Tokens[0].c_str(), currMedia->getType().c_str() )
-                                }
-                            }
-                        }
-                    }
-                    else if ( attrName == "mpeg4-iod" )
-                    {
-                        // a=mpeg4-iod: "data:application/mpeg4-iod;base64,AoEAAE8BAf73AQOAkwABQHRkYXRhOmFwcGxpY2F0aW9uL21wZWc0LW9kLWF1O2Jhc2U2NCxBVGdCR3dVZkF4Y0F5U1FBWlFRTklCRUVrK0FBQWEyd0FBR3RzQVlCQkFFWkFwOERGUUJsQlFRTlFCVUFDN2dBQVBvQUFBRDZBQVlCQXc9PQQNAQUABAAAAAAAAAAAAAYJAQAAAAAAAAAAA0IAAkA+ZGF0YTphcHBsaWNhdGlvbi9tcGVnNC1iaWZzLWF1O2Jhc2U2NCx3QkFTZ1RBcUJYSmhCSWhRUlFVL0FBPT0EEgINAAACAAAAAAAAAAAFAwAAQAYJAQAAAAAAAAAA"
-                    }
-                    else if ( attrName == "mpeg4-esid" )
-                    {
-                        // a=mpeg4-esid:201
-                    }
-                    else
-                    {
-                        Debug( 3, "Ignoring SDP attribute '%s' for media '%s'", line.c_str(), currMedia->getType().c_str() )
-                    }
-                }
-                else
-                {
-                    Debug( 3, "Ignoring general SDP attribute '%s'", line.c_str() );
-                }
-                break;
+              StringVector payloadTokens = split( attrTokens[1], "/" );
+              std::string payloadDesc = payloadTokens[0];
+              int payloadClock = atoi(payloadTokens[1].c_str());
+              currMedia->setPayloadDesc( payloadDesc );
+              currMedia->setClock( payloadClock );
             }
-            case 'm' :
+          }
+          else if ( attrName == "framesize" )
+          {
+            // a=framesize:96 320-240
+            if ( tokens.size() < 2 )
+              throw Exception( "Unable to parse SDP framesize attribute '"+line+"' for media '"+currMedia->getType()+"'" );
+            StringVector attrTokens = split( tokens[1], " " );
+            int payloadType = atoi(attrTokens[0].c_str());
+            if ( payloadType != currMedia->getPayloadType() )
+              throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
+            //currMedia->setPayloadType( payloadType );
+            StringVector sizeTokens = split( attrTokens[1], "-" );
+            int width = atoi(sizeTokens[0].c_str());
+            int height = atoi(sizeTokens[1].c_str());
+            currMedia->setFrameSize( width, height );
+          }
+          else if ( attrName == "framerate" )
+          {
+            // a=framerate:5.0
+            if ( tokens.size() < 2 )
+              throw Exception( "Unable to parse SDP framerate attribute '"+line+"' for media '"+currMedia->getType()+"'" );
+            double frameRate = atof(tokens[1].c_str());
+            currMedia->setFrameRate( frameRate );
+          }
+          else if ( attrName == "fmtp" )
+          {
+            // a=fmtp:96 profile-level-id=247; config=000001B0F7000001B509000001000000012008D48D8803250F042D14440F
+            if ( tokens.size() < 2 )
+              throw Exception( "Unable to parse SDP fmtp attribute '"+line+"' for media '"+currMedia->getType()+"'" );
+            StringVector attrTokens = split( tokens[1], " ", 2 );
+            int payloadType = atoi(attrTokens[0].c_str());
+            if ( payloadType != currMedia->getPayloadType() )
+              throw Exception( stringtf( "Payload type mismatch, expected %d, got %d in '%s'", currMedia->getPayloadType(), payloadType, line.c_str() ) );
+            //currMedia->setPayloadType( payloadType );
+            if ( attrTokens.size() > 1 )
             {
-                StringVector tokens = split( line, " " );
-                if ( tokens.size() < 4 )
-                    throw Exception( "Can't parse SDP media description '"+line+"'" );
-                std::string mediaType = tokens[0];
-                if ( mediaType != "audio" && mediaType != "video"  && mediaType != "application" )
-                    throw Exception( "Unsupported media type '"+mediaType+"' in SDP media attribute '"+line+"'" );
-                StringVector portTokens = split( tokens[1], "/" );
-                int mediaPort = atoi(portTokens[0].c_str());
-                int mediaNumPorts = 1;
-                if ( portTokens.size() > 1 )
-                    mediaNumPorts = atoi(portTokens[1].c_str());
-                std::string mediaTransport = tokens[2];
-                if ( mediaTransport != "RTP/AVP" )
-                    throw Exception( "Unsupported media transport '"+mediaTransport+"' in SDP media attribute '"+line+"'" );
-                int payloadType = atoi(tokens[3].c_str());
-                currMedia = new MediaDescriptor( mediaType, mediaPort, mediaNumPorts, mediaTransport, payloadType );
-                mMediaList.push_back( currMedia );
-                break;
+              StringVector attr2Tokens = split( attrTokens[1], "; " );
+              for ( unsigned int i = 0; i < attr2Tokens.size(); i++ )
+              {
+                StringVector attr3Tokens = split( attr2Tokens[i], "=" );
+                //Info( "Name = %s, Value = %s", attr3Tokens[0].c_str(), attr3Tokens[1].c_str() );
+                if ( attr3Tokens[0] == "profile-level-id" )
+                {
+                }
+                else if ( attr3Tokens[0] == "config" )
+                {
+                }
+                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
+                {
+                    size_t t = attr2Tokens[i].find("=");
+                    char *c = (char *)attr2Tokens[i].c_str() + t + 1;
+                    Debug(4, "sprop-parameter-sets value %s", c);
+                  currMedia->setSprops(std::string(c));
+                }
+                else if ( attr3Tokens[0] == "sprop-parameter-sets" )
+                {
+                    size_t t = attr2Tokens[i].find("=");
+                    char *c = (char *)attr2Tokens[i].c_str() + t + 1;
+                    Debug(4, "sprop-parameter-sets value %s", c);
+                  currMedia->setSprops(std::string(c));
+                }
+                else 
+                {
+                  Debug( 3, "Ignoring SDP fmtp attribute '%s' for media '%s'", attr3Tokens[0].c_str(), currMedia->getType().c_str() )
+                }
+              }
             }
+          }
+          else if ( attrName == "mpeg4-iod" )
+          {
+            // a=mpeg4-iod: "data:application/mpeg4-iod;base64,AoEAAE8BAf73AQOAkwABQHRkYXRhOmFwcGxpY2F0aW9uL21wZWc0LW9kLWF1O2Jhc2U2NCxBVGdCR3dVZkF4Y0F5U1FBWlFRTklCRUVrK0FBQWEyd0FBR3RzQVlCQkFFWkFwOERGUUJsQlFRTlFCVUFDN2dBQVBvQUFBRDZBQVlCQXc9PQQNAQUABAAAAAAAAAAAAAYJAQAAAAAAAAAAA0IAAkA+ZGF0YTphcHBsaWNhdGlvbi9tcGVnNC1iaWZzLWF1O2Jhc2U2NCx3QkFTZ1RBcUJYSmhCSWhRUlFVL0FBPT0EEgINAAACAAAAAAAAAAAFAwAAQAYJAQAAAAAAAAAA"
+          }
+          else if ( attrName == "mpeg4-esid" )
+          {
+            // a=mpeg4-esid:201
+          }
+          else
+          {
+            Debug( 3, "Ignoring SDP attribute '%s' for media '%s'", line.c_str(), currMedia->getType().c_str() )
+          }
         }
+        else
+        {
+          Debug( 3, "Ignoring general SDP attribute '%s'", line.c_str() );
+        }
+        break;
+      }
+      case 'm' :
+      {
+        StringVector tokens = split( line, " " );
+        if ( tokens.size() < 4 )
+          throw Exception( "Can't parse SDP media description '"+line+"'" );
+        std::string mediaType = tokens[0];
+        if ( mediaType != "audio" && mediaType != "video"  && mediaType != "application" )
+          throw Exception( "Unsupported media type '"+mediaType+"' in SDP media attribute '"+line+"'" );
+        StringVector portTokens = split( tokens[1], "/" );
+        int mediaPort = atoi(portTokens[0].c_str());
+        int mediaNumPorts = 1;
+        if ( portTokens.size() > 1 )
+          mediaNumPorts = atoi(portTokens[1].c_str());
+        std::string mediaTransport = tokens[2];
+        if ( mediaTransport != "RTP/AVP" )
+          throw Exception( "Unsupported media transport '"+mediaTransport+"' in SDP media attribute '"+line+"'" );
+        int payloadType = atoi(tokens[3].c_str());
+        currMedia = new MediaDescriptor( mediaType, mediaPort, mediaNumPorts, mediaTransport, payloadType );
+        mMediaList.push_back( currMedia );
+        break;
+      }
     }
+  }
 }
 
 SessionDescriptor::~SessionDescriptor()
 {
-    if ( mConnInfo )
-        delete mConnInfo;
-    if ( mBandInfo )
-        delete mBandInfo;
-    for ( unsigned int i = 0; i < mMediaList.size(); i++ )
-        delete mMediaList[i];
+  if ( mConnInfo )
+    delete mConnInfo;
+  if ( mBandInfo )
+    delete mBandInfo;
+  for ( unsigned int i = 0; i < mMediaList.size(); i++ )
+    delete mMediaList[i];
 }
 
 AVFormatContext *SessionDescriptor::generateFormatContext() const
 {
-    AVFormatContext *formatContext = avformat_alloc_context();
+  AVFormatContext *formatContext = avformat_alloc_context();
 
-    strncpy( formatContext->filename, mUrl.c_str(), sizeof(formatContext->filename) );
+  strncpy( formatContext->filename, mUrl.c_str(), sizeof(formatContext->filename) );
 /*
-    if ( mName.length() )
-        strncpy( formatContext->title, mName.c_str(), sizeof(formatContext->title) );
-    if ( mInfo.length() )
-        strncpy( formatContext->comment, mInfo.c_str(), sizeof(formatContext->comment) );
+  if ( mName.length() )
+    strncpy( formatContext->title, mName.c_str(), sizeof(formatContext->title) );
+  if ( mInfo.length() )
+    strncpy( formatContext->comment, mInfo.c_str(), sizeof(formatContext->comment) );
 */
-    //formatContext->nb_streams = mMediaList.size();
-    for ( unsigned int i = 0; i < mMediaList.size(); i++ )
-    {
-        const MediaDescriptor *mediaDesc = mMediaList[i];
+  //formatContext->nb_streams = mMediaList.size();
+  for ( unsigned int i = 0; i < mMediaList.size(); i++ )
+  {
+    const MediaDescriptor *mediaDesc = mMediaList[i];
 #if !LIBAVFORMAT_VERSION_CHECK(53, 10, 0, 17, 0)
-        AVStream *stream = av_new_stream( formatContext, i );
+    AVStream *stream = av_new_stream( formatContext, i );
 #else
-        AVStream *stream = avformat_new_stream( formatContext, NULL );
-        stream->id = i;
+    AVStream *stream = avformat_new_stream( formatContext, NULL );
+    stream->id = i;
 #endif
 
-        Debug( 1, "Looking for codec for %s payload type %d / %s",  mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
+    Debug( 1, "Looking for codec for %s payload type %d / %s",  mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-        if ( mediaDesc->getType() == "video" )
-            stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
-        else if ( mediaDesc->getType() == "audio" )
-            stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
-        else if ( mediaDesc->getType() == "application" )
-            stream->codec->codec_type = AVMEDIA_TYPE_DATA;
+    if ( mediaDesc->getType() == "video" )
+      stream->codec->codec_type = AVMEDIA_TYPE_VIDEO;
+    else if ( mediaDesc->getType() == "audio" )
+      stream->codec->codec_type = AVMEDIA_TYPE_AUDIO;
+    else if ( mediaDesc->getType() == "application" )
+      stream->codec->codec_type = AVMEDIA_TYPE_DATA;
 #else
-        if ( mediaDesc->getType() == "video" )
-            stream->codec->codec_type = CODEC_TYPE_VIDEO;
-        else if ( mediaDesc->getType() == "audio" )
-            stream->codec->codec_type = CODEC_TYPE_AUDIO;
-        else if ( mediaDesc->getType() == "application" )
-            stream->codec->codec_type = CODEC_TYPE_DATA;
+    if ( mediaDesc->getType() == "video" )
+      stream->codec->codec_type = CODEC_TYPE_VIDEO;
+    else if ( mediaDesc->getType() == "audio" )
+      stream->codec->codec_type = CODEC_TYPE_AUDIO;
+    else if ( mediaDesc->getType() == "application" )
+      stream->codec->codec_type = CODEC_TYPE_DATA;
 #endif
 
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
-        std::string codec_name;
+    std::string codec_name;
 #endif
-        if ( mediaDesc->getPayloadType() < PAYLOAD_TYPE_DYNAMIC )
+    if ( mediaDesc->getPayloadType() < PAYLOAD_TYPE_DYNAMIC )
+    {
+      // Look in static table
+      for ( unsigned int i = 0; i < (sizeof(smStaticPayloads)/sizeof(*smStaticPayloads)); i++ )
+      {
+        if ( smStaticPayloads[i].payloadType == mediaDesc->getPayloadType() )
         {
-            // Look in static table
-            for ( unsigned int i = 0; i < (sizeof(smStaticPayloads)/sizeof(*smStaticPayloads)); i++ )
-            {
-                if ( smStaticPayloads[i].payloadType == mediaDesc->getPayloadType() )
-                {
-                    Debug( 1, "Got static payload type %d, %s", smStaticPayloads[i].payloadType, smStaticPayloads[i].payloadName );
+          Debug( 1, "Got static payload type %d, %s", smStaticPayloads[i].payloadType, smStaticPayloads[i].payloadName );
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
-                    codec_name = std::string( smStaticPayloads[i].payloadName );
+          codec_name = std::string( smStaticPayloads[i].payloadName );
 #else
-                    strncpy( stream->codec->codec_name, smStaticPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
+          strncpy( stream->codec->codec_name, smStaticPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
 #endif
-                    stream->codec->codec_type = smStaticPayloads[i].codecType;
-                    stream->codec->codec_id = smStaticPayloads[i].codecId;
-                    stream->codec->sample_rate = smStaticPayloads[i].clockRate;
-                    break;
-                }
-            }
+          stream->codec->codec_type = smStaticPayloads[i].codecType;
+          stream->codec->codec_id = smStaticPayloads[i].codecId;
+          stream->codec->sample_rate = smStaticPayloads[i].clockRate;
+          break;
         }
-        else
+      }
+    }
+    else
+    {
+      // Look in dynamic table
+      for ( unsigned int i = 0; i < (sizeof(smDynamicPayloads)/sizeof(*smDynamicPayloads)); i++ )
+      {
+        if ( smDynamicPayloads[i].payloadName == mediaDesc->getPayloadDesc() )
         {
-            // Look in dynamic table
-            for ( unsigned int i = 0; i < (sizeof(smDynamicPayloads)/sizeof(*smDynamicPayloads)); i++ )
-            {
-                if ( smDynamicPayloads[i].payloadName == mediaDesc->getPayloadDesc() )
-                {
-                    Debug( 1, "Got dynamic payload type %d, %s", mediaDesc->getPayloadType(), smDynamicPayloads[i].payloadName );
+          Debug( 1, "Got dynamic payload type %d, %s", mediaDesc->getPayloadType(), smDynamicPayloads[i].payloadName );
 #if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
-                    codec_name = std::string( smStaticPayloads[i].payloadName );
+          codec_name = std::string( smStaticPayloads[i].payloadName );
 #else
-                    strncpy( stream->codec->codec_name, smDynamicPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
+          strncpy( stream->codec->codec_name, smDynamicPayloads[i].payloadName, sizeof(stream->codec->codec_name) );;
 #endif
-                    stream->codec->codec_type = smDynamicPayloads[i].codecType;
-                    stream->codec->codec_id = smDynamicPayloads[i].codecId;
-                    stream->codec->sample_rate = mediaDesc->getClock();
-                    break;
-                }
-            }
-        }
-
-#if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
-        if ( codec_name.empty() )
-#else
-        if ( !stream->codec->codec_name[0] )
-#endif
-        {
-            Warning( "Can't find payload details for %s payload type %d, name %s", mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
-            //return( 0 );
-        }
-        if ( mediaDesc->getWidth() )
-            stream->codec->width = mediaDesc->getWidth();
-        if ( mediaDesc->getHeight() )
-            stream->codec->height = mediaDesc->getHeight();
-        if ( stream->codec->codec_id == AV_CODEC_ID_H264 && mediaDesc->getSprops().size())
-        {
-    	    uint8_t start_sequence[]= { 0, 0, 1 };
-    	    stream->codec->extradata_size= 0;
-    	    stream->codec->extradata= NULL;
-    	    char pvalue[1024], *value = pvalue;
-	    
-			strcpy(pvalue, mediaDesc->getSprops().c_str());
-	    
-    	    while (*value) {
-        		char base64packet[1024];
-        		uint8_t decoded_packet[1024];
-        		uint32_t packet_size;
-        		char *dst = base64packet;
-
-        		while (*value && *value != ','
-            	       && (dst - base64packet) < (long)(sizeof(base64packet)) - 1) {
-            	      *dst++ = *value++;
-        		}
-        		*dst++ = '\0';
-
-        		if (*value == ',')
-            	    value++;
-
-        		packet_size= av_base64_decode(decoded_packet, (const char *)base64packet, (int)sizeof(decoded_packet));
-        		Hexdump(4, (char *)decoded_packet, packet_size);
-        		if (packet_size) {
-            		uint8_t *dest = 
-            		(uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
-                  		                 stream->codec->extradata_size +
-                      		             FF_INPUT_BUFFER_PADDING_SIZE);
-            		if(dest) {
-              			if(stream->codec->extradata_size) {
-                  			// av_realloc?
-                			memcpy(dest, stream->codec->extradata, stream->codec->extradata_size);
-                  			av_free(stream->codec->extradata);
-              			}
-
-              			memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
-              			memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
-              			memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
-                  	  		   packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
-
-              			stream->codec->extradata= dest;
-              			stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;
-//            		} else {
-//              		av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!");
-//                		return AVERROR(ENOMEM);
-            		}
-        		}
-    	    }
+          stream->codec->codec_type = smDynamicPayloads[i].codecType;
+          stream->codec->codec_id = smDynamicPayloads[i].codecId;
+          stream->codec->sample_rate = mediaDesc->getClock();
+          break;
         }
+      }
     }
 
-    return( formatContext );
+#if LIBAVCODEC_VERSION_CHECK(55, 50, 3, 60, 103)
+    if ( codec_name.empty() )
+#else
+    if ( !stream->codec->codec_name[0] )
+#endif
+    {
+      Warning( "Can't find payload details for %s payload type %d, name %s", mediaDesc->getType().c_str(), mediaDesc->getPayloadType(), mediaDesc->getPayloadDesc().c_str() );
+      //return( 0 );
+    }
+    if ( mediaDesc->getWidth() )
+      stream->codec->width = mediaDesc->getWidth();
+    if ( mediaDesc->getHeight() )
+      stream->codec->height = mediaDesc->getHeight();
+    if ( stream->codec->codec_id == AV_CODEC_ID_H264 && mediaDesc->getSprops().size())
+    {
+      uint8_t start_sequence[]= { 0, 0, 1 };
+      stream->codec->extradata_size= 0;
+      stream->codec->extradata= NULL;
+      char pvalue[1024], *value = pvalue;
+    
+      strcpy(pvalue, mediaDesc->getSprops().c_str());
+    
+      while (*value) {
+        char base64packet[1024];
+        uint8_t decoded_packet[1024];
+        uint32_t packet_size;
+        char *dst = base64packet;
+
+        while (*value && *value != ','
+             && (dst - base64packet) < (long)(sizeof(base64packet)) - 1) {
+            *dst++ = *value++;
+        }
+        *dst++ = '\0';
+
+        if (*value == ',')
+          value++;
+
+        packet_size= av_base64_decode(decoded_packet, (const char *)base64packet, (int)sizeof(decoded_packet));
+        Hexdump(4, (char *)decoded_packet, packet_size);
+        if (packet_size) {
+          uint8_t *dest = 
+          (uint8_t *)av_malloc(packet_size + sizeof(start_sequence) +
+                       stream->codec->extradata_size +
+                       FF_INPUT_BUFFER_PADDING_SIZE);
+          if(dest) {
+              if(stream->codec->extradata_size) {
+                // av_realloc?
+              memcpy(dest, stream->codec->extradata, stream->codec->extradata_size);
+                av_free(stream->codec->extradata);
+              }
+
+              memcpy(dest+stream->codec->extradata_size, start_sequence, sizeof(start_sequence));
+              memcpy(dest+stream->codec->extradata_size+sizeof(start_sequence), decoded_packet, packet_size);
+              memset(dest+stream->codec->extradata_size+sizeof(start_sequence)+
+                     packet_size, 0, FF_INPUT_BUFFER_PADDING_SIZE);
+
+              stream->codec->extradata= dest;
+              stream->codec->extradata_size+= sizeof(start_sequence)+packet_size;
+//          } else {
+//            av_log(codec, AV_LOG_ERROR, "Unable to allocate memory for extradata!");
+//            return AVERROR(ENOMEM);
+          }
+        }
+      }
+    }
+  }
+
+  return( formatContext );
 }
 
 #endif // HAVE_LIBAVFORMAT
diff --git a/src/zm_sdp.h b/src/zm_sdp.h
index 21eb227c1..2d08905c8 100644
--- a/src/zm_sdp.h
+++ b/src/zm_sdp.h
@@ -34,204 +34,204 @@
 class SessionDescriptor
 {
 protected:
-    enum { PAYLOAD_TYPE_DYNAMIC=96 };
+  enum { PAYLOAD_TYPE_DYNAMIC=96 };
 
-    struct StaticPayloadDesc
-    {
-        int payloadType;
-        const char payloadName[6];
+  struct StaticPayloadDesc
+  {
+    int payloadType;
+    const char payloadName[6];
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-        AVMediaType codecType;
+    AVMediaType codecType;
 #else
-		enum CodecType codecType;
+    enum CodecType codecType;
 #endif
-        _AVCODECID codecId;
-        int clockRate;
-        int autoChannels;
-    };
+    _AVCODECID codecId;
+    int clockRate;
+    int autoChannels;
+  };
 
-    struct DynamicPayloadDesc
-    {
-        const char payloadName[32];
+  struct DynamicPayloadDesc
+  {
+    const char payloadName[32];
 #if (LIBAVCODEC_VERSION_CHECK(52, 64, 0, 64, 0) || LIBAVUTIL_VERSION_CHECK(50, 14, 0, 14, 0))
-        AVMediaType codecType;
+    AVMediaType codecType;
 #else
-		enum CodecType codecType;
+    enum CodecType codecType;
 #endif
-        _AVCODECID codecId;
+    _AVCODECID codecId;
 
-        //int clockRate;
-        //int autoChannels;
-    };
+    //int clockRate;
+    //int autoChannels;
+  };
 
 public:
-    class ConnInfo
-    {
-    protected:
-        std::string mNetworkType;
-        std::string mAddressType;
-        std::string mAddress;
-        int mTtl;
-        int mNoAddresses;
+  class ConnInfo
+  {
+  protected:
+    std::string mNetworkType;
+    std::string mAddressType;
+    std::string mAddress;
+    int mTtl;
+    int mNoAddresses;
 
-    public:
-        ConnInfo( const std::string &connInfo );
-    };
+  public:
+    ConnInfo( const std::string &connInfo );
+  };
 
-    class BandInfo
-    {
-    protected:
-        std::string mType;
-        int mValue;
+  class BandInfo
+  {
+  protected:
+    std::string mType;
+    int mValue;
 
-    public:
-        BandInfo( const std::string &bandInfo );
-    };
+  public:
+    BandInfo( const std::string &bandInfo );
+  };
 
-    class MediaDescriptor
-    {
-    protected:
-        std::string mType;
-        int mPort;
-        int mNumPorts;
-        std::string mTransport;
-        int mPayloadType;
+  class MediaDescriptor
+  {
+  protected:
+    std::string mType;
+    int mPort;
+    int mNumPorts;
+    std::string mTransport;
+    int mPayloadType;
 
-        std::string mPayloadDesc;
-        std::string mControlUrl;
-        double mFrameRate;
-        int mClock;
-        int mWidth;
-        int mHeight;
-        std::string mSprops;
-
-        ConnInfo *mConnInfo;
-
-    public:
-        MediaDescriptor( const std::string &type, int port, int numPorts, const std::string &transport, int payloadType );
-
-        const std::string &getType() const
-        {
-            return( mType );
-        }
-        int getPort() const
-        {
-            return( mPort );
-        }
-        int getNumPorts() const
-        {
-            return( mNumPorts );
-        }
-        const std::string &getTransport() const
-        {
-            return( mTransport );
-        }
-        const int getPayloadType() const
-        {
-            return( mPayloadType );
-        }
-
-        const std::string &getPayloadDesc() const
-        {
-            return( mPayloadDesc );
-        }
-        void setPayloadDesc( const std::string &payloadDesc )
-        {
-            mPayloadDesc = payloadDesc;
-        }
-
-        const std::string &getControlUrl() const
-        {
-            return( mControlUrl );
-        }
-        void setControlUrl( const std::string &controlUrl )
-        {
-            mControlUrl = controlUrl;
-        }
-
-        const int getClock() const
-        {
-            return( mClock );
-        }
-        void setClock( int clock )
-        {
-            mClock = clock;
-        }
-
-        void setFrameSize( int width, int height )
-        {
-            mWidth = width;
-            mHeight = height;
-        }
-        int getWidth() const
-        {
-            return( mWidth );
-        }
-        int getHeight() const
-        {
-            return( mHeight );
-        }
-
-	void setSprops(const std::string props)
-	{
-		mSprops = props;
-	}
-	const std::string getSprops() const
-	{
-		return ( mSprops );
-	}
-        const double getFrameRate() const
-        {
-            return( mFrameRate );
-        }
-        void setFrameRate( double frameRate )
-        {
-            mFrameRate = frameRate;
-        }
-    };
-
-    typedef std::vector<MediaDescriptor *> MediaList;
-
-protected:
-    static StaticPayloadDesc smStaticPayloads[];
-    static DynamicPayloadDesc smDynamicPayloads[];
-
-protected:
-    std::string mUrl;
-
-    std::string mVersion;
-    std::string mOwner;
-    std::string mName;
-    std::string mInfo;
+    std::string mPayloadDesc;
+    std::string mControlUrl;
+    double mFrameRate;
+    int mClock;
+    int mWidth;
+    int mHeight;
+    std::string mSprops;
 
     ConnInfo *mConnInfo;
-    BandInfo *mBandInfo;
-    std::string mTimeInfo;
-    StringVector mAttributes;
 
-    MediaList mMediaList;
+  public:
+    MediaDescriptor( const std::string &type, int port, int numPorts, const std::string &transport, int payloadType );
+
+    const std::string &getType() const
+    {
+      return( mType );
+    }
+    int getPort() const
+    {
+      return( mPort );
+    }
+    int getNumPorts() const
+    {
+      return( mNumPorts );
+    }
+    const std::string &getTransport() const
+    {
+      return( mTransport );
+    }
+    const int getPayloadType() const
+    {
+      return( mPayloadType );
+    }
+
+    const std::string &getPayloadDesc() const
+    {
+      return( mPayloadDesc );
+    }
+    void setPayloadDesc( const std::string &payloadDesc )
+    {
+      mPayloadDesc = payloadDesc;
+    }
+
+    const std::string &getControlUrl() const
+    {
+      return( mControlUrl );
+    }
+    void setControlUrl( const std::string &controlUrl )
+    {
+      mControlUrl = controlUrl;
+    }
+
+    const int getClock() const
+    {
+      return( mClock );
+    }
+    void setClock( int clock )
+    {
+      mClock = clock;
+    }
+
+    void setFrameSize( int width, int height )
+    {
+      mWidth = width;
+      mHeight = height;
+    }
+    int getWidth() const
+    {
+      return( mWidth );
+    }
+    int getHeight() const
+    {
+      return( mHeight );
+    }
+
+    void setSprops(const std::string props)
+    {
+      mSprops = props;
+    }
+    const std::string getSprops() const
+    {
+      return ( mSprops );
+    }
+    const double getFrameRate() const
+    {
+      return( mFrameRate );
+    }
+    void setFrameRate( double frameRate )
+    {
+      mFrameRate = frameRate;
+    }
+  };
+
+  typedef std::vector<MediaDescriptor *> MediaList;
+
+protected:
+  static StaticPayloadDesc smStaticPayloads[];
+  static DynamicPayloadDesc smDynamicPayloads[];
+
+protected:
+  std::string mUrl;
+
+  std::string mVersion;
+  std::string mOwner;
+  std::string mName;
+  std::string mInfo;
+
+  ConnInfo *mConnInfo;
+  BandInfo *mBandInfo;
+  std::string mTimeInfo;
+  StringVector mAttributes;
+
+  MediaList mMediaList;
 
 public:
-    SessionDescriptor( const std::string &url, const std::string &sdp );
-    ~SessionDescriptor();
+  SessionDescriptor( const std::string &url, const std::string &sdp );
+  ~SessionDescriptor();
 
-    const std::string &getUrl() const
-    {
-        return( mUrl );
-    }
+  const std::string &getUrl() const
+  {
+    return( mUrl );
+  }
 
-    int getNumStreams() const
-    {
-        return( mMediaList.size() );
-    }
-    MediaDescriptor *getStream( int index )
-    {
-        if ( index < 0 || (unsigned int)index >= mMediaList.size() )
-            return( 0 );
-        return( mMediaList[index] );
-    }
+  int getNumStreams() const
+  {
+    return( mMediaList.size() );
+  }
+  MediaDescriptor *getStream( int index )
+  {
+    if ( index < 0 || (unsigned int)index >= mMediaList.size() )
+      return( 0 );
+    return( mMediaList[index] );
+  }
 
-    AVFormatContext *generateFormatContext() const;
+  AVFormatContext *generateFormatContext() const;
 };
 #if 0
 v=0
@@ -254,7 +254,7 @@ a=mpeg4-esid:201
 m=audio 0 RTP/AVP 0
 b=AS:64
 a=control:trackID=2
-    
+  
 #endif
 
 #endif // ZM_SDP_H
diff --git a/src/zm_sendfile.h b/src/zm_sendfile.h
index ce3405d66..0e35388ea 100644
--- a/src/zm_sendfile.h
+++ b/src/zm_sendfile.h
@@ -1,30 +1,30 @@
 #ifdef HAVE_SENDFILE4_SUPPORT
 #include <sys/sendfile.h>
 int zm_sendfile(int out_fd, int in_fd, off_t *offset, size_t size) {
-        int err;
+    int err;
 
-        err = sendfile(out_fd, in_fd, offset, size);
-        if (err < 0)
-                return -errno;
+    err = sendfile(out_fd, in_fd, offset, size);
+    if (err < 0)
+        return -errno;
 
-        return err;
+    return err;
 }
 #elif HAVE_SENDFILE7_SUPPORT
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/uio.h>
 int zm_sendfile(int out_fd, int in_fd, off_t *offset, off_t size) {
-        int err;
-        err = sendfile(in_fd, out_fd, *offset, size, NULL, &size, 0);
-        if (err && errno != EAGAIN)
-                return -errno;
+    int err;
+    err = sendfile(in_fd, out_fd, *offset, size, NULL, &size, 0);
+    if (err && errno != EAGAIN)
+        return -errno;
 
-        if (size) {
-                *offset += size;
-                return size;
-        }
+    if (size) {
+        *offset += size;
+        return size;
+    }
 
-        return -EAGAIN;
+    return -EAGAIN;
 }
 #else
 #error "Your platform does not support sendfile. Sorry."
diff --git a/src/zm_signal.cpp b/src/zm_signal.cpp
index 91e1bc4ba..bbc40e916 100644
--- a/src/zm_signal.cpp
+++ b/src/zm_signal.cpp
@@ -47,15 +47,12 @@ RETSIGTYPE zm_die_handler(int signal, siginfo_t * info, void *context)
 RETSIGTYPE zm_die_handler(int signal)
 #endif
 {
-#if (defined(__i386__) || defined(__x86_64__))
-	void *cr2 = 0;
-	void *ip = 0;
-#endif
 	Error("Got signal %d (%s), crashing", signal, strsignal(signal));
-
 #if (defined(__i386__) || defined(__x86_64__))
 	// Get more information if available
-#if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+  #if ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+	void *ip = 0;
+	void *cr2 = 0;
 	if (info && context) {
 
 		Debug(1,
@@ -65,19 +62,19 @@ RETSIGTYPE zm_die_handler(int signal)
 
 		ucontext_t *uc = (ucontext_t *) context;
 		cr2 = info->si_addr;
-#if defined(__x86_64__)
-	#ifdef __FreeBSD_kernel__
+    #if defined(__x86_64__)
+	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_rip);
-	#else
+	    #else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_RIP]);
-	#endif
-#else
-	#ifdef __FreeBSD_kernel__
+	    #endif
+    #else
+	    #ifdef __FreeBSD_kernel__
 		ip = (void *)(uc->uc_mcontext.mc_eip);
-	#else
+	    #else
 		ip = (void *)(uc->uc_mcontext.gregs[REG_EIP]);
-	#endif
-#endif				// defined(__x86_64__)
+	    #endif
+    #endif				// defined(__x86_64__)
 
 		// Print the signal address and instruction pointer if available
 		if (ip) {
@@ -86,11 +83,11 @@ RETSIGTYPE zm_die_handler(int signal)
 			Error("Signal address is %p, no instruction pointer", cr2);
 		}
 	}
-#endif				// ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
+  #endif				// ( HAVE_SIGINFO_T && HAVE_UCONTEXT_T )
 
 
 	// Print backtrace if enabled and available
-#if ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
+  #if ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
 	void *trace[TRACE_SIZE];
 	int trace_size = 0;
 	trace_size = backtrace(trace, TRACE_SIZE);
@@ -111,7 +108,7 @@ RETSIGTYPE zm_die_handler(int signal)
 
 	Info("Backtrace complete, please execute the following command for more information");
 	Info(cmd);
-#endif				// ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
+  #endif				// ( !defined(ZM_NO_CRASHTRACE) && HAVE_DECL_BACKTRACE && HAVE_DECL_BACKTRACE_SYMBOLS )
 #endif                          // (defined(__i386__) || defined(__x86_64__)
 	exit(signal);
 }
diff --git a/src/zm_stream.cpp b/src/zm_stream.cpp
index c66638759..3bab38f86 100644
--- a/src/zm_stream.cpp
+++ b/src/zm_stream.cpp
@@ -32,321 +32,326 @@
 StreamBase::~StreamBase()
 {
 #if HAVE_LIBAVCODEC
-    if ( vid_stream )
-    {
-	delete vid_stream;
-	vid_stream = NULL;
-    }
+  if ( vid_stream )
+  {
+  delete vid_stream;
+  vid_stream = NULL;
+  }
 #endif
-    closeComms();
+  closeComms();
 }
 
 bool StreamBase::loadMonitor( int monitor_id )
 {
-    if ( !(monitor = Monitor::Load( monitor_id, false, Monitor::QUERY )) )
-    {
-        Fatal( "Unable to load monitor id %d for streaming", monitor_id );
-        return( false );
-    }
-	monitor->connect();
-    return( true );
+  if ( !(monitor = Monitor::Load( monitor_id, false, Monitor::QUERY )) )
+  {
+    Fatal( "Unable to load monitor id %d for streaming", monitor_id );
+    return( false );
+  }
+  monitor->connect();
+  return( true );
 }
 
 bool StreamBase::checkInitialised()
 {
-    if ( !monitor )
-    {
-        Fatal( "Cannot stream, not initialised" );
-        return( false );
-    }
-    return( true );
+  if ( !monitor )
+  {
+    Fatal( "Cannot stream, not initialised" );
+    return( false );
+  }
+  return( true );
 }
 
 void StreamBase::updateFrameRate( double fps )
 {
-    base_fps = fps;
-    effective_fps = (base_fps*abs(replay_rate))/ZM_RATE_BASE;
-    frame_mod = 1;
-    Debug( 3, "FPS:%.2f, MXFPS:%.2f, BFPS:%.2f, EFPS:%.2f, FM:%d", fps, maxfps, base_fps, effective_fps, frame_mod );
-    // Min frame repeat?
-    while( effective_fps > maxfps )
-    {
-        effective_fps /= 2.0;
-        frame_mod *= 2;
-    }
-    Debug( 3, "aEFPS:%.2f, aFM:%d", effective_fps, frame_mod );
+  base_fps = fps;
+  effective_fps = (base_fps*abs(replay_rate))/ZM_RATE_BASE;
+  frame_mod = 1;
+  Debug( 3, "FPS:%.2f, MXFPS:%.2f, BFPS:%.2f, EFPS:%.2f, FM:%d", fps, maxfps, base_fps, effective_fps, frame_mod );
+  // Min frame repeat?
+  while( effective_fps > maxfps )
+  {
+    effective_fps /= 2.0;
+    frame_mod *= 2;
+  }
+  Debug( 3, "aEFPS:%.2f, aFM:%d", effective_fps, frame_mod );
 }
 
 bool StreamBase::checkCommandQueue()
 {
-    if ( sd >= 0 )
+  if ( sd >= 0 )
+  {
+    CmdMsg msg;
+    memset( &msg, 0, sizeof(msg) );
+    int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 );
+    if ( nbytes < 0 )
     {
-        CmdMsg msg;
-        memset( &msg, 0, sizeof(msg) );
-        int nbytes = recvfrom( sd, &msg, sizeof(msg), MSG_DONTWAIT, 0, 0 );
-        if ( nbytes < 0 )
-        {
-            if ( errno != EAGAIN )
-            {
-                Fatal( "recvfrom(), errno = %d, error = %s", errno, strerror(errno) );
-            }
-        }
-        //else if ( (nbytes != sizeof(msg)) )
-        //{
-            //Error( "Partial message received, expected %d bytes, got %d", sizeof(msg), nbytes );
-        //}
-        else
-        {
-            processCommand( &msg );
-            return( true );
-        }
+      if ( errno != EAGAIN )
+      {
+        Fatal( "recvfrom(), errno = %d, error = %s", errno, strerror(errno) );
+      }
     }
-    return( false );
+    //else if ( (nbytes != sizeof(msg)) )
+    //{
+      //Error( "Partial message received, expected %d bytes, got %d", sizeof(msg), nbytes );
+    //}
+    else
+    {
+      processCommand( &msg );
+      return( true );
+    }
+  }
+  return( false );
 }
 
 Image *StreamBase::prepareImage( Image *image )
 {
-    static int last_scale = 0;
-    static int last_zoom = 0;
-    static int last_x = 0;
-    static int last_y = 0;
+  static int last_scale = 0;
+  static int last_zoom = 0;
+  static int last_x = 0;
+  static int last_y = 0;
 
-    if ( !last_scale )
-        last_scale = scale;
-    if ( !last_zoom )
-        last_zoom = zoom;
-
-    // Do not bother to scale zoomed in images, just crop them and let the browser scale
-    // Works in FF2 but breaks FF3 which doesn't like image sizes changing in mid stream.
-    bool optimisedScaling = false;
-
-    bool image_copied = false;
-
-    int mag = (scale * zoom) / ZM_SCALE_BASE;
-    int act_mag = optimisedScaling?(mag > ZM_SCALE_BASE?ZM_SCALE_BASE:mag):mag;
-    Debug( 3, "Scaling by %d, zooming by %d = magnifying by %d(%d)", scale, zoom, mag, act_mag );
-
-    int last_mag = (last_scale * last_zoom) / ZM_SCALE_BASE;
-    int last_act_mag = last_mag > ZM_SCALE_BASE?ZM_SCALE_BASE:last_mag;
-    Debug( 3, "Last scaling by %d, zooming by %d = magnifying by %d(%d)", last_scale, last_zoom, last_mag, last_act_mag );
-
-    int base_image_width = image->Width(), base_image_height = image->Height();
-    Debug( 3, "Base image width = %d, height = %d", base_image_width, base_image_height );
-
-    int virt_image_width = (base_image_width * mag) / ZM_SCALE_BASE, virt_image_height = (base_image_height * mag) / ZM_SCALE_BASE;
-    Debug( 3, "Virtual image width = %d, height = %d", virt_image_width, virt_image_height );
-
-    int last_virt_image_width = (base_image_width * last_mag) / ZM_SCALE_BASE, last_virt_image_height = (base_image_height * last_mag) / ZM_SCALE_BASE;
-    Debug( 3, "Last virtual image width = %d, height = %d", last_virt_image_width, last_virt_image_height );
-
-    int act_image_width = (base_image_width * act_mag ) / ZM_SCALE_BASE, act_image_height = (base_image_height * act_mag ) / ZM_SCALE_BASE;
-    Debug( 3, "Actual image width = %d, height = %d", act_image_width, act_image_height );
-
-    int last_act_image_width = (base_image_width * last_act_mag ) / ZM_SCALE_BASE, last_act_image_height = (base_image_height * last_act_mag ) / ZM_SCALE_BASE;
-    Debug( 3, "Last actual image width = %d, height = %d", last_act_image_width, last_act_image_height );
-
-    int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE;
-    Debug( 3, "Display image width = %d, height = %d", disp_image_width, disp_image_height );
-
-    int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE;
-    Debug( 3, "Last display image width = %d, height = %d", last_disp_image_width, last_disp_image_height );
-
-    int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag;
-    Debug( 3, "Send image width = %d, height = %d", send_image_width, send_image_height );
-
-    int last_send_image_width = (last_disp_image_width * last_act_mag ) / last_mag, last_send_image_height = (last_disp_image_height * last_act_mag ) / last_mag;
-    Debug( 3, "Last send image width = %d, height = %d", last_send_image_width, last_send_image_height );
-
-    if ( mag != ZM_SCALE_BASE )
-    {
-        if ( act_mag != ZM_SCALE_BASE )
-        {
-            Debug( 3, "Magnifying by %d", mag );
-            if ( !image_copied )
-            {
-	            static Image copy_image;
-                copy_image.Assign( *image );
-                image = &copy_image;
-                image_copied = true;
-            }
-            image->Scale( mag );
-        }
-    }
-
-    Debug( 3, "Real image width = %d, height = %d", image->Width(), image->Height() );
-
-    if ( disp_image_width < virt_image_width || disp_image_height < virt_image_height )
-    {
-        static Box last_crop;
-
-        if ( mag != last_mag || x != last_x || y != last_y )
-        {
-            Debug( 3, "Got click at %d,%d x %d", x, y, mag );
-
-            //if ( !last_mag )
-                //last_mag = mag;
-
-            if ( !(last_disp_image_width < last_virt_image_width || last_disp_image_height < last_virt_image_height) )
-                last_crop = Box();
-
-            Debug( 3, "Recalculating crop" );
-            // Recalculate crop parameters, as %ges
-            int click_x = (last_crop.LoX() * 100 ) / last_act_image_width; // Initial crop offset from last image
-            click_x += ( x * 100 ) / last_virt_image_width;
-            int click_y = (last_crop.LoY() * 100 ) / last_act_image_height; // Initial crop offset from last image
-            click_y += ( y * 100 ) / last_virt_image_height;
-            Debug( 3, "Got adjusted click at %d%%,%d%%", click_x, click_y );
-
-            // Convert the click locations to the current image pixels
-            click_x = ( click_x * act_image_width ) / 100;
-            click_y = ( click_y * act_image_height ) / 100;
-            Debug( 3, "Got readjusted click at %d,%d", click_x, click_y );
-
-            int lo_x = click_x - (send_image_width/2);
-            if ( lo_x < 0 )
-                lo_x = 0;
-            int hi_x = lo_x + (send_image_width-1);
-            if ( hi_x >= act_image_width )
-            {
-                hi_x = act_image_width - 1;
-                lo_x = hi_x - (send_image_width - 1);
-            }
-
-            int lo_y = click_y - (send_image_height/2);
-            if ( lo_y < 0 )
-                lo_y = 0;
-            int hi_y = lo_y + (send_image_height-1);
-            if ( hi_y >= act_image_height )
-            {
-                hi_y = act_image_height - 1;
-                lo_y = hi_y - (send_image_height - 1);
-            }
-            last_crop = Box( lo_x, lo_y, hi_x, hi_y );
-        }
-        Debug( 3, "Cropping to %d,%d -> %d,%d", last_crop.LoX(), last_crop.LoY(), last_crop.HiX(), last_crop.HiY() );
-        if ( !image_copied )
-        {
-	        static Image copy_image;
-            copy_image.Assign( *image );
-            image = &copy_image;
-            image_copied = true;
-        }
-        image->Crop( last_crop );
-    }
+  if ( !last_scale )
     last_scale = scale;
+  if ( !last_zoom )
     last_zoom = zoom;
-    last_x = x;
-    last_y = y;
 
-    return( image );
+  // Do not bother to scale zoomed in images, just crop them and let the browser scale
+  // Works in FF2 but breaks FF3 which doesn't like image sizes changing in mid stream.
+  bool optimisedScaling = false;
+
+  bool image_copied = false;
+
+  int mag = (scale * zoom) / ZM_SCALE_BASE;
+  int act_mag = optimisedScaling?(mag > ZM_SCALE_BASE?ZM_SCALE_BASE:mag):mag;
+  Debug( 3, "Scaling by %d, zooming by %d = magnifying by %d(%d)", scale, zoom, mag, act_mag );
+
+  int last_mag = (last_scale * last_zoom) / ZM_SCALE_BASE;
+  int last_act_mag = last_mag > ZM_SCALE_BASE?ZM_SCALE_BASE:last_mag;
+  Debug( 3, "Last scaling by %d, zooming by %d = magnifying by %d(%d)", last_scale, last_zoom, last_mag, last_act_mag );
+
+  int base_image_width = image->Width(), base_image_height = image->Height();
+  Debug( 3, "Base image width = %d, height = %d", base_image_width, base_image_height );
+
+  int virt_image_width = (base_image_width * mag) / ZM_SCALE_BASE, virt_image_height = (base_image_height * mag) / ZM_SCALE_BASE;
+  Debug( 3, "Virtual image width = %d, height = %d", virt_image_width, virt_image_height );
+
+  int last_virt_image_width = (base_image_width * last_mag) / ZM_SCALE_BASE, last_virt_image_height = (base_image_height * last_mag) / ZM_SCALE_BASE;
+  Debug( 3, "Last virtual image width = %d, height = %d", last_virt_image_width, last_virt_image_height );
+
+  int act_image_width = (base_image_width * act_mag ) / ZM_SCALE_BASE, act_image_height = (base_image_height * act_mag ) / ZM_SCALE_BASE;
+  Debug( 3, "Actual image width = %d, height = %d", act_image_width, act_image_height );
+
+  int last_act_image_width = (base_image_width * last_act_mag ) / ZM_SCALE_BASE, last_act_image_height = (base_image_height * last_act_mag ) / ZM_SCALE_BASE;
+  Debug( 3, "Last actual image width = %d, height = %d", last_act_image_width, last_act_image_height );
+
+  int disp_image_width = (image->Width() * scale) / ZM_SCALE_BASE, disp_image_height = (image->Height() * scale) / ZM_SCALE_BASE;
+  Debug( 3, "Display image width = %d, height = %d", disp_image_width, disp_image_height );
+
+  int last_disp_image_width = (image->Width() * last_scale) / ZM_SCALE_BASE, last_disp_image_height = (image->Height() * last_scale) / ZM_SCALE_BASE;
+  Debug( 3, "Last display image width = %d, height = %d", last_disp_image_width, last_disp_image_height );
+
+  int send_image_width = (disp_image_width * act_mag ) / mag, send_image_height = (disp_image_height * act_mag ) / mag;
+  Debug( 3, "Send image width = %d, height = %d", send_image_width, send_image_height );
+
+  int last_send_image_width = (last_disp_image_width * last_act_mag ) / last_mag, last_send_image_height = (last_disp_image_height * last_act_mag ) / last_mag;
+  Debug( 3, "Last send image width = %d, height = %d", last_send_image_width, last_send_image_height );
+
+  if ( mag != ZM_SCALE_BASE )
+  {
+    if ( act_mag != ZM_SCALE_BASE )
+    {
+      Debug( 3, "Magnifying by %d", mag );
+      if ( !image_copied )
+      {
+        static Image copy_image;
+        copy_image.Assign( *image );
+        image = &copy_image;
+        image_copied = true;
+      }
+      image->Scale( mag );
+    }
+  }
+
+  Debug( 3, "Real image width = %d, height = %d", image->Width(), image->Height() );
+
+  if ( disp_image_width < virt_image_width || disp_image_height < virt_image_height )
+  {
+    static Box last_crop;
+
+    if ( mag != last_mag || x != last_x || y != last_y )
+    {
+      Debug( 3, "Got click at %d,%d x %d", x, y, mag );
+
+      //if ( !last_mag )
+        //last_mag = mag;
+
+      if ( !(last_disp_image_width < last_virt_image_width || last_disp_image_height < last_virt_image_height) )
+        last_crop = Box();
+
+      Debug( 3, "Recalculating crop" );
+      // Recalculate crop parameters, as %ges
+      int click_x = (last_crop.LoX() * 100 ) / last_act_image_width; // Initial crop offset from last image
+      click_x += ( x * 100 ) / last_virt_image_width;
+      int click_y = (last_crop.LoY() * 100 ) / last_act_image_height; // Initial crop offset from last image
+      click_y += ( y * 100 ) / last_virt_image_height;
+      Debug( 3, "Got adjusted click at %d%%,%d%%", click_x, click_y );
+
+      // Convert the click locations to the current image pixels
+      click_x = ( click_x * act_image_width ) / 100;
+      click_y = ( click_y * act_image_height ) / 100;
+      Debug( 3, "Got readjusted click at %d,%d", click_x, click_y );
+
+      int lo_x = click_x - (send_image_width/2);
+      if ( lo_x < 0 )
+        lo_x = 0;
+      int hi_x = lo_x + (send_image_width-1);
+      if ( hi_x >= act_image_width )
+      {
+        hi_x = act_image_width - 1;
+        lo_x = hi_x - (send_image_width - 1);
+      }
+
+      int lo_y = click_y - (send_image_height/2);
+      if ( lo_y < 0 )
+        lo_y = 0;
+      int hi_y = lo_y + (send_image_height-1);
+      if ( hi_y >= act_image_height )
+      {
+        hi_y = act_image_height - 1;
+        lo_y = hi_y - (send_image_height - 1);
+      }
+      last_crop = Box( lo_x, lo_y, hi_x, hi_y );
+    }
+    Debug( 3, "Cropping to %d,%d -> %d,%d", last_crop.LoX(), last_crop.LoY(), last_crop.HiX(), last_crop.HiY() );
+    if ( !image_copied )
+    {
+      static Image copy_image;
+      copy_image.Assign( *image );
+      image = &copy_image;
+      image_copied = true;
+    }
+    image->Crop( last_crop );
+  }
+  last_scale = scale;
+  last_zoom = zoom;
+  last_x = x;
+  last_y = y;
+
+  return( image );
 }
 
 bool StreamBase::sendTextFrame( const char *frame_text )
 {
-    Debug( 2, "Sending text frame '%s'", frame_text );
+  Debug( 2, "Sending text frame '%s'", frame_text );
 
-    Image image( monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder() );
-    image.Annotate( frame_text, image.centreCoord( frame_text ) );
+  Image image( monitor->Width(), monitor->Height(), monitor->Colours(), monitor->SubpixelOrder() );
+  image.Annotate( frame_text, image.centreCoord( frame_text ) );
 
-    if ( scale != 100 )
-    {
-        image.Scale( scale );
-    }
+  if ( scale != 100 )
+  {
+    image.Scale( scale );
+  }
 #if HAVE_LIBAVCODEC
-    if ( type == STREAM_MPEG )
+  if ( type == STREAM_MPEG )
+  {
+    if ( !vid_stream )
     {
-        if ( !vid_stream )
-        {
-            vid_stream = new VideoStream( "pipe:", format, bitrate, effective_fps, image.Colours(), image.SubpixelOrder(), image.Width(), image.Height() );
-            fprintf( stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType() );
-            vid_stream->OpenStream();
-        }
-        /* double pts = */ vid_stream->EncodeFrame( image.Buffer(), image.Size() );
+      vid_stream = new VideoStream( "pipe:", format, bitrate, effective_fps, image.Colours(), image.SubpixelOrder(), image.Width(), image.Height() );
+      fprintf( stdout, "Content-type: %s\r\n\r\n", vid_stream->MimeType() );
+      vid_stream->OpenStream();
     }
-    else
+    /* double pts = */ vid_stream->EncodeFrame( image.Buffer(), image.Size() );
+  }
+  else
 #endif // HAVE_LIBAVCODEC
+  {
+    static unsigned char buffer[ZM_MAX_IMAGE_SIZE];
+    int n_bytes = 0;
+
+    image.EncodeJpeg( buffer, &n_bytes );
+
+    fprintf( stdout, "--ZoneMinderFrame\r\n" );
+    fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
+    fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
+    if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
     {
-        static unsigned char buffer[ZM_MAX_IMAGE_SIZE];
-        int n_bytes = 0;
-
-        image.EncodeJpeg( buffer, &n_bytes );
-
-        fprintf( stdout, "--ZoneMinderFrame\r\n" );
-        fprintf( stdout, "Content-Length: %d\r\n", n_bytes );
-        fprintf( stdout, "Content-Type: image/jpeg\r\n\r\n" );
-        if ( fwrite( buffer, n_bytes, 1, stdout ) != 1 )
-        {
-            Error( "Unable to send stream text frame: %s", strerror(errno) );
-            return( false );
-        }
-        fprintf( stdout, "\r\n\r\n" );
-        fflush( stdout );
+      Error( "Unable to send stream text frame: %s", strerror(errno) );
+      return( false );
     }
-    last_frame_sent = TV_2_FLOAT( now );
-    return( true );
+    fprintf( stdout, "\r\n\r\n" );
+    fflush( stdout );
+  }
+  last_frame_sent = TV_2_FLOAT( now );
+  return( true );
 }
 
 void StreamBase::openComms()
 {
-    if ( connkey > 0 )
+  if ( connkey > 0 )
+  {
+
+    snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
+
+    lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
+    if ( lock_fd <= 0 )
     {
-
-		snprintf( sock_path_lock, sizeof(sock_path_lock), "%s/zms-%06d.lock", config.path_socks, connkey);
-
-        lock_fd = open(sock_path_lock, O_CREAT|O_WRONLY, S_IRUSR | S_IWUSR);
-        if (lock_fd <= 0 || flock(lock_fd, LOCK_EX) != 0)
-        {
-            Error("Unable to lock sock lock file %s: %s", sock_path_lock, strerror(errno) );
-
-            close(lock_fd);
-            lock_fd = 0;
-        }
-        else
-        {
-            Debug( 1, "We have obtained a lock on %s fd: %d", sock_path_lock, lock_fd);
-        }
-
-
-        sd = socket( AF_UNIX, SOCK_DGRAM, 0 );
-        if ( sd < 0 )
-        {
-            Fatal( "Can't create socket: %s", strerror(errno) );
-        }
-
-        snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", config.path_socks, connkey );
-        unlink( loc_sock_path );
-
-        strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
-        loc_addr.sun_family = AF_UNIX;
-        if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)) < 0 )
-        {
-            Fatal( "Can't bind: %s", strerror(errno) );
-        }
-
-        snprintf( rem_sock_path, sizeof(rem_sock_path), "%s/zms-%06dw.sock", config.path_socks, connkey );
-        strncpy( rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path) );
-        rem_addr.sun_family = AF_UNIX;
+      Error("Unable to open sock lock file %s: %s", sock_path_lock, strerror(errno) );
+      lock_fd = 0;
     }
+    else if ( flock(lock_fd, LOCK_EX) != 0 )
+    {
+      Error("Unable to lock sock lock file %s: %s", sock_path_lock, strerror(errno) );
+
+      close(lock_fd);
+      lock_fd = 0;
+    }
+    else
+    {
+      Debug( 1, "We have obtained a lock on %s fd: %d", sock_path_lock, lock_fd);
+    }
+
+
+    sd = socket( AF_UNIX, SOCK_DGRAM, 0 );
+    if ( sd < 0 )
+    {
+      Fatal( "Can't create socket: %s", strerror(errno) );
+    }
+
+    snprintf( loc_sock_path, sizeof(loc_sock_path), "%s/zms-%06ds.sock", config.path_socks, connkey );
+    unlink( loc_sock_path );
+
+    strncpy( loc_addr.sun_path, loc_sock_path, sizeof(loc_addr.sun_path) );
+    loc_addr.sun_family = AF_UNIX;
+    if ( bind( sd, (struct sockaddr *)&loc_addr, strlen(loc_addr.sun_path)+sizeof(loc_addr.sun_family)) < 0 )
+    {
+      Fatal( "Can't bind: %s", strerror(errno) );
+    }
+
+    snprintf( rem_sock_path, sizeof(rem_sock_path), "%s/zms-%06dw.sock", config.path_socks, connkey );
+    strncpy( rem_addr.sun_path, rem_sock_path, sizeof(rem_addr.sun_path) );
+    rem_addr.sun_family = AF_UNIX;
+  }
 }
 
 void StreamBase::closeComms()
 {
-    if ( connkey > 0 )
+  if ( connkey > 0 )
+  {
+    if ( sd >= 0 )
     {
-        if ( sd >= 0 )
-        {
-            close( sd );
-            sd = -1;
-        }
-        if ( loc_sock_path[0] )
-        {
-            unlink( loc_sock_path );
-        }
-		if (lock_fd > 0)
-		{
-			close(lock_fd); //close it rather than unlock it incase it got deleted.
-			unlink(sock_path_lock);
-		}
+      close( sd );
+      sd = -1;
     }
+    if ( loc_sock_path[0] )
+    {
+      unlink( loc_sock_path );
+    }
+    if (lock_fd > 0)
+    {
+      close(lock_fd); //close it rather than unlock it incase it got deleted.
+      unlink(sock_path_lock);
+    }
+  }
 }
 
diff --git a/src/zm_stream.h b/src/zm_stream.h
index 4f6442725..c7df53d16 100644
--- a/src/zm_stream.h
+++ b/src/zm_stream.h
@@ -33,149 +33,149 @@ class Monitor;
 class StreamBase
 {
 public:
-    typedef enum { STREAM_JPEG, STREAM_RAW, STREAM_ZIP, STREAM_SINGLE, STREAM_MPEG } StreamType;
+  typedef enum { STREAM_JPEG, STREAM_RAW, STREAM_ZIP, STREAM_SINGLE, STREAM_MPEG } StreamType;
 
 protected:
-    static const int MAX_STREAM_DELAY = 5; // Seconds
+  static const int MAX_STREAM_DELAY = 5; // Seconds
 
-    static const StreamType DEFAULT_TYPE = STREAM_JPEG;
-    enum { DEFAULT_RATE=ZM_RATE_BASE };
-    enum { DEFAULT_SCALE=ZM_SCALE_BASE };
-    enum { DEFAULT_ZOOM=ZM_SCALE_BASE };
-    enum { DEFAULT_MAXFPS=10 };
-    enum { DEFAULT_BITRATE=100000 };
+  static const StreamType DEFAULT_TYPE = STREAM_JPEG;
+  enum { DEFAULT_RATE=ZM_RATE_BASE };
+  enum { DEFAULT_SCALE=ZM_SCALE_BASE };
+  enum { DEFAULT_ZOOM=ZM_SCALE_BASE };
+  enum { DEFAULT_MAXFPS=10 };
+  enum { DEFAULT_BITRATE=100000 };
 
 protected:
-    typedef struct {
-        int msg_type;
-        char msg_data[16];
-    } CmdMsg;
+  typedef struct {
+    int msg_type;
+    char msg_data[16];
+  } CmdMsg;
 
-    typedef struct {
-        int msg_type;
-        char msg_data[256];
-    } DataMsg;
+  typedef struct {
+    int msg_type;
+    char msg_data[256];
+  } DataMsg;
 
-    typedef enum { MSG_CMD=1, MSG_DATA_WATCH, MSG_DATA_EVENT } MsgType;
-    typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUIT, CMD_QUERY=99 } MsgCommand;
+  typedef enum { MSG_CMD=1, MSG_DATA_WATCH, MSG_DATA_EVENT } MsgType;
+  typedef enum { CMD_NONE=0, CMD_PAUSE, CMD_PLAY, CMD_STOP, CMD_FASTFWD, CMD_SLOWFWD, CMD_SLOWREV, CMD_FASTREV, CMD_ZOOMIN, CMD_ZOOMOUT, CMD_PAN, CMD_SCALE, CMD_PREV, CMD_NEXT, CMD_SEEK, CMD_VARPLAY, CMD_GET_IMAGE, CMD_QUIT, CMD_QUERY=99 } MsgCommand;
 
 protected:
-    Monitor *monitor;
+  Monitor *monitor;
 
-    StreamType type;
-    const char *format;
-    int replay_rate;
-    int scale;
-    int zoom;
-    double maxfps;
-    int bitrate;
-    unsigned short x, y;
+  StreamType type;
+  const char *format;
+  int replay_rate;
+  int scale;
+  int zoom;
+  double maxfps;
+  int bitrate;
+  unsigned short x, y;
 
 protected:
-    int connkey;
-    int sd;
-	char loc_sock_path[PATH_MAX];
-    struct sockaddr_un loc_addr;
-	char rem_sock_path[PATH_MAX];
-    struct sockaddr_un rem_addr;
-	char sock_path_lock[PATH_MAX];
-	int lock_fd;
+  int connkey;
+  int sd;
+  char loc_sock_path[PATH_MAX];
+  struct sockaddr_un loc_addr;
+  char rem_sock_path[PATH_MAX];
+  struct sockaddr_un rem_addr;
+  char sock_path_lock[PATH_MAX];
+  int lock_fd;
 
 protected:
-    bool paused;
-    int step;
+  bool paused;
+  int step;
 
-    struct timeval now;
+  struct timeval now;
 
-    double base_fps;
-    double effective_fps;
-    int frame_mod;
+  double base_fps;
+  double effective_fps;
+  int frame_mod;
 
-    double last_frame_sent;
-    struct timeval last_frame_timestamp;
+  double last_frame_sent;
+  struct timeval last_frame_timestamp;
 
-#if HAVE_LIBAVCODEC     
-    VideoStream *vid_stream;
-#endif // HAVE_LIBAVCODEC     
+#if HAVE_LIBAVCODEC   
+  VideoStream *vid_stream;
+#endif // HAVE_LIBAVCODEC   
 
-    CmdMsg msg;
+  CmdMsg msg;
 
 protected:
-    bool loadMonitor( int monitor_id );
-    bool checkInitialised();
-    void updateFrameRate( double fps );
-    Image *prepareImage( Image *image );
-    bool sendTextFrame( const char *text );
-    bool checkCommandQueue();
-    virtual void processCommand( const CmdMsg *msg )=0;
+  bool loadMonitor( int monitor_id );
+  bool checkInitialised();
+  void updateFrameRate( double fps );
+  Image *prepareImage( Image *image );
+  bool sendTextFrame( const char *text );
+  bool checkCommandQueue();
+  virtual void processCommand( const CmdMsg *msg )=0;
 
 public:
-    StreamBase()
-    {
-        monitor = 0;
+  StreamBase()
+  {
+    monitor = 0;
 
-        type = DEFAULT_TYPE;
-        format = "";
-        replay_rate = DEFAULT_RATE;
-        scale = DEFAULT_SCALE;
-        zoom = DEFAULT_ZOOM;
-        maxfps = DEFAULT_MAXFPS;
-        bitrate = DEFAULT_BITRATE;
+    type = DEFAULT_TYPE;
+    format = "";
+    replay_rate = DEFAULT_RATE;
+    scale = DEFAULT_SCALE;
+    zoom = DEFAULT_ZOOM;
+    maxfps = DEFAULT_MAXFPS;
+    bitrate = DEFAULT_BITRATE;
 
-        paused = false;
-        step = 0;
-        x = 0;
-        y = 0;
+    paused = false;
+    step = 0;
+    x = 0;
+    y = 0;
 
-        connkey = 0;
-        sd = -1;
-		lock_fd = 0;
-        memset( &loc_sock_path, 0, sizeof(loc_sock_path) );
-        memset( &loc_addr, 0, sizeof(loc_addr) );
-        memset( &rem_sock_path, 0, sizeof(rem_sock_path) );
-        memset( &rem_addr, 0, sizeof(rem_addr) );
+    connkey = 0;
+    sd = -1;
+    lock_fd = 0;
+    memset( &loc_sock_path, 0, sizeof(loc_sock_path) );
+    memset( &loc_addr, 0, sizeof(loc_addr) );
+    memset( &rem_sock_path, 0, sizeof(rem_sock_path) );
+    memset( &rem_addr, 0, sizeof(rem_addr) );
 
-        base_fps = 0.0;
-        effective_fps = 0.0;
-        frame_mod = 1;
+    base_fps = 0.0;
+    effective_fps = 0.0;
+    frame_mod = 1;
 
-#if HAVE_LIBAVCODEC     
-        vid_stream = 0;
-#endif // HAVE_LIBAVCODEC     
-    }
-    virtual ~StreamBase();
+#if HAVE_LIBAVCODEC   
+    vid_stream = 0;
+#endif // HAVE_LIBAVCODEC   
+  }
+  virtual ~StreamBase();
 
-	void setStreamType( StreamType p_type )
-    {
-        type = p_type;
-    }
-	void setStreamFormat( const char *p_format )
-    {
-        format = p_format;
-    }
-	void setStreamScale( int p_scale )
-    {
-        scale = p_scale;
-    }
-	void setStreamReplayRate( int p_rate )
-    {
-        replay_rate = p_rate;
-    }
-	void setStreamMaxFPS( double p_maxfps )
-    {
-        maxfps = p_maxfps;
-    }
-	void setStreamBitrate( int p_bitrate )
-    {
-        bitrate = p_bitrate;
-    }
-	void setStreamQueue( int p_connkey )
-    {
-        connkey = p_connkey;
-    }
-    virtual void openComms();
-    virtual void closeComms();
-    virtual void runStream()=0;
+  void setStreamType( StreamType p_type )
+  {
+    type = p_type;
+  }
+  void setStreamFormat( const char *p_format )
+  {
+    format = p_format;
+  }
+  void setStreamScale( int p_scale )
+  {
+    scale = p_scale;
+  }
+  void setStreamReplayRate( int p_rate )
+  {
+    replay_rate = p_rate;
+  }
+  void setStreamMaxFPS( double p_maxfps )
+  {
+    maxfps = p_maxfps;
+  }
+  void setStreamBitrate( int p_bitrate )
+  {
+    bitrate = p_bitrate;
+  }
+  void setStreamQueue( int p_connkey )
+  {
+    connkey = p_connkey;
+  }
+  virtual void openComms();
+  virtual void closeComms();
+  virtual void runStream()=0;
 };
 
 #endif // ZM_STREAM_H
diff --git a/src/zm_thread.cpp b/src/zm_thread.cpp
index 09cf0da3f..7d84037d9 100644
--- a/src/zm_thread.cpp
+++ b/src/zm_thread.cpp
@@ -29,311 +29,310 @@
 
 struct timespec getTimeout( int secs )
 {
-    struct timespec timeout;
-    struct timeval temp_timeout;
-    gettimeofday( &temp_timeout, 0 );
-    timeout.tv_sec = temp_timeout.tv_sec + secs;
-    timeout.tv_nsec = temp_timeout.tv_usec*1000;
-    return( timeout );
+  struct timespec timeout;
+  struct timeval temp_timeout;
+  gettimeofday( &temp_timeout, 0 );
+  timeout.tv_sec = temp_timeout.tv_sec + secs;
+  timeout.tv_nsec = temp_timeout.tv_usec*1000;
+  return( timeout );
 }
 
 struct timespec getTimeout( double secs )
 {
-    struct timespec timeout;
-    struct timeval temp_timeout;
-    gettimeofday( &temp_timeout, 0 );
-    timeout.tv_sec = temp_timeout.tv_sec + int(secs);
-    timeout.tv_nsec = temp_timeout.tv_usec += (long int)(1000000000.0*(secs-int(secs)));
-    if ( timeout.tv_nsec > 1000000000 )
-    {
-        timeout.tv_sec += 1;
-        timeout.tv_nsec -= 1000000000;
-    }
-    return( timeout );
+  struct timespec timeout;
+  struct timeval temp_timeout;
+  gettimeofday( &temp_timeout, 0 );
+  timeout.tv_sec = temp_timeout.tv_sec + int(secs);
+  timeout.tv_nsec = temp_timeout.tv_usec += (long int)(1000000000.0*(secs-int(secs)));
+  if ( timeout.tv_nsec > 1000000000 )
+  {
+    timeout.tv_sec += 1;
+    timeout.tv_nsec -= 1000000000;
+  }
+  return( timeout );
 }
 
 Mutex::Mutex()
 {
-    if ( pthread_mutex_init( &mMutex, NULL ) < 0 )
-        throw ThreadException( stringtf( "Unable to create pthread mutex: %s", strerror(errno) ) );
+  if ( pthread_mutex_init( &mMutex, NULL ) < 0 )
+    throw ThreadException( stringtf( "Unable to create pthread mutex: %s", strerror(errno) ) );
 }
 
 Mutex::~Mutex()
 {
-    if ( locked() )
-        Warning( "Destroying mutex when locked" );
-    if ( pthread_mutex_destroy( &mMutex ) < 0 )
-        throw ThreadException( stringtf( "Unable to destroy pthread mutex: %s", strerror(errno) ) );
+  if ( locked() )
+    Warning( "Destroying mutex when locked" );
+  if ( pthread_mutex_destroy( &mMutex ) < 0 )
+    throw ThreadException( stringtf( "Unable to destroy pthread mutex: %s", strerror(errno) ) );
 }
 
 void Mutex::lock()
 {
-    if ( pthread_mutex_lock( &mMutex ) < 0 )
-        throw ThreadException( stringtf( "Unable to lock pthread mutex: %s", strerror(errno) ) );
+  if ( pthread_mutex_lock( &mMutex ) < 0 )
+    throw ThreadException( stringtf( "Unable to lock pthread mutex: %s", strerror(errno) ) );
 }
 
 void Mutex::lock( int secs )
 {
-    struct timespec timeout = getTimeout( secs );
-    if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
-        throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
+  struct timespec timeout = getTimeout( secs );
+  if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
+    throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
 }
 
 void Mutex::lock( double secs )
 {
-    struct timespec timeout = getTimeout( secs );
-    if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
-        throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
+  struct timespec timeout = getTimeout( secs );
+  if ( pthread_mutex_timedlock( &mMutex, &timeout ) < 0 )
+    throw ThreadException( stringtf( "Unable to timedlock pthread mutex: %s", strerror(errno) ) );
 }
 
 void Mutex::unlock()
 {
-    if ( pthread_mutex_unlock( &mMutex ) < 0 )
-        throw ThreadException( stringtf( "Unable to unlock pthread mutex: %s", strerror(errno) ) );
+  if ( pthread_mutex_unlock( &mMutex ) < 0 )
+    throw ThreadException( stringtf( "Unable to unlock pthread mutex: %s", strerror(errno) ) );
 }
 
 bool Mutex::locked()
 {
-    int state = pthread_mutex_trylock( &mMutex );
-    if ( state != 0 && state != EBUSY )
-        throw ThreadException( stringtf( "Unable to trylock pthread mutex: %s", strerror(errno) ) );
-    if ( state != EBUSY )
-        unlock();
-    return( state == EBUSY );
+  int state = pthread_mutex_trylock( &mMutex );
+  if ( state != 0 && state != EBUSY )
+    throw ThreadException( stringtf( "Unable to trylock pthread mutex: %s", strerror(errno) ) );
+  if ( state != EBUSY )
+    unlock();
+  return( state == EBUSY );
 }
 
 Condition::Condition( Mutex &mutex ) : mMutex( mutex )
 {
-    if ( pthread_cond_init( &mCondition, NULL ) < 0 )
-        throw ThreadException( stringtf( "Unable to create pthread condition: %s", strerror(errno) ) );
+  if ( pthread_cond_init( &mCondition, NULL ) < 0 )
+    throw ThreadException( stringtf( "Unable to create pthread condition: %s", strerror(errno) ) );
 }
 
 Condition::~Condition()
 {
-    if ( pthread_cond_destroy( &mCondition ) < 0 )
-        throw ThreadException( stringtf( "Unable to destroy pthread condition: %s", strerror(errno) ) );
+  if ( pthread_cond_destroy( &mCondition ) < 0 )
+    throw ThreadException( stringtf( "Unable to destroy pthread condition: %s", strerror(errno) ) );
 }
 
 void Condition::wait()
 {
-    // Locking done outside of this function
-    if ( pthread_cond_wait( &mCondition, mMutex.getMutex() ) < 0 )
-        throw ThreadException( stringtf( "Unable to wait pthread condition: %s", strerror(errno) ) );
+  // Locking done outside of this function
+  if ( pthread_cond_wait( &mCondition, mMutex.getMutex() ) < 0 )
+    throw ThreadException( stringtf( "Unable to wait pthread condition: %s", strerror(errno) ) );
 }
 
 bool Condition::wait( int secs )
 {
-    // Locking done outside of this function
-    Debug( 8, "Waiting for %d seconds", secs );
-    struct timespec timeout = getTimeout( secs );
-    if ( pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0 && errno != ETIMEDOUT )
-        throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
-    return( errno != ETIMEDOUT );
+  // Locking done outside of this function
+  Debug( 8, "Waiting for %d seconds", secs );
+  struct timespec timeout = getTimeout( secs );
+  if ( pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0 && errno != ETIMEDOUT )
+    throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
+  return( errno != ETIMEDOUT );
 }
 
 bool Condition::wait( double secs )
 {
-    // Locking done outside of this function
-    struct timespec timeout = getTimeout( secs );
-    if ( pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0 && errno != ETIMEDOUT )
-        throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
-    return( errno != ETIMEDOUT );
+  // Locking done outside of this function
+  struct timespec timeout = getTimeout( secs );
+  if ( pthread_cond_timedwait( &mCondition, mMutex.getMutex(), &timeout ) < 0 && errno != ETIMEDOUT )
+    throw ThreadException( stringtf( "Unable to timedwait pthread condition: %s", strerror(errno) ) );
+  return( errno != ETIMEDOUT );
 }
 
 void Condition::signal()
 {
-    if ( pthread_cond_signal( &mCondition ) < 0 )
-        throw ThreadException( stringtf( "Unable to signal pthread condition: %s", strerror(errno) ) );
+  if ( pthread_cond_signal( &mCondition ) < 0 )
+    throw ThreadException( stringtf( "Unable to signal pthread condition: %s", strerror(errno) ) );
 }
 
 void Condition::broadcast()
 {
-    if ( pthread_cond_broadcast( &mCondition ) < 0 )
-        throw ThreadException( stringtf( "Unable to broadcast pthread condition: %s", strerror(errno) ) );
+  if ( pthread_cond_broadcast( &mCondition ) < 0 )
+    throw ThreadException( stringtf( "Unable to broadcast pthread condition: %s", strerror(errno) ) );
 }
 
 template <class T> const T ThreadData<T>::getValue() const
 {
-    mMutex.lock();
-    const T valueCopy = mValue;
-    mMutex.unlock();
-    return( valueCopy );
+  mMutex.lock();
+  const T valueCopy = mValue;
+  mMutex.unlock();
+  return( valueCopy );
 }
 
 template <class T> T ThreadData<T>::setValue( const T value )
 {
-    mMutex.lock();
-    const T valueCopy = mValue = value;
-    mMutex.unlock();
-    return( valueCopy );
+  mMutex.lock();
+  const T valueCopy = mValue = value;
+  mMutex.unlock();
+  return( valueCopy );
 }
 
 template <class T> const T ThreadData<T>::getUpdatedValue() const
 {
-    Debug( 8, "Waiting for value update, %p", this );
-    mMutex.lock();
-    mChanged = false;
-    //do {
-        mCondition.wait();
-    //} while ( !mChanged );
-    const T valueCopy = mValue;
-    mMutex.unlock();
-    Debug( 9, "Got value update, %p", this );
-    return( valueCopy );
+  Debug( 8, "Waiting for value update, %p", this );
+  mMutex.lock();
+  mChanged = false;
+  //do {
+    mCondition.wait();
+  //} while ( !mChanged );
+  const T valueCopy = mValue;
+  mMutex.unlock();
+  Debug( 9, "Got value update, %p", this );
+  return( valueCopy );
 }
 
 template <class T> const T ThreadData<T>::getUpdatedValue( double secs ) const
 {
-    Debug( 8, "Waiting for value update, %.2f secs, %p", secs, this );
-    mMutex.lock();
-    mChanged = false;
-    //do {
-        mCondition.wait( secs );
-    //} while ( !mChanged );
-    const T valueCopy = mValue;
-    mMutex.unlock();
-    Debug( 9, "Got value update, %p", this );
-    return( valueCopy );
+  Debug( 8, "Waiting for value update, %.2f secs, %p", secs, this );
+  mMutex.lock();
+  mChanged = false;
+  //do {
+    mCondition.wait( secs );
+  //} while ( !mChanged );
+  const T valueCopy = mValue;
+  mMutex.unlock();
+  Debug( 9, "Got value update, %p", this );
+  return( valueCopy );
 }
 
 template <class T> const T ThreadData<T>::getUpdatedValue( int secs ) const
 {
-    Debug( 8, "Waiting for value update, %d secs, %p", secs, this );
-    mMutex.lock();
-    mChanged = false;
-    //do {
-        mCondition.wait( secs );
-    //} while ( !mChanged );
-    const T valueCopy = mValue;
-    mMutex.unlock();
-    Debug( 9, "Got value update, %p", this );
-    return( valueCopy );
+  Debug( 8, "Waiting for value update, %d secs, %p", secs, this );
+  mMutex.lock();
+  mChanged = false;
+  //do {
+    mCondition.wait( secs );
+  //} while ( !mChanged );
+  const T valueCopy = mValue;
+  mMutex.unlock();
+  Debug( 9, "Got value update, %p", this );
+  return( valueCopy );
 }
 
 template <class T> void ThreadData<T>::updateValueSignal( const T value )
 {
-    Debug( 8, "Updating value with signal, %p", this );
-    mMutex.lock();
-    mValue = value;
-    mChanged = true;
-    mCondition.signal();
-    mMutex.unlock();
-    Debug( 9, "Updated value, %p", this );
+  Debug( 8, "Updating value with signal, %p", this );
+  mMutex.lock();
+  mValue = value;
+  mChanged = true;
+  mCondition.signal();
+  mMutex.unlock();
+  Debug( 9, "Updated value, %p", this );
 }
 
 template <class T> void ThreadData<T>::updateValueBroadcast( const T value )
 {
-    Debug( 8, "Updating value with broadcast, %p", this );
-    mMutex.lock();
-    mValue = value;
-    mChanged = true;
-    mCondition.broadcast();
-    mMutex.unlock();
-    Debug( 9, "Updated value, %p", this );
+  Debug( 8, "Updating value with broadcast, %p", this );
+  mMutex.lock();
+  mValue = value;
+  mChanged = true;
+  mCondition.broadcast();
+  mMutex.unlock();
+  Debug( 9, "Updated value, %p", this );
 }
 
 Thread::Thread() :
-    mThreadCondition( mThreadMutex ),
-    mPid( -1 ),
-    mStarted( false ),
-    mRunning( false )
+  mThreadCondition( mThreadMutex ),
+  mPid( -1 ),
+  mStarted( false ),
+  mRunning( false )
 {
-    Debug( 1, "Creating thread" );
+  Debug( 1, "Creating thread" );
 }
 
 Thread::~Thread()
 {
-    Debug( 1, "Destroying thread %d", mPid );
-    if ( mStarted )
-        join();
+  Debug( 1, "Destroying thread %d", mPid );
+  if ( mStarted )
+    join();
 }
 
 void *Thread::mThreadFunc( void *arg )
 {
-    Debug( 2, "Invoking thread" );
+  Debug( 2, "Invoking thread" );
 
-    Thread *thisPtr = (Thread *)arg;
-    void *status = 0;
-    try
-    {
-        thisPtr->mThreadMutex.lock();
-        thisPtr->mPid = thisPtr->id();
-        thisPtr->mThreadCondition.signal();
-        thisPtr->mThreadMutex.unlock();
-        thisPtr->mRunning = true;
-        int run=(thisPtr->run());
-        status = (void *)&run;
-        thisPtr->mRunning = false;
-        Debug( 2, "Exiting thread, status %p", status );
-    }
-    catch ( const ThreadException &e )
-    {
-        Error( "%s", e.getMessage().c_str() );
-        thisPtr->mRunning = false;
-        status = (void *)-1;
-        Debug( 2, "Exiting thread after exception, status %p", status );
-    }
-    return( status );
+  Thread *thisPtr = (Thread *)arg;
+  thisPtr->status = 0;
+  try
+  {
+    thisPtr->mThreadMutex.lock();
+    thisPtr->mPid = thisPtr->id();
+    thisPtr->mThreadCondition.signal();
+    thisPtr->mThreadMutex.unlock();
+    thisPtr->mRunning = true;
+    thisPtr->status = thisPtr->run();
+    thisPtr->mRunning = false;
+    Debug( 2, "Exiting thread, status %p", (void *)&(thisPtr->status) );
+    return (void *)&(thisPtr->status);
+  }
+  catch ( const ThreadException &e )
+  {
+    Error( "%s", e.getMessage().c_str() );
+    thisPtr->mRunning = false;
+    Debug( 2, "Exiting thread after exception, status %p", (void *)-1 );
+    return (void *)-1;
+  }
 }
 
 void Thread::start()
 {
-    Debug( 1, "Starting thread" );
-    if ( isThread() )
-        throw ThreadException( "Can't self start thread" );
-    mThreadMutex.lock();
-    if ( !mStarted )
-    {
-        pthread_attr_t threadAttrs;
-        pthread_attr_init( &threadAttrs );
-        pthread_attr_setscope( &threadAttrs, PTHREAD_SCOPE_SYSTEM );
+  Debug( 1, "Starting thread" );
+  if ( isThread() )
+    throw ThreadException( "Can't self start thread" );
+  mThreadMutex.lock();
+  if ( !mStarted )
+  {
+    pthread_attr_t threadAttrs;
+    pthread_attr_init( &threadAttrs );
+    pthread_attr_setscope( &threadAttrs, PTHREAD_SCOPE_SYSTEM );
 
-        mStarted = true;
-        if ( pthread_create( &mThread, &threadAttrs, mThreadFunc, this ) < 0 )
-            throw ThreadException( stringtf( "Can't create thread: %s", strerror(errno) ) );
-        pthread_attr_destroy( &threadAttrs );
-    }
-    else
-    {
-        Error( "Attempt to start already running thread %d", mPid );
-    }
-    mThreadCondition.wait();
-    mThreadMutex.unlock();
-    Debug( 1, "Started thread %d", mPid );
+    mStarted = true;
+    if ( pthread_create( &mThread, &threadAttrs, mThreadFunc, this ) < 0 )
+      throw ThreadException( stringtf( "Can't create thread: %s", strerror(errno) ) );
+    pthread_attr_destroy( &threadAttrs );
+  }
+  else
+  {
+    Error( "Attempt to start already running thread %d", mPid );
+  }
+  mThreadCondition.wait();
+  mThreadMutex.unlock();
+  Debug( 1, "Started thread %d", mPid );
 }
 
 void Thread::join()
 {
-    Debug( 1, "Joining thread %d", mPid );
-    if ( isThread() )
-        throw ThreadException( "Can't self join thread" );
-    mThreadMutex.lock();
-    if ( mPid >= 0 )
+  Debug( 1, "Joining thread %d", mPid );
+  if ( isThread() )
+    throw ThreadException( "Can't self join thread" );
+  mThreadMutex.lock();
+  if ( mPid >= 0 )
+  {
+    if ( mStarted )
     {
-        if ( mStarted )
-        {
-            void *threadStatus = 0;
-            if ( pthread_join( mThread, &threadStatus ) < 0 )
-                throw ThreadException( stringtf( "Can't join sender thread: %s", strerror(errno) ) );
-            mStarted = false;
-            Debug( 1, "Thread %d exited, status %p", mPid, threadStatus );
-        }
-        else
-        {
-            Warning( "Attempt to join already finished thread %d", mPid );
-        }
+      void *threadStatus = 0;
+      if ( pthread_join( mThread, &threadStatus ) < 0 )
+        throw ThreadException( stringtf( "Can't join sender thread: %s", strerror(errno) ) );
+      mStarted = false;
+      Debug( 1, "Thread %d exited, status %p", mPid, threadStatus );
     }
     else
     {
-        Warning( "Attempt to join non-started thread %d", mPid );
+      Warning( "Attempt to join already finished thread %d", mPid );
     }
-    mThreadMutex.unlock();
-    Debug( 1, "Joined thread %d", mPid );
+  }
+  else
+  {
+    Warning( "Attempt to join non-started thread %d", mPid );
+  }
+  mThreadMutex.unlock();
+  Debug( 1, "Joined thread %d", mPid );
 }
 
 void Thread::kill( int signal )
 {
-    pthread_kill( mThread, signal );
+  pthread_kill( mThread, signal );
 }
 
 // Some explicit template instantiations
diff --git a/src/zm_thread.h b/src/zm_thread.h
index 615bec6aa..15c13bb17 100644
--- a/src/zm_thread.h
+++ b/src/zm_thread.h
@@ -36,27 +36,27 @@ class ThreadException : public Exception
 {
 private:
 #ifndef SOLARIS
-pid_t pid() {
+  pid_t pid() {
     pid_t tid; 
 #ifdef __FreeBSD__ 
     long lwpid; 
     thr_self(&lwpid); 
     tid = lwpid; 
 #else 
-    #ifdef __FreeBSD_kernel__
-        if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
-    # else
-        tid=syscall(SYS_gettid); 
-    #endif
+  #ifdef __FreeBSD_kernel__
+    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+  # else
+    tid=syscall(SYS_gettid); 
+  #endif
 #endif
     return tid;
-}	
+  }  
 #else
-pthread_t pid() { return( pthread_self() ); }
+  pthread_t pid() { return( pthread_self() ); }
 #endif
 public:
-    ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) ) {
-    }
+  ThreadException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) ) {
+  }
 };
 
 class Mutex
@@ -64,214 +64,215 @@ class Mutex
 friend class Condition;
 
 private:
-    pthread_mutex_t mMutex;
+  pthread_mutex_t mMutex;
 
 public:
-    Mutex();
-    ~Mutex();
+  Mutex();
+  ~Mutex();
 
 private:
-    pthread_mutex_t *getMutex()
-    {
-        return( &mMutex );
-    }
+  pthread_mutex_t *getMutex()
+  {
+    return( &mMutex );
+  }
 
 public:
-    void lock();
-    void lock( int secs );
-    void lock( double secs );
-    void unlock();
-    bool locked();
+  void lock();
+  void lock( int secs );
+  void lock( double secs );
+  void unlock();
+  bool locked();
 };
 
 class ScopedMutex
 {
 private:
-    Mutex &mMutex;
+  Mutex &mMutex;
 
 public:
-    ScopedMutex( Mutex &mutex ) : mMutex( mutex )
-    {
-        mMutex.lock();
-    }
-    ~ScopedMutex()
-    {
-        mMutex.unlock();
-    }
+  ScopedMutex( Mutex &mutex ) : mMutex( mutex )
+  {
+    mMutex.lock();
+  }
+  ~ScopedMutex()
+  {
+    mMutex.unlock();
+  }
 
 private:
-    ScopedMutex( const ScopedMutex & );
+  ScopedMutex( const ScopedMutex & );
 };
 
 class Condition
 {
 private:
-    Mutex &mMutex;
-    pthread_cond_t mCondition;
+  Mutex &mMutex;
+  pthread_cond_t mCondition;
 
 public:
-    Condition( Mutex &mutex );
-    ~Condition();
+  Condition( Mutex &mutex );
+  ~Condition();
 
-    void wait();
-    bool wait( int secs );
-    bool wait( double secs );
-    void signal();
-    void broadcast();
+  void wait();
+  bool wait( int secs );
+  bool wait( double secs );
+  void signal();
+  void broadcast();
 };
 
 class Semaphore : public Condition
 {
 private:
-    Mutex mMutex;
+  Mutex mMutex;
 
 public:
-    Semaphore() : Condition( mMutex )
-    {
-    }
+  Semaphore() : Condition( mMutex )
+  {
+  }
 
-    void wait()
-    {
-        mMutex.lock();
-        Condition::wait();
-        mMutex.unlock();
-    }
-    bool wait( int secs )
-    {
-        mMutex.lock();
-        bool result = Condition::wait( secs );
-        mMutex.unlock();
-        return( result );
-    }
-    bool wait( double secs )
-    {
-        mMutex.lock();
-        bool result = Condition::wait( secs );
-        mMutex.unlock();
-        return( result );
-    }
-    void signal()
-    {
-        mMutex.lock();
-        Condition::signal();
-        mMutex.unlock();
-    }
-    void broadcast()
-    {
-        mMutex.lock();
-        Condition::broadcast();
-        mMutex.unlock();
-    }
+  void wait()
+  {
+    mMutex.lock();
+    Condition::wait();
+    mMutex.unlock();
+  }
+  bool wait( int secs )
+  {
+    mMutex.lock();
+    bool result = Condition::wait( secs );
+    mMutex.unlock();
+    return( result );
+  }
+  bool wait( double secs )
+  {
+    mMutex.lock();
+    bool result = Condition::wait( secs );
+    mMutex.unlock();
+    return( result );
+  }
+  void signal()
+  {
+    mMutex.lock();
+    Condition::signal();
+    mMutex.unlock();
+  }
+  void broadcast()
+  {
+    mMutex.lock();
+    Condition::broadcast();
+    mMutex.unlock();
+  }
 };
 
 template <class T> class ThreadData
 {
 private:
-    T mValue;
-    mutable bool mChanged;
-    mutable Mutex mMutex;
-    mutable Condition mCondition;
+  T mValue;
+  mutable bool mChanged;
+  mutable Mutex mMutex;
+  mutable Condition mCondition;
 
 public:
-    __attribute__((used)) ThreadData() : mCondition( mMutex )
-    {
-    }
-    __attribute__((used)) ThreadData( T value ) : mValue( value ), mCondition( mMutex )
-    {
-    }
-    //~ThreadData() {}
+  __attribute__((used)) ThreadData() : mCondition( mMutex )
+  {
+  }
+  __attribute__((used)) ThreadData( T value ) : mValue( value ), mCondition( mMutex )
+  {
+  }
+  //~ThreadData() {}
 
-    __attribute__((used)) operator T() const
-    {
-        return( getValue() );
-    }
-    __attribute__((used)) const T operator=( const T value )
-    {
-        return( setValue( value ) );
-    }
+  __attribute__((used)) operator T() const
+  {
+    return( getValue() );
+  }
+  __attribute__((used)) const T operator=( const T value )
+  {
+    return( setValue( value ) );
+  }
 
-    __attribute__((used)) const T getValueImmediate() const
-    {
-        return( mValue );
-    }
-    __attribute__((used)) T setValueImmediate( const T value )
-    {
-        return( mValue = value );
-    }
-    __attribute__((used)) const T getValue() const;
-    __attribute__((used)) T setValue( const T value );
-    __attribute__((used)) const T getUpdatedValue() const;
-    __attribute__((used)) const T getUpdatedValue( double secs ) const;
-    __attribute__((used)) const T getUpdatedValue( int secs ) const;
-    __attribute__((used)) void updateValueSignal( const T value );
-    __attribute__((used)) void updateValueBroadcast( const T value );
+  __attribute__((used)) const T getValueImmediate() const
+  {
+    return( mValue );
+  }
+  __attribute__((used)) T setValueImmediate( const T value )
+  {
+    return( mValue = value );
+  }
+  __attribute__((used)) const T getValue() const;
+  __attribute__((used)) T setValue( const T value );
+  __attribute__((used)) const T getUpdatedValue() const;
+  __attribute__((used)) const T getUpdatedValue( double secs ) const;
+  __attribute__((used)) const T getUpdatedValue( int secs ) const;
+  __attribute__((used)) void updateValueSignal( const T value );
+  __attribute__((used)) void updateValueBroadcast( const T value );
 };
 
 class Thread
 {
 public:
-    typedef void *(*ThreadFunc)( void * );
+  typedef void *(*ThreadFunc)( void * );
 
 protected:
-    pthread_t mThread;
+  pthread_t mThread;
 
-    Mutex mThreadMutex;
-    Condition mThreadCondition;
+  Mutex mThreadMutex;
+  Condition mThreadCondition;
 #ifndef SOLARIS
-    pid_t mPid;
+  pid_t mPid;
 #else
-    pthread_t mPid;
+  pthread_t mPid;
 #endif
-    bool  mStarted;
-    bool  mRunning;
+  bool  mStarted;
+  bool  mRunning;
+  int   status;		// Used in various funcions to get around return a local variable
 
 protected:
-    Thread();
-    virtual ~Thread();
+  Thread();
+  virtual ~Thread();
 
 #ifndef SOLARIS
-    pid_t id() const
-    {
-        pid_t tid; 
+  pid_t id() const
+  {
+    pid_t tid; 
 #ifdef __FreeBSD__ 
-        long lwpid; 
-        thr_self(&lwpid); 
-        tid = lwpid; 
+    long lwpid; 
+    thr_self(&lwpid); 
+    tid = lwpid; 
 #else 
-    #ifdef __FreeBSD_kernel__
-        if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+  #ifdef __FreeBSD_kernel__
+    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
 
-    #else
-        tid=syscall(SYS_gettid); 
-    #endif
+  #else
+    tid=syscall(SYS_gettid); 
+  #endif
 #endif
 return tid;
-    }
+  }
 #else
-    pthread_t id() const
-    {
-        return( pthread_self() );
-    }
+  pthread_t id() const
+  {
+    return( pthread_self() );
+  }
 #endif
-    void exit( int status = 0 )
-    {
-        //INFO( "Exiting" );
-        pthread_exit( (void *)&status );
-    }
-    static void *mThreadFunc( void *arg );
+  void exit( int p_status = 0 )
+  {
+    //INFO( "Exiting" );
+    pthread_exit( (void *)&p_status );
+  }
+  static void *mThreadFunc( void *arg );
 
 public:
-    virtual int run() = 0;
+  virtual int run() = 0;
 
-    void start();
-    void join();
-    void kill( int signal );
-    bool isThread()
-    {
-        return( mPid > -1 && pthread_equal( pthread_self(), mThread ) );
-    }
-    bool isStarted() const { return( mStarted ); }
-    bool isRunning() const { return( mRunning ); }
+  void start();
+  void join();
+  void kill( int signal );
+  bool isThread()
+  {
+    return( mPid > -1 && pthread_equal( pthread_self(), mThread ) );
+  }
+  bool isStarted() const { return( mStarted ); }
+  bool isRunning() const { return( mRunning ); }
 };
 
 #endif // ZM_THREAD_H
diff --git a/src/zm_time.h b/src/zm_time.h
index 646133feb..df79e7fff 100644
--- a/src/zm_time.h
+++ b/src/zm_time.h
@@ -29,48 +29,48 @@
 
 struct DeltaTimeval
 {
-	bool positive;
-	unsigned long delta;
-	unsigned long sec;
-	unsigned long fsec;
-	unsigned long prec;
+  bool positive;
+  unsigned long delta;
+  unsigned long sec;
+  unsigned long fsec;
+  unsigned long prec;
 };
 
-#define DT_GRAN_1000000	1000000
-#define DT_PREC_6		DT_GRAN_1000000
-#define DT_GRAN_100000	100000
-#define DT_PREC_5		DT_GRAN_100000
-#define DT_GRAN_10000	10000
-#define DT_PREC_4		DT_GRAN_10000
-#define DT_GRAN_1000	1000
-#define DT_PREC_3		DT_GRAN_1000
-#define DT_GRAN_100		100
-#define DT_PREC_2		DT_GRAN_100
-#define DT_GRAN_10		10
-#define DT_PREC_1		DT_GRAN_10
+#define DT_GRAN_1000000  1000000
+#define DT_PREC_6    DT_GRAN_1000000
+#define DT_GRAN_100000  100000
+#define DT_PREC_5    DT_GRAN_100000
+#define DT_GRAN_10000  10000
+#define DT_PREC_4    DT_GRAN_10000
+#define DT_GRAN_1000  1000
+#define DT_PREC_3    DT_GRAN_1000
+#define DT_GRAN_100    100
+#define DT_PREC_2    DT_GRAN_100
+#define DT_GRAN_10    10
+#define DT_PREC_1    DT_GRAN_10
 
-#define DT_MAXGRAN		DT_GRAN_1000000
+#define DT_MAXGRAN    DT_GRAN_1000000
 
 // This obviously wouldn't work for massive deltas but as it's mostly
 // for frames it will only usually be a fraction of a second or so
 #define DELTA_TIMEVAL( result, time1, time2, precision ) \
 { \
-	int delta = (((time1).tv_sec-(time2).tv_sec)*(precision))+(((time1).tv_usec-(time2).tv_usec)/(DT_MAXGRAN/(precision))); \
-	result.positive = (delta>=0); \
-	result.delta = abs(delta); \
-	result.sec = result.delta/(precision); \
-	result.fsec = result.delta%(precision); \
-	result.prec = (precision); \
+  int delta = (((time1).tv_sec-(time2).tv_sec)*(precision))+(((time1).tv_usec-(time2).tv_usec)/(DT_MAXGRAN/(precision))); \
+  result.positive = (delta>=0); \
+  result.delta = abs(delta); \
+  result.sec = result.delta/(precision); \
+  result.fsec = result.delta%(precision); \
+  result.prec = (precision); \
 }
 
 #define TIMEVAL_INTERVAL( result, time1, time2, precision ) \
 { \
-	int delta = (((time1).tv_sec-(time2).tv_sec)*(precision))+(((time1).tv_usec-(time2).tv_usec)/(DT_MAXGRAN/(precision))); \
-	result.positive = (delta>=0); \
-	result.delta = abs(delta); \
-	result.sec = result.delta/(precision); \
-	result.fsec = result.delta%(precision); \
-	result.prec = (precision); \
+  int delta = (((time1).tv_sec-(time2).tv_sec)*(precision))+(((time1).tv_usec-(time2).tv_usec)/(DT_MAXGRAN/(precision))); \
+  result.positive = (delta>=0); \
+  result.delta = abs(delta); \
+  result.sec = result.delta/(precision); \
+  result.fsec = result.delta%(precision); \
+  result.prec = (precision); \
 }
 
 #define USEC_PER_SEC 1000000
@@ -82,128 +82,128 @@ typedef typeof(tv.tv_usec) ast_suseconds_t;
 
 inline int tvDiffUsec( struct timeval first, struct timeval last )
 {
-    return( (last.tv_sec - first.tv_sec) * USEC_PER_SEC) + ((USEC_PER_SEC + last.tv_usec - first.tv_usec) - USEC_PER_SEC );
+  return( (last.tv_sec - first.tv_sec) * USEC_PER_SEC) + ((USEC_PER_SEC + last.tv_usec - first.tv_usec) - USEC_PER_SEC );
 }
 
 inline int tvDiffUsec( struct timeval first )
 {
-    struct timeval now;
-    gettimeofday( &now, NULL );
-    return( tvDiffUsec( first, now ) );
+  struct timeval now;
+  gettimeofday( &now, NULL );
+  return( tvDiffUsec( first, now ) );
 }
 
 inline int tvDiffMsec( struct timeval first, struct timeval last )
 {
-    return( (last.tv_sec - first.tv_sec) * MSEC_PER_SEC) + (((MSEC_PER_SEC + last.tv_usec - first.tv_usec) / MSEC_PER_SEC) - MSEC_PER_SEC );
+  return( (last.tv_sec - first.tv_sec) * MSEC_PER_SEC) + (((MSEC_PER_SEC + last.tv_usec - first.tv_usec) / MSEC_PER_SEC) - MSEC_PER_SEC );
 }
 
 inline int tvDiffMsec( struct timeval first )
 {
-    struct timeval now;
-    gettimeofday( &now, NULL );
-    return( tvDiffMsec( first, now ) );
+  struct timeval now;
+  gettimeofday( &now, NULL );
+  return( tvDiffMsec( first, now ) );
 }
 
 inline double tvDiffSec( struct timeval first, struct timeval last )
 {
-    return( double(last.tv_sec - first.tv_sec) + double(((USEC_PER_SEC + last.tv_usec - first.tv_usec) - USEC_PER_SEC) / (1.0*USEC_PER_SEC) ) );
+  return( double(last.tv_sec - first.tv_sec) + double(((USEC_PER_SEC + last.tv_usec - first.tv_usec) - USEC_PER_SEC) / (1.0*USEC_PER_SEC) ) );
 }
 
 inline double tvDiffSec( struct timeval first )
 {
-    struct timeval now;
-    gettimeofday( &now, NULL );
-    return( tvDiffSec( first, now ) );
+  struct timeval now;
+  gettimeofday( &now, NULL );
+  return( tvDiffSec( first, now ) );
 }
 
 inline struct timeval tvZero()
 {
-    struct timeval t = { 0, 0 };
-    return( t );
+  struct timeval t = { 0, 0 };
+  return( t );
 }
 
 inline int tvIsZero( const struct timeval t )
 {
-    return( t.tv_sec == 0 && t.tv_usec == 0 );
+  return( t.tv_sec == 0 && t.tv_usec == 0 );
 }
 
 inline int tvCmp( struct timeval t1, struct timeval t2 )
 {
-    if ( t1.tv_sec < t2.tv_sec )
-        return( -1 );
-    if ( t1.tv_sec > t2.tv_sec )
-        return( 1 );
-    if ( t1.tv_usec < t2.tv_usec )
-        return( -1 );
-    if ( t1.tv_usec > t2.tv_usec )
-        return( 1 );
-    return( 0 );
+  if ( t1.tv_sec < t2.tv_sec )
+    return( -1 );
+  if ( t1.tv_sec > t2.tv_sec )
+    return( 1 );
+  if ( t1.tv_usec < t2.tv_usec )
+    return( -1 );
+  if ( t1.tv_usec > t2.tv_usec )
+    return( 1 );
+  return( 0 );
 }
 
 inline int tvEq( struct timeval t1, struct timeval t2 )
 {
-    return( t1.tv_sec == t2.tv_sec && t1.tv_usec == t2.tv_usec );
+  return( t1.tv_sec == t2.tv_sec && t1.tv_usec == t2.tv_usec );
 }
 
 inline struct timeval tvNow( void )
 {
-    struct timeval t;
-    gettimeofday( &t, NULL );
-    return( t );
+  struct timeval t;
+  gettimeofday( &t, NULL );
+  return( t );
 }
 
 inline struct timeval tvCheck( struct timeval &t )
 {
-    if ( t.tv_usec >= USEC_PER_SEC )
-    {
-        Warning( "Timestamp too large %ld.%ld\n", t.tv_sec, (long int) t.tv_usec );
-        t.tv_sec += t.tv_usec / USEC_PER_SEC;
-        t.tv_usec %= USEC_PER_SEC;
-    }
-    else if ( t.tv_usec < 0 )
-    {
-        Warning( "Got negative timestamp %ld.%ld\n", t.tv_sec, (long int)t.tv_usec );
-        t.tv_usec = 0;
-    }
-    return( t );
+  if ( t.tv_usec >= USEC_PER_SEC )
+  {
+    Warning( "Timestamp too large %ld.%ld\n", t.tv_sec, (long int) t.tv_usec );
+    t.tv_sec += t.tv_usec / USEC_PER_SEC;
+    t.tv_usec %= USEC_PER_SEC;
+  }
+  else if ( t.tv_usec < 0 )
+  {
+    Warning( "Got negative timestamp %ld.%ld\n", t.tv_sec, (long int)t.tv_usec );
+    t.tv_usec = 0;
+  }
+  return( t );
 }
 
 // Add t2 to t1
 inline struct timeval tvAdd( struct timeval t1, struct timeval t2 )
 {
-    tvCheck(t1);
-    tvCheck(t2);
-    t1.tv_sec += t2.tv_sec;
-    t1.tv_usec += t2.tv_usec;
-    if ( t1.tv_usec >= USEC_PER_SEC )
-    {
-        t1.tv_sec++;
-        t1.tv_usec -= USEC_PER_SEC;
-    }
-    return( t1 );
+  tvCheck(t1);
+  tvCheck(t2);
+  t1.tv_sec += t2.tv_sec;
+  t1.tv_usec += t2.tv_usec;
+  if ( t1.tv_usec >= USEC_PER_SEC )
+  {
+    t1.tv_sec++;
+    t1.tv_usec -= USEC_PER_SEC;
+  }
+  return( t1 );
 }
 
 // Subtract t2 from t1
 inline struct timeval tvSub( struct timeval t1, struct timeval t2 )
 {
-    tvCheck(t1);
-    tvCheck(t2);
-    t1.tv_sec -= t2.tv_sec;
-    t1.tv_usec -= t2.tv_usec;
-    if ( t1.tv_usec < 0 )
-    {
-        t1.tv_sec--;
-        t1.tv_usec += USEC_PER_SEC;
-    }
-    return( t1 ) ;
+  tvCheck(t1);
+  tvCheck(t2);
+  t1.tv_sec -= t2.tv_sec;
+  t1.tv_usec -= t2.tv_usec;
+  if ( t1.tv_usec < 0 )
+  {
+    t1.tv_sec--;
+    t1.tv_usec += USEC_PER_SEC;
+  }
+  return( t1 ) ;
 }
 
 inline struct timeval tvMake( time_t sec, suseconds_t usec )
 {
-    struct timeval t;
-    t.tv_sec = sec;
-    t.tv_usec = usec;
-    return( t );
+  struct timeval t;
+  t.tv_sec = sec;
+  t.tv_usec = usec;
+  return( t );
 }
 
 #endif // ZM_TIME_H
diff --git a/src/zm_timer.cpp b/src/zm_timer.cpp
index fbac45435..a067308b7 100644
--- a/src/zm_timer.cpp
+++ b/src/zm_timer.cpp
@@ -24,96 +24,96 @@
 int Timer::TimerThread::mNextTimerId = 0;
 
 Timer::TimerThread::TimerThread( Timer &timer, int duration, bool repeat ) :
-    mTimerId( 0 ),
-    mTimer( timer ),
-    mDuration( duration ),
-    mRepeat( repeat ),
-    mReset( false ),
-    mExpiryFlag( true )
+  mTimerId( 0 ),
+  mTimer( timer ),
+  mDuration( duration ),
+  mRepeat( repeat ),
+  mReset( false ),
+  mExpiryFlag( true )
 {
-    mAccessMutex.lock();
-    mTimerId = mNextTimerId++;
-    Debug( 5, "Creating timer %d for %d seconds%s", mTimerId, mDuration, mRepeat?", repeating":"" );
-    mAccessMutex.unlock();
+  mAccessMutex.lock();
+  mTimerId = mNextTimerId++;
+  Debug( 5, "Creating timer %d for %d seconds%s", mTimerId, mDuration, mRepeat?", repeating":"" );
+  mAccessMutex.unlock();
 }
 
 Timer::TimerThread::~TimerThread()
 {
-    cancel();
+  cancel();
 }
 
 void Timer::TimerThread::cancel()
 {
-    mAccessMutex.lock();
-    if ( mRunning )
-    {
-        Debug( 4, "Cancelling timer %d", mTimerId );
-        mRepeat = false;
-        mReset = false;
-        mExpiryFlag.updateValueSignal( false );
-    }
-    mAccessMutex.unlock();
+  mAccessMutex.lock();
+  if ( mRunning )
+  {
+    Debug( 4, "Cancelling timer %d", mTimerId );
+    mRepeat = false;
+    mReset = false;
+    mExpiryFlag.updateValueSignal( false );
+  }
+  mAccessMutex.unlock();
 }
 
 void Timer::TimerThread::reset()
 {
-    mAccessMutex.lock();
-    if ( mRunning )
-    {
-        Debug( 4, "Resetting timer" );
-        mReset = true;
-        mExpiryFlag.updateValueSignal( false );
-    }
-    else
-    {
-        Error( "Attempting to reset expired timer %d", mTimerId );
-    }
-    mAccessMutex.unlock();
+  mAccessMutex.lock();
+  if ( mRunning )
+  {
+    Debug( 4, "Resetting timer" );
+    mReset = true;
+    mExpiryFlag.updateValueSignal( false );
+  }
+  else
+  {
+    Error( "Attempting to reset expired timer %d", mTimerId );
+  }
+  mAccessMutex.unlock();
 }
 
 int Timer::TimerThread::run()
 {
-    Debug( 4, "Starting timer %d for %d seconds", mTimerId, mDuration );
-    bool timerExpired = false;
-    do
+  Debug( 4, "Starting timer %d for %d seconds", mTimerId, mDuration );
+  bool timerExpired = false;
+  do
+  {
+    mAccessMutex.lock();
+    mReset = false;
+    mExpiryFlag.setValue( true );
+    mAccessMutex.unlock();
+    timerExpired = mExpiryFlag.getUpdatedValue( mDuration );
+    mAccessMutex.lock();
+    if ( timerExpired )
     {
-        mAccessMutex.lock();
-        mReset = false;
-        mExpiryFlag.setValue( true );
-        mAccessMutex.unlock();
-        timerExpired = mExpiryFlag.getUpdatedValue( mDuration );
-        mAccessMutex.lock();
-        if ( timerExpired )
-        {
-            Debug( 4, "Timer %d expired", mTimerId );
-            mTimer.expire();
-        }
-        else
-        {
-            Debug( 4, "Timer %d %s", mTimerId, mReset?"reset":"cancelled" );
-        }
-        mAccessMutex.unlock();
-    } while ( mRepeat || (mReset && !timerExpired) );
-    return( timerExpired );
+      Debug( 4, "Timer %d expired", mTimerId );
+      mTimer.expire();
+    }
+    else
+    {
+      Debug( 4, "Timer %d %s", mTimerId, mReset?"reset":"cancelled" );
+    }
+    mAccessMutex.unlock();
+  } while ( mRepeat || (mReset && !timerExpired) );
+  return( timerExpired );
 }
 
 Timer::Timer( int timeout, bool repeat ) : mTimerThread( *this, timeout, repeat )
 {
-    mTimerThread.start();
+  mTimerThread.start();
 }
 
 Timer::~Timer()
 {
-    //cancel();
+  //cancel();
 }
 
 void Timer::Timer::cancel()
 {
-    mTimerThread.cancel();
+  mTimerThread.cancel();
 }
 
 void Timer::Timer::reset()
 {
-    mTimerThread.reset();
+  mTimerThread.reset();
 }
 
diff --git a/src/zm_timer.h b/src/zm_timer.h
index 7afe0a647..2213d3cd0 100644
--- a/src/zm_timer.h
+++ b/src/zm_timer.h
@@ -30,81 +30,81 @@
 class Timer
 {
 private:
-    class TimerException : public Exception
-    {
-    private:
+  class TimerException : public Exception
+  {
+  private:
 #ifndef SOLARIS
-        pid_t pid() {
-		pid_t tid;
+    pid_t pid() {
+    pid_t tid;
 #ifdef __FreeBSD__
-		long lwpid;
-		thr_self(&lwpid);
-		tid = lwpid;
+    long lwpid;
+    thr_self(&lwpid);
+    tid = lwpid;
 #else
-    #ifdef __FreeBSD_kernel__
-                if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
-    #else
-		tid=syscall(SYS_gettid);
-    #endif
+  #ifdef __FreeBSD_kernel__
+    if ( (syscall(SYS_thr_self, &tid)) < 0 ) // Thread/Process id
+  #else
+    tid=syscall(SYS_gettid);
+  #endif
 #endif
-		return tid;
-        }
+    return tid;
+  }
 #else
-	pthread_t pid() { return( pthread_self() ); }
+  pthread_t pid() { return( pthread_self() ); }
 #endif
-    public:
-        TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) )
-        {
-        }
-    };
-
-    class TimerThread : public Thread
+  public:
+    TimerException( const std::string &message ) : Exception( stringtf( "(%d) "+message, (long int)pid() ) )
     {
-    private:
-        typedef ThreadData<bool> ExpiryFlag;
+    }
+  };
 
-    private:
-        static int mNextTimerId;
+  class TimerThread : public Thread
+  {
+  private:
+    typedef ThreadData<bool> ExpiryFlag;
 
-    private:
-        int mTimerId;
-        Timer &mTimer;
-        int mDuration;
-        int mRepeat;
-        int mReset;
-        ExpiryFlag mExpiryFlag;
-        Mutex mAccessMutex;
+  private:
+    static int mNextTimerId;
 
-    private:
-        void quit()
-        {
-            cancel();
-        }
+  private:
+    int mTimerId;
+    Timer &mTimer;
+    int mDuration;
+    int mRepeat;
+    int mReset;
+    ExpiryFlag mExpiryFlag;
+    Mutex mAccessMutex;
 
-    public:
-        TimerThread( Timer &timer, int timeout, bool repeat );
-        ~TimerThread();
+  private:
+    void quit()
+    {
+      cancel();
+    }
 
-        void cancel();
-        void reset();
-        int run();
-    };
+  public:
+    TimerThread( Timer &timer, int timeout, bool repeat );
+    ~TimerThread();
 
-protected:
-    TimerThread mTimerThread;
-
-protected:
-    Timer( int timeout, bool repeat=false );
-
-public:
-    virtual ~Timer();
-
-protected:
-    virtual void expire()=0;
-
-public:
     void cancel();
     void reset();
+    int run();
+  };
+
+protected:
+  TimerThread mTimerThread;
+
+protected:
+  Timer( int timeout, bool repeat=false );
+
+public:
+  virtual ~Timer();
+
+protected:
+  virtual void expire()=0;
+
+public:
+  void cancel();
+  void reset();
 };
 
 #endif // ZM_TIMER_H
diff --git a/src/zm_user.cpp b/src/zm_user.cpp
index f7822044c..73f5c7932 100644
--- a/src/zm_user.cpp
+++ b/src/zm_user.cpp
@@ -29,119 +29,119 @@
 
 User::User()
 {
-	username[0] = password[0] = 0;
-	enabled = false;
-	stream = events = control = monitors = system = PERM_NONE;
-	monitor_ids = 0;
+  username[0] = password[0] = 0;
+  enabled = false;
+  stream = events = control = monitors = system = PERM_NONE;
+  monitor_ids = 0;
 }
 
 User::User( MYSQL_ROW &dbrow )
 {
-	int index = 0;
-	strncpy( username, dbrow[index++], sizeof(username) );
-	strncpy( password, dbrow[index++], sizeof(password) );
-	enabled = (bool)atoi( dbrow[index++] );
-	stream = (Permission)atoi( dbrow[index++] );
-	events = (Permission)atoi( dbrow[index++] );
-	control = (Permission)atoi( dbrow[index++] );
-	monitors = (Permission)atoi( dbrow[index++] );
-	system = (Permission)atoi( dbrow[index++] );
-	monitor_ids = 0;
-	char *monitor_ids_str = dbrow[index++];
-	if ( monitor_ids_str && *monitor_ids_str )
-	{
-		monitor_ids = new int[strlen(monitor_ids_str)];
-		int n_monitor_ids = 0;
-		const char *ptr = monitor_ids_str;
-		do
-		{
-			int id = 0;
-			while( isdigit( *ptr ) )
-			{
-				id *= 10;
-				id += *ptr-'0';
-				ptr++;
-			}
-			if ( id )
-			{
-				monitor_ids[n_monitor_ids++] = id;
-				if ( !*ptr )
-					break;
-			}
-			while ( !isdigit( *ptr ) )
-				ptr++;
-		} while( *ptr );
-		monitor_ids[n_monitor_ids] = 0;
-	}
+  int index = 0;
+  strncpy( username, dbrow[index++], sizeof(username) );
+  strncpy( password, dbrow[index++], sizeof(password) );
+  enabled = (bool)atoi( dbrow[index++] );
+  stream = (Permission)atoi( dbrow[index++] );
+  events = (Permission)atoi( dbrow[index++] );
+  control = (Permission)atoi( dbrow[index++] );
+  monitors = (Permission)atoi( dbrow[index++] );
+  system = (Permission)atoi( dbrow[index++] );
+  monitor_ids = 0;
+  char *monitor_ids_str = dbrow[index++];
+  if ( monitor_ids_str && *monitor_ids_str )
+  {
+    monitor_ids = new int[strlen(monitor_ids_str)];
+    int n_monitor_ids = 0;
+    const char *ptr = monitor_ids_str;
+    do
+    {
+      int id = 0;
+      while( isdigit( *ptr ) )
+      {
+        id *= 10;
+        id += *ptr-'0';
+        ptr++;
+      }
+      if ( id )
+      {
+        monitor_ids[n_monitor_ids++] = id;
+        if ( !*ptr )
+          break;
+      }
+      while ( !isdigit( *ptr ) )
+        ptr++;
+    } while( *ptr );
+    monitor_ids[n_monitor_ids] = 0;
+  }
 }
 
 User::~User()
 {
-	delete monitor_ids;
+  delete monitor_ids;
 }
 
 bool User::canAccess( int monitor_id )
 {
-	if ( !monitor_ids )
-	{
-		return( true );
-	}
-	for ( int i = 0; monitor_ids[i]; i++ )
-	{
-		if ( monitor_ids[i] == monitor_id )
-		{
-			return( true );
-		}
-	}
-	return( false );
+  if ( !monitor_ids )
+  {
+    return( true );
+  }
+  for ( int i = 0; monitor_ids[i]; i++ )
+  {
+    if ( monitor_ids[i] == monitor_id )
+    {
+      return( true );
+    }
+  }
+  return( false );
 }
 
 // Function to load a user from username and password
 // Please note that in auth relay mode = none, password is NULL
 User *zmLoadUser( const char *username, const char *password )
 {
-    char sql[ZM_SQL_SML_BUFSIZ] = "";
-    char safer_username[65]; // current db username size is 32
-    char safer_password[129]; // current db password size is 64
+  char sql[ZM_SQL_SML_BUFSIZ] = "";
+  char safer_username[65]; // current db username size is 32
+  char safer_password[129]; // current db password size is 64
 
-	// According to docs, size of safer_whatever must be 2*length+1 due to unicode conversions + null terminator.
-    mysql_real_escape_string(&dbconn, safer_username, username, strlen( username ) );
+  // According to docs, size of safer_whatever must be 2*length+1 due to unicode conversions + null terminator.
+  mysql_real_escape_string(&dbconn, safer_username, username, strlen( username ) );
 
-	if ( password ) {
-		mysql_real_escape_string(&dbconn, safer_password, password, strlen( password ) );
-		snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Username = '%s' and Password = password('%s') and Enabled = 1", safer_username, safer_password );
-	} else {
-		snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Username = '%s' and Enabled = 1", safer_username );
-	}
+  if ( password ) {
+    mysql_real_escape_string(&dbconn, safer_password, password, strlen( password ) );
+    snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Username = '%s' and Password = password('%s') and Enabled = 1", safer_username, safer_password );
+  } else {
+    snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Username = '%s' and Enabled = 1", safer_username );
+  }
 
-	if ( mysql_query( &dbconn, sql ) )
-	{
-		Error( "Can't run query: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-	MYSQL_RES *result = mysql_store_result( &dbconn );
-	if ( !result )
-	{
-		Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-	int n_users = mysql_num_rows( result );
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_users = mysql_num_rows( result );
 
-	if ( n_users != 1 )
-	{
-		Warning( "Unable to authenticate user %s", username );
-		return( 0 );
-	}
+  if ( n_users != 1 )
+  {
+    Warning( "Unable to authenticate user %s", username );
+    return( 0 );
+  }
 
-	MYSQL_ROW dbrow = mysql_fetch_row( result );
+  MYSQL_ROW dbrow = mysql_fetch_row( result );
 
-	User *user = new User( dbrow );
-	Info( "Authenticated user '%s'", user->getUsername() );
+  User *user = new User( dbrow );
+  Info( "Authenticated user '%s'", user->getUsername() );
 
-	mysql_free_result( result );
+  mysql_free_result( result );
 
-	return( user );
+  return( user );
 }
 
 // Function to validate an authentication string
@@ -149,102 +149,102 @@ User *zmLoadAuthUser( const char *auth, bool use_remote_addr )
 {
 #if HAVE_DECL_MD5 || HAVE_DECL_GNUTLS_FINGERPRINT
 #ifdef HAVE_GCRYPT_H
-    // Special initialisation for libgcrypt
-    if ( !gcry_check_version( GCRYPT_VERSION ) )
-    {
-        Fatal( "Unable to initialise libgcrypt" );
-    }
-    gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
-    gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
+  // Special initialisation for libgcrypt
+  if ( !gcry_check_version( GCRYPT_VERSION ) )
+  {
+    Fatal( "Unable to initialise libgcrypt" );
+  }
+  gcry_control( GCRYCTL_DISABLE_SECMEM, 0 );
+  gcry_control( GCRYCTL_INITIALIZATION_FINISHED, 0 );
 #endif // HAVE_GCRYPT_H
 
-	const char *remote_addr = "";
-	if ( use_remote_addr )
-	{
-		remote_addr = getenv( "REMOTE_ADDR" );
-		if ( !remote_addr )
-		{
-			Warning( "Can't determine remote address, using null" );
-			remote_addr = "";
-		}
-	}
+  const char *remote_addr = "";
+  if ( use_remote_addr )
+  {
+    remote_addr = getenv( "REMOTE_ADDR" );
+    if ( !remote_addr )
+    {
+      Warning( "Can't determine remote address, using null" );
+      remote_addr = "";
+    }
+  }
 
-	Debug( 1, "Attempting to authenticate user from auth string '%s'", auth );
-    char sql[ZM_SQL_SML_BUFSIZ] = "";
-	snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Enabled = 1" );
+  Debug( 1, "Attempting to authenticate user from auth string '%s'", auth );
+  char sql[ZM_SQL_SML_BUFSIZ] = "";
+  snprintf( sql, sizeof(sql), "select Username, Password, Enabled, Stream+0, Events+0, Control+0, Monitors+0, System+0, MonitorIds from Users where Enabled = 1" );
 
-	if ( mysql_query( &dbconn, sql ) )
-	{
-		Error( "Can't run query: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-	MYSQL_RES *result = mysql_store_result( &dbconn );
-	if ( !result )
-	{
-		Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-	int n_users = mysql_num_rows( result );
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_users = mysql_num_rows( result );
 
-	if ( n_users < 1 )
-	{
-		Warning( "Unable to authenticate user" );
-		return( 0 );
-	}
+  if ( n_users < 1 )
+  {
+    Warning( "Unable to authenticate user" );
+    return( 0 );
+  }
 
-	while( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
-	{
-		const char *user = dbrow[0];
-		const char *pass = dbrow[1];
+  while( MYSQL_ROW dbrow = mysql_fetch_row( result ) )
+  {
+    const char *user = dbrow[0];
+    const char *pass = dbrow[1];
 
-		char auth_key[512] = "";
-		char auth_md5[32+1] = "";
-      size_t md5len = 16;
-      unsigned char md5sum[md5len];
+    char auth_key[512] = "";
+    char auth_md5[32+1] = "";
+    size_t md5len = 16;
+    unsigned char md5sum[md5len];
 
-		time_t now = time( 0 );
-		int max_tries = 2;
+    time_t now = time( 0 );
+    int max_tries = 2;
 
-		for ( int i = 0; i < max_tries; i++, now -= (60*60) )
-		{
-			struct tm *now_tm = localtime( &now );
+    for ( int i = 0; i < max_tries; i++, now -= (60*60) )
+    {
+      struct tm *now_tm = localtime( &now );
 
-			snprintf( auth_key, sizeof(auth_key), "%s%s%s%s%d%d%d%d", 
-				config.auth_hash_secret,
-				user,
-				pass,
-				remote_addr,
-				now_tm->tm_hour,
-				now_tm->tm_mday,
-				now_tm->tm_mon,
-				now_tm->tm_year
-			);
+      snprintf( auth_key, sizeof(auth_key), "%s%s%s%s%d%d%d%d", 
+        config.auth_hash_secret,
+        user,
+        pass,
+        remote_addr,
+        now_tm->tm_hour,
+        now_tm->tm_mday,
+        now_tm->tm_mon,
+        now_tm->tm_year
+      );
 
 #if HAVE_DECL_MD5
-			MD5( (unsigned char *)auth_key, strlen(auth_key), md5sum );
+      MD5( (unsigned char *)auth_key, strlen(auth_key), md5sum );
 #elif HAVE_DECL_GNUTLS_FINGERPRINT
-            gnutls_datum_t md5data = { (unsigned char *)auth_key, strlen(auth_key) };
-            gnutls_fingerprint( GNUTLS_DIG_MD5, &md5data, md5sum, &md5len );
+      gnutls_datum_t md5data = { (unsigned char *)auth_key, strlen(auth_key) };
+      gnutls_fingerprint( GNUTLS_DIG_MD5, &md5data, md5sum, &md5len );
 #endif
-			auth_md5[0] = '\0';
-			for ( unsigned int j = 0; j < md5len; j++ )
-			{
-				sprintf( &auth_md5[2*j], "%02x", md5sum[j] );
-			}
-			Debug( 1, "Checking auth_key '%s' -> auth_md5 '%s'", auth_key, auth_md5 );
+      auth_md5[0] = '\0';
+      for ( unsigned int j = 0; j < md5len; j++ )
+      {
+        sprintf( &auth_md5[2*j], "%02x", md5sum[j] );
+      }
+      Debug( 1, "Checking auth_key '%s' -> auth_md5 '%s'", auth_key, auth_md5 );
 
-			if ( !strcmp( auth, auth_md5 ) )
-			{
-				// We have a match
-				User *user = new User( dbrow );
-				Debug(1, "Authenticated user '%s'", user->getUsername() );
-				return( user );
-			}
-		}
-	}
+      if ( !strcmp( auth, auth_md5 ) )
+      {
+        // We have a match
+        User *user = new User( dbrow );
+        Debug(1, "Authenticated user '%s'", user->getUsername() );
+        return( user );
+      }
+    }
+  }
 #else // HAVE_DECL_MD5
-	Error( "You need to build with gnutls or openssl installed to use hash based authentication" );
+  Error( "You need to build with gnutls or openssl installed to use hash based authentication" );
 #endif // HAVE_DECL_MD5
-	return( 0 );
+  return( 0 );
 }
diff --git a/src/zm_user.h b/src/zm_user.h
index 95fb71474..09f5a2f0a 100644
--- a/src/zm_user.h
+++ b/src/zm_user.h
@@ -39,33 +39,33 @@
 class User
 {
 public:
-	typedef enum { PERM_NONE=1, PERM_VIEW, PERM_EDIT } Permission;
+  typedef enum { PERM_NONE=1, PERM_VIEW, PERM_EDIT } Permission;
 
 protected:
-	char username[32+1];
-	char password[64+1];
-	bool enabled;
-	Permission stream;
-	Permission events;
-	Permission control;
-	Permission monitors;
-	Permission system;
-	int *monitor_ids;
+  char username[32+1];
+  char password[64+1];
+  bool enabled;
+  Permission stream;
+  Permission events;
+  Permission control;
+  Permission monitors;
+  Permission system;
+  int *monitor_ids;
 
 public:
-	User();
-	User( MYSQL_ROW &dbrow );
-	~User();
+  User();
+  User( MYSQL_ROW &dbrow );
+  ~User();
 
-	const char *getUsername() const { return( username ); }
-	const char *getPassword() const { return( password ); }
-	bool isEnabled() const { return( enabled ); }
-	Permission getStream() const { return( stream ); }
-	Permission getEvents() const { return( events ); }
-	Permission getControl() const { return( control ); }
-	Permission getMonitors() const { return( monitors ); }
-	Permission getSystem() const { return( system ); }
-	bool canAccess( int monitor_id );
+  const char *getUsername() const { return( username ); }
+  const char *getPassword() const { return( password ); }
+  bool isEnabled() const { return( enabled ); }
+  Permission getStream() const { return( stream ); }
+  Permission getEvents() const { return( events ); }
+  Permission getControl() const { return( control ); }
+  Permission getMonitors() const { return( monitors ); }
+  Permission getSystem() const { return( system ); }
+  bool canAccess( int monitor_id );
 };
 
 User *zmLoadUser( const char *username, const char *password=0 );
diff --git a/src/zm_utils.cpp b/src/zm_utils.cpp
index e0c65ca61..67af64a66 100644
--- a/src/zm_utils.cpp
+++ b/src/zm_utils.cpp
@@ -28,256 +28,256 @@
 unsigned int sseversion = 0;
 
 std::string trimSet(std::string str, std::string trimset) {
-    // Trim Both leading and trailing sets
-    size_t startpos = str.find_first_not_of(trimset); // Find the first character position after excluding leading blank spaces
-    size_t endpos = str.find_last_not_of(trimset); // Find the first character position from reverse af
+  // Trim Both leading and trailing sets
+  size_t startpos = str.find_first_not_of(trimset); // Find the first character position after excluding leading blank spaces
+  size_t endpos = str.find_last_not_of(trimset); // Find the first character position from reverse af
  
-    // if all spaces or empty return an empty string
-    if(( std::string::npos == startpos ) || ( std::string::npos == endpos))
-    {
-        return std::string("");
-    }
-    else
-        return str.substr( startpos, endpos-startpos+1 );
+  // if all spaces or empty return an empty string
+  if(( std::string::npos == startpos ) || ( std::string::npos == endpos))
+  {
+    return std::string("");
+  }
+  else
+    return str.substr( startpos, endpos-startpos+1 );
 }
 
 std::string trimSpaces(std::string str)
 {
-    return trimSet(str, " \t");
+  return trimSet(str, " \t");
 }
 
 std::string replaceAll(std::string str, std::string from, std::string to) {
-    if(from.empty())
-        return str;
-    size_t start_pos = 0;
-    while((start_pos = str.find(from, start_pos)) != std::string::npos) {
-        str.replace(start_pos, from.length(), to);
-        start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
-    }
+  if(from.empty())
     return str;
+  size_t start_pos = 0;
+  while((start_pos = str.find(from, start_pos)) != std::string::npos) {
+    str.replace(start_pos, from.length(), to);
+    start_pos += to.length(); // In case 'to' contains 'from', like replacing 'x' with 'yx'
+  }
+  return str;
 }
 
 const std::string stringtf( const char *format, ... )
 {
-    va_list ap;
-    char tempBuffer[8192];
-    std::string tempString;
+  va_list ap;
+  char tempBuffer[8192];
+  std::string tempString;
 
-    va_start(ap, format );
-    vsnprintf( tempBuffer, sizeof(tempBuffer), format , ap );
-    va_end(ap);
+  va_start(ap, format );
+  vsnprintf( tempBuffer, sizeof(tempBuffer), format , ap );
+  va_end(ap);
 
-    tempString = tempBuffer;
+  tempString = tempBuffer;
 
-    return( tempString );
+  return( tempString );
 }
 
 const std::string stringtf( const std::string &format, ... )
 {
-    va_list ap;
-    char tempBuffer[8192];
-    std::string tempString;
+  va_list ap;
+  char tempBuffer[8192];
+  std::string tempString;
 
-    va_start(ap, format );
-    vsnprintf( tempBuffer, sizeof(tempBuffer), format.c_str() , ap );
-    va_end(ap);
+  va_start(ap, format );
+  vsnprintf( tempBuffer, sizeof(tempBuffer), format.c_str() , ap );
+  va_end(ap);
 
-    tempString = tempBuffer;
+  tempString = tempBuffer;
 
-    return( tempString );
+  return( tempString );
 }
 
 bool startsWith( const std::string &haystack, const std::string &needle )
 {
-    return( haystack.substr( 0, needle.length() ) == needle );
+  return( haystack.substr( 0, needle.length() ) == needle );
 }
 
 StringVector split( const std::string &string, const std::string chars, int limit )
 {
-    StringVector stringVector;
-    std::string tempString = string;
-    std::string::size_type startIndex = 0;
-    std::string::size_type endIndex = 0;
+  StringVector stringVector;
+  std::string tempString = string;
+  std::string::size_type startIndex = 0;
+  std::string::size_type endIndex = 0;
 
-    //Info( "Looking for '%s' in '%s', limit %d", chars.c_str(), string.c_str(), limit );
-    do
+  //Info( "Looking for '%s' in '%s', limit %d", chars.c_str(), string.c_str(), limit );
+  do
+  {
+    // Find delimiters
+    endIndex = string.find_first_of( chars, startIndex );
+    //Info( "Got endIndex at %d", endIndex );
+    if ( endIndex > 0 )
     {
-        // Find delimiters
-        endIndex = string.find_first_of( chars, startIndex );
-        //Info( "Got endIndex at %d", endIndex );
-        if ( endIndex > 0 )
-        {
-            //Info( "Adding '%s'", string.substr( startIndex, endIndex-startIndex ).c_str() );
-            stringVector.push_back( string.substr( startIndex, endIndex-startIndex ) );
-        }
-        if ( endIndex == std::string::npos )
-            break;
-        // Find non-delimiters
-        startIndex = tempString.find_first_not_of( chars, endIndex );
-        if ( limit && (stringVector.size() == (unsigned int)(limit-1)) )
-        {
-            stringVector.push_back( string.substr( startIndex ) );
-            break;
-        }
-        //Info( "Got new startIndex at %d", startIndex );
-    } while ( startIndex != std::string::npos );
-    //Info( "Finished with %d strings", stringVector.size() );
+      //Info( "Adding '%s'", string.substr( startIndex, endIndex-startIndex ).c_str() );
+      stringVector.push_back( string.substr( startIndex, endIndex-startIndex ) );
+    }
+    if ( endIndex == std::string::npos )
+      break;
+    // Find non-delimiters
+    startIndex = tempString.find_first_not_of( chars, endIndex );
+    if ( limit && (stringVector.size() == (unsigned int)(limit-1)) )
+    {
+      stringVector.push_back( string.substr( startIndex ) );
+      break;
+    }
+    //Info( "Got new startIndex at %d", startIndex );
+  } while ( startIndex != std::string::npos );
+  //Info( "Finished with %d strings", stringVector.size() );
 
-    return( stringVector );
+  return( stringVector );
 }
 
 const std::string join(const StringVector v, const char * delim ) {
-	std::stringstream ss;
+  std::stringstream ss;
 
-	for(size_t i = 0; i < v.size(); ++i) {
-		if(i != 0)
-			ss << ",";
-		ss << v[i];
-	}
-	return ss.str();
+  for(size_t i = 0; i < v.size(); ++i) {
+    if(i != 0)
+      ss << ",";
+    ss << v[i];
+  }
+  return ss.str();
 }
 
 const std::string base64Encode( const std::string &inString )
 {
-	static char base64_table[64] = { '\0' };
+  static char base64_table[64] = { '\0' };
 
-	if ( !base64_table[0] )
-	{
-		int i = 0;
-		for ( char c = 'A'; c <= 'Z'; c++ )
-			base64_table[i++] = c;
-		for ( char c = 'a'; c <= 'z'; c++ )
-			base64_table[i++] = c;
-		for ( char c = '0'; c <= '9'; c++ )
-			base64_table[i++] = c;
-		base64_table[i++] = '+';
-		base64_table[i++] = '/';
-	}
+  if ( !base64_table[0] )
+  {
+    int i = 0;
+    for ( char c = 'A'; c <= 'Z'; c++ )
+      base64_table[i++] = c;
+    for ( char c = 'a'; c <= 'z'; c++ )
+      base64_table[i++] = c;
+    for ( char c = '0'; c <= '9'; c++ )
+      base64_table[i++] = c;
+    base64_table[i++] = '+';
+    base64_table[i++] = '/';
+  }
 
-    std::string outString;
-    outString.reserve( 2 * inString.size() );
+  std::string outString;
+  outString.reserve( 2 * inString.size() );
 
-	const char *inPtr = inString.c_str();
-	while( *inPtr )
-	{
-		unsigned char selection = *inPtr >> 2;
-		unsigned char remainder = (*inPtr++ & 0x03) << 4;
-		outString += base64_table[selection];
+  const char *inPtr = inString.c_str();
+  while( *inPtr )
+  {
+    unsigned char selection = *inPtr >> 2;
+    unsigned char remainder = (*inPtr++ & 0x03) << 4;
+    outString += base64_table[selection];
 
-		if ( *inPtr )
-		{
-			selection = remainder | (*inPtr >> 4);
-			remainder = (*inPtr++ & 0x0f) << 2;
-			outString += base64_table[selection];
-		
-			if ( *inPtr )
-			{
-				selection = remainder | (*inPtr >> 6);
-				outString += base64_table[selection];
-				selection = (*inPtr++ & 0x3f);
-				outString += base64_table[selection];
-			}
-			else
-			{
-				outString += base64_table[remainder];
-				outString += '=';
-			}
-		}
-		else
-		{
-			outString += base64_table[remainder];
-			outString += '=';
-			outString += '=';
-		}
-	}
-    return( outString );
+    if ( *inPtr )
+    {
+      selection = remainder | (*inPtr >> 4);
+      remainder = (*inPtr++ & 0x0f) << 2;
+      outString += base64_table[selection];
+    
+      if ( *inPtr )
+      {
+        selection = remainder | (*inPtr >> 6);
+        outString += base64_table[selection];
+        selection = (*inPtr++ & 0x3f);
+        outString += base64_table[selection];
+      }
+      else
+      {
+        outString += base64_table[remainder];
+        outString += '=';
+      }
+    }
+    else
+    {
+      outString += base64_table[remainder];
+      outString += '=';
+      outString += '=';
+    }
+  }
+  return( outString );
 }
 
 int split(const char* string, const char delim, std::vector<std::string>& items) {
-	if(string == NULL)
-		return -1;
+  if(string == NULL)
+    return -1;
 
-	if(string[0] == 0)
-		return -2;
+  if(string[0] == 0)
+    return -2;
 
-	std::string str(string);
-	size_t pos;
-	
-	while(true) {
-		pos = str.find(delim);
-		items.push_back(str.substr(0, pos));
-		str.erase(0, pos+1);
+  std::string str(string);
+  size_t pos;
+  
+  while(true) {
+    pos = str.find(delim);
+    items.push_back(str.substr(0, pos));
+    str.erase(0, pos+1);
 
-		if(pos == std::string::npos)
-			break;
-	}
+    if(pos == std::string::npos)
+      break;
+  }
 
-	return items.size();
+  return items.size();
 }
 
 int pairsplit(const char* string, const char delim, std::string& name, std::string& value) {
-	if(string == NULL)
-		return -1;
+  if(string == NULL)
+    return -1;
 
-	if(string[0] == 0)
-		return -2;
+  if(string[0] == 0)
+    return -2;
 
-	std::string str(string);
-	size_t pos = str.find(delim);
+  std::string str(string);
+  size_t pos = str.find(delim);
 
-	if(pos == std::string::npos || pos == 0 || pos >= str.length())
-		return -3;
+  if(pos == std::string::npos || pos == 0 || pos >= str.length())
+    return -3;
 
-	name = str.substr(0, pos);
-	value = str.substr(pos+1, std::string::npos);
+  name = str.substr(0, pos);
+  value = str.substr(pos+1, std::string::npos);
 
-	return 0;
+  return 0;
 }
 
 /* Sets sse_version  */
 void ssedetect() {
 #if (defined(__i386__) || defined(__x86_64__))
-	/* x86 or x86-64 processor */
-	uint32_t r_edx, r_ecx;
-	
-	__asm__ __volatile__(
+  /* x86 or x86-64 processor */
+  uint32_t r_edx, r_ecx;
+  
+  __asm__ __volatile__(
 #if defined(__i386__)
-        "pushl %%ebx;\n\t"
+    "pushl %%ebx;\n\t"
 #endif
-	"mov $0x1,%%eax\n\t"
-	"cpuid\n\t"
+  "mov $0x1,%%eax\n\t"
+  "cpuid\n\t"
 #if defined(__i386__)
-        "popl %%ebx;\n\t"
+    "popl %%ebx;\n\t"
 #endif
-	: "=d" (r_edx), "=c" (r_ecx)
-	:
-	: "%eax"
+  : "=d" (r_edx), "=c" (r_ecx)
+  :
+  : "%eax"
 #if !defined(__i386__)
-             , "%ebx"
+       , "%ebx"
 #endif
-	);
-	
-	if (r_ecx & 0x00000200) {
-		sseversion = 35; /* SSSE3 */
-		Debug(1,"Detected a x86\\x86-64 processor with SSSE3");
-	} else if (r_ecx & 0x00000001) {
-		sseversion = 30; /* SSE3 */
-		Debug(1,"Detected a x86\\x86-64 processor with SSE3");
-	} else if (r_edx & 0x04000000) {
-		sseversion = 20; /* SSE2 */
-		Debug(1,"Detected a x86\\x86-64 processor with SSE2");
-	} else if (r_edx & 0x02000000) {
-		sseversion = 10; /* SSE */
-		Debug(1,"Detected a x86\\x86-64 processor with SSE");
-	} else {
-		sseversion = 0;
-		Debug(1,"Detected a x86\\x86-64 processor");
-	}
-	
+  );
+  
+  if (r_ecx & 0x00000200) {
+    sseversion = 35; /* SSSE3 */
+    Debug(1,"Detected a x86\\x86-64 processor with SSSE3");
+  } else if (r_ecx & 0x00000001) {
+    sseversion = 30; /* SSE3 */
+    Debug(1,"Detected a x86\\x86-64 processor with SSE3");
+  } else if (r_edx & 0x04000000) {
+    sseversion = 20; /* SSE2 */
+    Debug(1,"Detected a x86\\x86-64 processor with SSE2");
+  } else if (r_edx & 0x02000000) {
+    sseversion = 10; /* SSE */
+    Debug(1,"Detected a x86\\x86-64 processor with SSE");
+  } else {
+    sseversion = 0;
+    Debug(1,"Detected a x86\\x86-64 processor");
+  }
+  
 #else
-	/* Non x86 or x86-64 processor, SSE2 is not available */
-	Debug(1,"Detected a non x86\\x86-64 processor");
-	sseversion = 0;
+  /* Non x86 or x86-64 processor, SSE2 is not available */
+  Debug(1,"Detected a non x86\\x86-64 processor");
+  sseversion = 0;
 #endif
 }
 
@@ -288,60 +288,60 @@ __attribute__((noinline,__target__("sse2")))
 #endif
 void* sse2_aligned_memcpy(void* dest, const void* src, size_t bytes) {
 #if ((defined(__i386__) || defined(__x86_64__) || defined(ZM_KEEP_SSE)) && !defined(ZM_STRIP_SSE))
-	if(bytes > 128) {
-		unsigned int remainder = bytes % 128;
-		const uint8_t* lastsrc = (uint8_t*)src + (bytes - remainder);
+  if(bytes > 128) {
+    unsigned int remainder = bytes % 128;
+    const uint8_t* lastsrc = (uint8_t*)src + (bytes - remainder);
 
-		__asm__ __volatile__(
-		"sse2_copy_iter:\n\t"
-		"movdqa (%0),%%xmm0\n\t"
-		"movdqa 0x10(%0),%%xmm1\n\t"
-		"movdqa 0x20(%0),%%xmm2\n\t"    
-		"movdqa 0x30(%0),%%xmm3\n\t"
-		"movdqa 0x40(%0),%%xmm4\n\t"
-		"movdqa 0x50(%0),%%xmm5\n\t"
-		"movdqa 0x60(%0),%%xmm6\n\t"
-		"movdqa 0x70(%0),%%xmm7\n\t"
-		"movntdq %%xmm0,(%1)\n\t"
-		"movntdq %%xmm1,0x10(%1)\n\t"
-		"movntdq %%xmm2,0x20(%1)\n\t"
-		"movntdq %%xmm3,0x30(%1)\n\t"
-		"movntdq %%xmm4,0x40(%1)\n\t"
-		"movntdq %%xmm5,0x50(%1)\n\t"
-		"movntdq %%xmm6,0x60(%1)\n\t"
-		"movntdq %%xmm7,0x70(%1)\n\t"
-		"add $0x80, %0\n\t"
-		"add $0x80, %1\n\t"
-		"cmp %2, %0\n\t"
-		"jb sse2_copy_iter\n\t"
-		"test %3, %3\n\t"
-		"jz sse2_copy_finish\n\t"
-		"cld\n\t"
-		"rep movsb\n\t"
-		"sse2_copy_finish:\n\t"
-		:
-		: "S" (src), "D" (dest), "r" (lastsrc), "c" (remainder)
-		: "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
-		);
+    __asm__ __volatile__(
+    "sse2_copy_iter:\n\t"
+    "movdqa (%0),%%xmm0\n\t"
+    "movdqa 0x10(%0),%%xmm1\n\t"
+    "movdqa 0x20(%0),%%xmm2\n\t"  
+    "movdqa 0x30(%0),%%xmm3\n\t"
+    "movdqa 0x40(%0),%%xmm4\n\t"
+    "movdqa 0x50(%0),%%xmm5\n\t"
+    "movdqa 0x60(%0),%%xmm6\n\t"
+    "movdqa 0x70(%0),%%xmm7\n\t"
+    "movntdq %%xmm0,(%1)\n\t"
+    "movntdq %%xmm1,0x10(%1)\n\t"
+    "movntdq %%xmm2,0x20(%1)\n\t"
+    "movntdq %%xmm3,0x30(%1)\n\t"
+    "movntdq %%xmm4,0x40(%1)\n\t"
+    "movntdq %%xmm5,0x50(%1)\n\t"
+    "movntdq %%xmm6,0x60(%1)\n\t"
+    "movntdq %%xmm7,0x70(%1)\n\t"
+    "add $0x80, %0\n\t"
+    "add $0x80, %1\n\t"
+    "cmp %2, %0\n\t"
+    "jb sse2_copy_iter\n\t"
+    "test %3, %3\n\t"
+    "jz sse2_copy_finish\n\t"
+    "cld\n\t"
+    "rep movsb\n\t"
+    "sse2_copy_finish:\n\t"
+    :
+    : "S" (src), "D" (dest), "r" (lastsrc), "c" (remainder)
+    : "%xmm0", "%xmm1", "%xmm2", "%xmm3", "%xmm4", "%xmm5", "%xmm6", "%xmm7", "cc", "memory"
+    );
 
-	} else {
-		/* Standard memcpy */
-		__asm__ __volatile__("cld; rep movsb" :: "S"(src), "D"(dest), "c"(bytes) : "cc", "memory");
-	}
+  } else {
+    /* Standard memcpy */
+    __asm__ __volatile__("cld; rep movsb" :: "S"(src), "D"(dest), "c"(bytes) : "cc", "memory");
+  }
 #else
-	/* Non x86\x86-64 platform, use memcpy */
-	memcpy(dest,src,bytes);
+  /* Non x86\x86-64 platform, use memcpy */
+  memcpy(dest,src,bytes);
 #endif
-	return dest;
+  return dest;
 }
 
 void timespec_diff(struct timespec *start, struct timespec *end, struct timespec *diff) {
-	if (((end->tv_nsec)-(start->tv_nsec))<0) {
-		diff->tv_sec = end->tv_sec-start->tv_sec-1;
-		diff->tv_nsec = 1000000000+end->tv_nsec-start->tv_nsec;
-	} else {
-		diff->tv_sec = end->tv_sec-start->tv_sec;
-		diff->tv_nsec = end->tv_nsec-start->tv_nsec;
-	}
+  if (((end->tv_nsec)-(start->tv_nsec))<0) {
+    diff->tv_sec = end->tv_sec-start->tv_sec-1;
+    diff->tv_nsec = 1000000000+end->tv_nsec-start->tv_nsec;
+  } else {
+    diff->tv_sec = end->tv_sec-start->tv_sec;
+    diff->tv_nsec = end->tv_nsec-start->tv_nsec;
+  }
 }
 
diff --git a/src/zm_utils.h b/src/zm_utils.h
index 063c74b7d..a6cb2e150 100644
--- a/src/zm_utils.h
+++ b/src/zm_utils.h
@@ -46,12 +46,12 @@ int pairsplit(const char* string, const char delim, std::string& name, std::stri
 
 inline int max( int a, int b )
 {
-    return( a>=b?a:b );
+  return( a>=b?a:b );
 }
 
 inline int min( int a, int b )
 {
-    return( a<=b?a:b );
+  return( a<=b?a:b );
 }
 
 void ssedetect();
diff --git a/src/zm_videostore.cpp b/src/zm_videostore.cpp
old mode 100755
new mode 100644
index bdbeb0b16..5ef0a9724
--- a/src/zm_videostore.cpp
+++ b/src/zm_videostore.cpp
@@ -33,7 +33,8 @@ extern "C"{
 }
 
 VideoStore::VideoStore(const char *filename_in, const char *format_in,
-                       AVStream *input_st, AVStream *inpaud_st,
+                       AVStream *input_st,
+                       AVStream *inpaud_st,
                        int64_t nStartTime) {
     
 	AVDictionary *pmetadata = NULL;
@@ -46,14 +47,20 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
     keyframeMessage = false;
     keyframeSkipNumber = 0;
 
-
-    Info("Opening video storage stream %s\n", filename);
+    Info("Opening video storage stream %s format: %d\n", filename, format);
 
     //Init everything we need
     int ret;
     av_register_all();
 
-    avformat_alloc_output_context2(&oc, NULL, NULL, filename);
+    ret = avformat_alloc_output_context2(&oc, NULL, NULL, filename);
+    if ( ret < 0 ) {
+            Warning("Could not create video storage stream %s as no output context"
+                  " could be assigned based on filename: %s",
+                    filename,
+                    av_make_error_string(ret).c_str()
+                   );
+    }
         
     //Couldn't deduce format from filename, trying from format name
     if (!oc) {
@@ -91,17 +98,20 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
     if (inpaud_st) {
         audio_st = avformat_new_stream(oc, inpaud_st->codec->codec);
         if (!audio_st) {
-                Fatal("Unable to create audio out stream\n");
-        }
-        ret=avcodec_copy_context(audio_st->codec, inpaud_st->codec);
-        if (ret < 0) {
-            Fatal("Unable to copy audio context %s\n", av_make_error_string(ret).c_str());
-        }   
-        audio_st->codec->codec_tag = 0;
-        if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
-            audio_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+            Error("Unable to create audio out stream\n");
+            audio_st = NULL;
+        } else {
+            ret=avcodec_copy_context(audio_st->codec, inpaud_st->codec);
+            if (ret < 0) {
+                Fatal("Unable to copy audio context %s\n", av_make_error_string(ret).c_str());
+            }   
+            audio_st->codec->codec_tag = 0;
+            if (oc->oformat->flags & AVFMT_GLOBALHEADER) {
+                audio_st->codec->flags |= CODEC_FLAG_GLOBAL_HEADER;
+            }
         }
     } else {
+        Debug(3, "No Audio output stream");
         audio_st = NULL;
     }    
 
@@ -114,38 +124,60 @@ VideoStore::VideoStore(const char *filename_in, const char *format_in,
         }
     }
 
+ //av_dict_set(&opts, "movflags", "frag_custom+dash+delay_moov", 0);
+           //if ((ret = avformat_write_header(ctx, &opts)) < 0) {
+           //}
+           //os->ctx_inited = 1;
+           //avio_flush(ctx->pb);
+           //av_dict_free(&opts);
 
     /* Write the stream header, if any. */
     ret = avformat_write_header(oc, NULL);
     if (ret < 0) {
-            Fatal("Error occurred when writing output file header: %s\n",
+        zm_dump_stream_format( oc, 0, 0, 1 );
+        Fatal("Error occurred when writing output file header to %s: %s\n",
+                    filename,
                     av_make_error_string(ret).c_str());
     }
     
-	 prevDts = 0;
+	prevDts = 0;
     startPts = 0;
     startDts = 0;
     filter_in_rescale_delta_last = AV_NOPTS_VALUE;
 
     startTime=av_gettime()-nStartTime;//oc->start_time;
     Info("VideoStore startTime=%d\n",startTime);
-}
+} // VideoStore::VideoStore
 
 
 VideoStore::~VideoStore(){
     /* Write the trailer before close */
-    av_write_trailer(oc);
+    if ( int rc = av_write_trailer(oc) ) {
+        Error("Error writing trailer %s",  av_err2str( rc ) );
+    } else {
+        Debug(3, "Sucess Writing trailer");
+    }
     
-    avcodec_close(video_st->codec);
+    // I wonder if we should be closing the file first.
+    // I also wonder if we really need to be doing all the context allocation/de-allocation constantly, or whether we can just re-use it.  Just do a file open/close/writeheader/etc.
+    // What if we were only doing audio recording?
+    if ( video_st ) {
+        avcodec_close(video_st->codec);
+    }
     if (audio_st) {
         avcodec_close(audio_st->codec);
     }
     
+    // WHen will be not using a file ?
     if (!(fmt->flags & AVFMT_NOFILE)) {
     /* Close the output file. */
-        avio_close(oc->pb);
+        if ( int rc = avio_close(oc->pb) ) {
+            Error("Error closing avio %s",  av_err2str( rc ) );
+        }
+    } else {
+        Debug(3, "Not closing avio because we are not writing to a file.");
     }
-    
+
     /* free the stream */
     avformat_free_context(oc);
 }
@@ -169,6 +201,9 @@ void VideoStore::dumpPacket( AVPacket *pkt ){
 
 int VideoStore::writeVideoFramePacket(AVPacket *ipkt, AVStream *input_st){//, AVPacket *lastKeyframePkt){
 
+    Debug(3, "before ost_tbcket %d", startTime );
+        zm_dump_stream_format( oc, ipkt->stream_index, 0, 1 );
+    Debug(3, "before ost_tbcket %d", startTime );
     int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, video_st->time_base);
      
     AVPacket opkt, safepkt;
@@ -179,7 +214,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt, AVStream *input_st){//, AV
     //Scale the PTS of the outgoing packet to be the correct time base
     if (ipkt->pts != AV_NOPTS_VALUE) {
         opkt.pts = av_rescale_q(ipkt->pts-startPts, input_st->time_base, video_st->time_base) - ost_tb_start_time;
-	 }else {
+	 } else {
         opkt.pts = AV_NOPTS_VALUE;
 	 }
     
@@ -218,7 +253,7 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt, AVStream *input_st){//, AV
 	 } else if ((prevDts > 0) && (prevDts >= opkt.dts)) {
 		Warning("%s:%d: DTS out of order: %lld \u226E %lld; discarding frame", __FILE__, __LINE__, prevDts, opkt.dts); 
 		prevDts = opkt.dts; 
-		 dumpPacket(&opkt);
+		dumpPacket(&opkt);
 
 	 } else {
 		int ret;
@@ -241,32 +276,47 @@ int VideoStore::writeVideoFramePacket(AVPacket *ipkt, AVStream *input_st){//, AV
 
 int VideoStore::writeAudioFramePacket(AVPacket *ipkt, AVStream *input_st){
 
-    if(!audio_st)
+    if(!audio_st) {
+        Error("Called writeAudioFramePacket when no audio_st");
         return -1;//FIXME -ve return codes do not free packet in ffmpeg_camera at the moment
+    }
     /*if(!keyframeMessage)
         return -1;*/
-        
-    int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, video_st->time_base);
+    //zm_dump_stream_format( oc, ipkt->stream_index, 0, 1 );
+         
+    // What is this doing?  Getting the time of the start of this video chunk? Does that actually make sense?
+    int64_t ost_tb_start_time = av_rescale_q(startTime, AV_TIME_BASE_Q, audio_st->time_base);
         
     AVPacket opkt;
     
     av_init_packet(&opkt);
+    Debug(3, "after init packet" );
 
     
     //Scale the PTS of the outgoing packet to be the correct time base
-    if (ipkt->pts != AV_NOPTS_VALUE)
+    if (ipkt->pts != AV_NOPTS_VALUE) {
+        Debug(3, "Rescaling output pts");
         opkt.pts = av_rescale_q(ipkt->pts-startPts, input_st->time_base, audio_st->time_base) - ost_tb_start_time;
-    else
+    } else {
+        Debug(3, "Setting output pts to AV_NOPTS_VALUE");
         opkt.pts = AV_NOPTS_VALUE;
+    }
     
     //Scale the DTS of the outgoing packet to be the correct time base
-    if(ipkt->dts == AV_NOPTS_VALUE)
+    if(ipkt->dts == AV_NOPTS_VALUE) {
+Debug(4, "ipkt->dts == AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
         opkt.dts = av_rescale_q(input_st->cur_dts-startDts, AV_TIME_BASE_Q, audio_st->time_base);
-    else
+Debug(4, "ipkt->dts == AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
+    } else {
+Debug(4, "ipkt->dts != AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
         opkt.dts = av_rescale_q(ipkt->dts-startDts, input_st->time_base, audio_st->time_base);
+Debug(4, "ipkt->dts != AV_NOPTS_VALUE %d to %d",  AV_NOPTS_VALUE, opkt.dts );
+    }
     opkt.dts -= ost_tb_start_time;
     
+    // Seems like it would be really weird for the codec type to NOT be audiu
     if (audio_st->codec->codec_type == AVMEDIA_TYPE_AUDIO && ipkt->dts != AV_NOPTS_VALUE) {
+        Debug( 4, "code is audio, dts != AV_NOPTS_VALUE " );
          int duration = av_get_audio_frame_duration(input_st->codec, ipkt->size);
          if(!duration)
              duration = input_st->codec->frame_size;
@@ -285,14 +335,13 @@ int VideoStore::writeAudioFramePacket(AVPacket *ipkt, AVStream *input_st){
     opkt.data = ipkt->data;
     opkt.size = ipkt->size;
     opkt.stream_index = ipkt->stream_index;
-    /*opkt.flags |= AV_PKT_FLAG_KEY;*/
         
     int ret;
     ret = av_interleaved_write_frame(oc, &opkt);
     if(ret!=0){
         Fatal("Error encoding audio frame packet: %s\n", av_make_error_string(ret).c_str());
     }
-    
+    Debug(4,"Success writing audio frame" ); 
     av_free_packet(&opkt);
     return 0;
 }
diff --git a/src/zm_videostore.h b/src/zm_videostore.h
old mode 100755
new mode 100644
diff --git a/src/zm_zone.cpp b/src/zm_zone.cpp
index 290f39131..f3d1120bc 100644
--- a/src/zm_zone.cpp
+++ b/src/zm_zone.cpp
@@ -25,170 +25,170 @@
 
 void Zone::Setup( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold, int p_max_pixel_threshold, int p_min_alarm_pixels, int p_max_alarm_pixels, const Coord &p_filter_box, int p_min_filter_pixels, int p_max_filter_pixels, int p_min_blob_pixels, int p_max_blob_pixels, int p_min_blobs, int p_max_blobs, int p_overload_frames, int p_extend_alarm_frames )
 {
-	monitor = p_monitor;
+  monitor = p_monitor;
 
-	id = p_id;
-	label = new char[strlen(p_label)+1];
-	strcpy( label, p_label );
-	type = p_type;
-	polygon = p_polygon;
-	alarm_rgb = p_alarm_rgb;
-	check_method = p_check_method;
-	min_pixel_threshold = p_min_pixel_threshold;
-	max_pixel_threshold = p_max_pixel_threshold;
-	min_alarm_pixels = p_min_alarm_pixels;
-	max_alarm_pixels = p_max_alarm_pixels;
-	filter_box = p_filter_box;
-	min_filter_pixels = p_min_filter_pixels;
-	max_filter_pixels = p_max_filter_pixels;
-	min_blob_pixels = p_min_blob_pixels;
-	max_blob_pixels = p_max_blob_pixels;
-	min_blobs = p_min_blobs;
-	max_blobs = p_max_blobs;
-	overload_frames = p_overload_frames;
-        extend_alarm_frames = p_extend_alarm_frames;
+  id = p_id;
+  label = new char[strlen(p_label)+1];
+  strcpy( label, p_label );
+  type = p_type;
+  polygon = p_polygon;
+  alarm_rgb = p_alarm_rgb;
+  check_method = p_check_method;
+  min_pixel_threshold = p_min_pixel_threshold;
+  max_pixel_threshold = p_max_pixel_threshold;
+  min_alarm_pixels = p_min_alarm_pixels;
+  max_alarm_pixels = p_max_alarm_pixels;
+  filter_box = p_filter_box;
+  min_filter_pixels = p_min_filter_pixels;
+  max_filter_pixels = p_max_filter_pixels;
+  min_blob_pixels = p_min_blob_pixels;
+  max_blob_pixels = p_max_blob_pixels;
+  min_blobs = p_min_blobs;
+  max_blobs = p_max_blobs;
+  overload_frames = p_overload_frames;
+    extend_alarm_frames = p_extend_alarm_frames;
 
-	Debug( 1, "Initialised zone %d/%s - %d - %dx%d - Rgb:%06x, CM:%d, MnAT:%d, MxAT:%d, MnAP:%d, MxAP:%d, FB:%dx%d, MnFP:%d, MxFP:%d, MnBS:%d, MxBS:%d, MnB:%d, MxB:%d, OF: %d, AF: %d", id, label, type, polygon.Width(), polygon.Height(), alarm_rgb, check_method, min_pixel_threshold, max_pixel_threshold, min_alarm_pixels, max_alarm_pixels, filter_box.X(), filter_box.Y(), min_filter_pixels, max_filter_pixels, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs, overload_frames, extend_alarm_frames );
+  Debug( 1, "Initialised zone %d/%s - %d - %dx%d - Rgb:%06x, CM:%d, MnAT:%d, MxAT:%d, MnAP:%d, MxAP:%d, FB:%dx%d, MnFP:%d, MxFP:%d, MnBS:%d, MxBS:%d, MnB:%d, MxB:%d, OF: %d, AF: %d", id, label, type, polygon.Width(), polygon.Height(), alarm_rgb, check_method, min_pixel_threshold, max_pixel_threshold, min_alarm_pixels, max_alarm_pixels, filter_box.X(), filter_box.Y(), min_filter_pixels, max_filter_pixels, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs, overload_frames, extend_alarm_frames );
 
-	alarmed = false;
-	pixel_diff = 0;
-	alarm_pixels = 0;
-	alarm_filter_pixels = 0;
-	alarm_blob_pixels = 0;
-	alarm_blobs = 0;
-	min_blob_size = 0;
-	max_blob_size = 0;
-	image = 0;
-	score = 0;
+  alarmed = false;
+  pixel_diff = 0;
+  alarm_pixels = 0;
+  alarm_filter_pixels = 0;
+  alarm_blob_pixels = 0;
+  alarm_blobs = 0;
+  min_blob_size = 0;
+  max_blob_size = 0;
+  image = 0;
+  score = 0;
 
-	overload_count = 0;
-	extend_alarm_count = 0;
+  overload_count = 0;
+  extend_alarm_count = 0;
 
-	pg_image = new Image( monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE);
-	pg_image->Clear();
-	pg_image->Fill( 0xff, polygon );
-	pg_image->Outline( 0xff, polygon );
+  pg_image = new Image( monitor->Width(), monitor->Height(), 1, ZM_SUBPIX_ORDER_NONE);
+  pg_image->Clear();
+  pg_image->Fill( 0xff, polygon );
+  pg_image->Outline( 0xff, polygon );
 
-	ranges = new Range[monitor->Height()];
-	for ( unsigned int y = 0; y < monitor->Height(); y++)
-	{
-		ranges[y].lo_x = -1;
-		ranges[y].hi_x = 0;
-		ranges[y].off_x = 0;
-		const uint8_t *ppoly = pg_image->Buffer( 0, y );
-		for ( unsigned int x = 0; x < monitor->Width(); x++, ppoly++ )
-		{
-			if ( *ppoly )
-			{
-				if ( ranges[y].lo_x == -1 )
-				{
-					ranges[y].lo_x = x;
-				}
-				if ( (unsigned int)ranges[y].hi_x < x )
-				{
-					ranges[y].hi_x = x;
-				}
-			}
-		}
-	}
-	
-	if ( config.record_diag_images )
-	{
-		static char diag_path[PATH_MAX] = "";
-		if ( !diag_path[0] )
-		{
-			snprintf( diag_path, sizeof(diag_path), "%s/%s/diag-%d-poly.jpg", config.dir_events, monitor->Name(), id);
-		}
-		pg_image->WriteJpeg( diag_path );
-	}
+  ranges = new Range[monitor->Height()];
+  for ( unsigned int y = 0; y < monitor->Height(); y++)
+  {
+    ranges[y].lo_x = -1;
+    ranges[y].hi_x = 0;
+    ranges[y].off_x = 0;
+    const uint8_t *ppoly = pg_image->Buffer( 0, y );
+    for ( unsigned int x = 0; x < monitor->Width(); x++, ppoly++ )
+    {
+      if ( *ppoly )
+      {
+        if ( ranges[y].lo_x == -1 )
+        {
+          ranges[y].lo_x = x;
+        }
+        if ( (unsigned int)ranges[y].hi_x < x )
+        {
+          ranges[y].hi_x = x;
+        }
+      }
+    }
+  }
+  
+  if ( config.record_diag_images )
+  {
+    static char diag_path[PATH_MAX] = "";
+    if ( !diag_path[0] )
+    {
+      snprintf( diag_path, sizeof(diag_path), "%s/%s/diag-%d-poly.jpg", config.dir_events, monitor->Name(), id);
+    }
+    pg_image->WriteJpeg( diag_path );
+  }
 }
 
 Zone::~Zone()
 {
-	delete[] label;
-	delete image;
-	delete pg_image;
-	delete[] ranges;
+  delete[] label;
+  delete image;
+  delete pg_image;
+  delete[] ranges;
 }
 
 void Zone::RecordStats( const Event *event )
 {
    static char sql[ZM_SQL_MED_BUFSIZ];
-	snprintf( sql, sizeof(sql), "insert into Stats set MonitorId=%d, ZoneId=%d, EventId=%d, FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d", monitor->Id(), id, event->Id(), event->Frames()+1, pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score );
-	if ( mysql_query( &dbconn, sql ) )
-	{
-		Error( "Can't insert event stats: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
+  snprintf( sql, sizeof(sql), "insert into Stats set MonitorId=%d, ZoneId=%d, EventId=%d, FrameId=%d, PixelDiff=%d, AlarmPixels=%d, FilterPixels=%d, BlobPixels=%d, Blobs=%d, MinBlobSize=%d, MaxBlobSize=%d, MinX=%d, MinY=%d, MaxX=%d, MaxY=%d, Score=%d", monitor->Id(), id, event->Id(), event->Frames()+1, pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, min_blob_size, max_blob_size, alarm_box.LoX(), alarm_box.LoY(), alarm_box.HiX(), alarm_box.HiY(), score );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't insert event stats: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 }
 
 
 //=============================================================================
 bool Zone::CheckOverloadCount()
 {
-    Info("Overloaded count: %d, Overloaded frames: %d", overload_count, overload_frames);
-    if ( overload_count )
-    {
-            Info( "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
-            Debug( 4, "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
-            overload_count--;
-            return( false );
-    }
-    return true;
+  Info("Overloaded count: %d, Overloaded frames: %d", overload_count, overload_frames);
+  if ( overload_count )
+  {
+      Info( "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
+      Debug( 4, "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
+      overload_count--;
+      return( false );
+  }
+  return true;
 }
 
 void Zone::SetScore(unsigned int nScore)
 {
-    score = nScore;
+  score = nScore;
 }
 
 
 void Zone::SetAlarmImage(const Image* srcImage)
 {
-    delete image;
-    image = new Image(*srcImage);
+  delete image;
+  image = new Image(*srcImage);
 }
 
 int Zone::GetOverloadCount()
 {
-    return overload_count;
+  return overload_count;
 }
 
 void Zone::SetOverloadCount(int nOverCount)
 {
-    overload_count = nOverCount;
+  overload_count = nOverCount;
 }
 
 int Zone::GetOverloadFrames()
 {
-    return overload_frames;
+  return overload_frames;
 }
 
 int Zone::GetExtendAlarmCount()
 {
-    return extend_alarm_count;
+  return extend_alarm_count;
 }
 
 void Zone::SetExtendAlarmCount(int nExtendAlarmCount)
 {
-    extend_alarm_count = nExtendAlarmCount;
+  extend_alarm_count = nExtendAlarmCount;
 }
 
 int Zone::GetExtendAlarmFrames()
 {
-    return extend_alarm_frames;
+  return extend_alarm_frames;
 }
 
 bool Zone::CheckExtendAlarmCount()
 {
-    Info("ExtendAlarm count: %d, ExtendAlarm frames: %d", extend_alarm_count, extend_alarm_frames);
-    if ( extend_alarm_count )
-    {
-            Debug( 3, "In extend mode, %d frames of %d remaining", extend_alarm_count, extend_alarm_frames );
-            extend_alarm_count--;
-            return( true );
-    }
-    return false;
+  Info("ExtendAlarm count: %d, ExtendAlarm frames: %d", extend_alarm_count, extend_alarm_frames);
+  if ( extend_alarm_count )
+  {
+      Debug( 3, "In extend mode, %d frames of %d remaining", extend_alarm_count, extend_alarm_frames );
+      extend_alarm_count--;
+      return( true );
+  }
+  return false;
 }
 
 
@@ -198,920 +198,920 @@ bool Zone::CheckExtendAlarmCount()
 
 bool Zone::CheckAlarms( const Image *delta_image )
 {
-	ResetStats();
+  ResetStats();
 
-	if ( overload_count )
-	{
-		Info( "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
-		Debug( 4, "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
-		overload_count--;
-		return( false );
-	}
+  if ( overload_count )
+  {
+    Info( "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
+    Debug( 4, "In overload mode, %d frames of %d remaining", overload_count, overload_frames );
+    overload_count--;
+    return( false );
+  }
 
-	delete image;
-	// Get the difference image
-	Image *diff_image = image = new Image( *delta_image );
-	int diff_width = diff_image->Width();
-	uint8_t* diff_buff = (uint8_t*)diff_image->Buffer();
-	uint8_t* pdiff;
-	const uint8_t* ppoly;
+  delete image;
+  // Get the difference image
+  Image *diff_image = image = new Image( *delta_image );
+  int diff_width = diff_image->Width();
+  uint8_t* diff_buff = (uint8_t*)diff_image->Buffer();
+  uint8_t* pdiff;
+  const uint8_t* ppoly;
 
-	unsigned int pixel_diff_count = 0;
+  unsigned int pixel_diff_count = 0;
 
-	int alarm_lo_x = 0;
-	int alarm_hi_x = 0;
-	int alarm_lo_y = 0;
-	int alarm_hi_y = 0;
+  int alarm_lo_x = 0;
+  int alarm_hi_x = 0;
+  int alarm_lo_y = 0;
+  int alarm_hi_y = 0;
 
-	int alarm_mid_x = -1;
-	int alarm_mid_y = -1;
-	
-	unsigned int lo_y = polygon.LoY();
-	unsigned int lo_x = polygon.LoX();
-	unsigned int hi_x = polygon.HiX();
-	unsigned int hi_y = polygon.HiY();
+  int alarm_mid_x = -1;
+  int alarm_mid_y = -1;
+  
+  unsigned int lo_y = polygon.LoY();
+  unsigned int lo_x = polygon.LoX();
+  unsigned int hi_x = polygon.HiX();
+  unsigned int hi_y = polygon.HiY();
 
-	Debug( 4, "Checking alarms for zone %d/%s in lines %d -> %d", id, label, lo_y, hi_y );
-	
-	
-	Debug( 5, "Checking for alarmed pixels" );
-	/* if(config.cpu_extensions && sseversion >= 20) {
-		sse2_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
-	} else {
-		std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
-	} */
-	std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
-	
-	if ( config.record_diag_images )
-	{
-		static char diag_path[PATH_MAX] = "";
-		if ( !diag_path[0] )
-		{
-			snprintf( diag_path, sizeof(diag_path), "%s/%s/diag-%d-%d.jpg", config.dir_events, monitor->Name(), id, 1 );
-		}
-		diff_image->WriteJpeg( diag_path );
-	}
-	
-	if ( pixel_diff_count && alarm_pixels )
-		pixel_diff = pixel_diff_count/alarm_pixels;
-	Debug( 5, "Got %d alarmed pixels, need %d -> %d, avg pixel diff %d", alarm_pixels, min_alarm_pixels, max_alarm_pixels, pixel_diff );
+  Debug( 4, "Checking alarms for zone %d/%s in lines %d -> %d", id, label, lo_y, hi_y );
+  
+  
+  Debug( 5, "Checking for alarmed pixels" );
+  /* if(config.cpu_extensions && sseversion >= 20) {
+    sse2_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
+  } else {
+    std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
+  } */
+  std_alarmedpixels(diff_image, pg_image, &alarm_pixels, &pixel_diff_count);
+  
+  if ( config.record_diag_images )
+  {
+    static char diag_path[PATH_MAX] = "";
+    if ( !diag_path[0] )
+    {
+      snprintf( diag_path, sizeof(diag_path), "%s/%s/diag-%d-%d.jpg", config.dir_events, monitor->Name(), id, 1 );
+    }
+    diff_image->WriteJpeg( diag_path );
+  }
+  
+  if ( pixel_diff_count && alarm_pixels )
+    pixel_diff = pixel_diff_count/alarm_pixels;
+  Debug( 5, "Got %d alarmed pixels, need %d -> %d, avg pixel diff %d", alarm_pixels, min_alarm_pixels, max_alarm_pixels, pixel_diff );
 
-	if( alarm_pixels ) {
-		if( min_alarm_pixels && (alarm_pixels < (unsigned int)min_alarm_pixels) ) {
-			/* Not enough pixels alarmed */
-			return (false);
-		} else if( max_alarm_pixels && (alarm_pixels > (unsigned int)max_alarm_pixels) ) {
-			/* Too many pixels alarmed */
-			overload_count = overload_frames;
-			return (false);
-		}
-	} else {
-		/* No alarmed pixels */
-		return (false);
-	}
-	
-	score = (100*alarm_pixels)/polygon.Area();
-	if(score < 1)
-		score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
-	Debug( 5, "Current score is %d", score );
-	
-	if ( check_method >= FILTERED_PIXELS )
-	{
-		int bx = filter_box.X();
-		int by = filter_box.Y();
-		int bx1 = bx-1;
-		int by1 = by-1;
+  if( alarm_pixels ) {
+    if( min_alarm_pixels && (alarm_pixels < (unsigned int)min_alarm_pixels) ) {
+      /* Not enough pixels alarmed */
+      return (false);
+    } else if( max_alarm_pixels && (alarm_pixels > (unsigned int)max_alarm_pixels) ) {
+      /* Too many pixels alarmed */
+      overload_count = overload_frames;
+      return (false);
+    }
+  } else {
+    /* No alarmed pixels */
+    return (false);
+  }
+  
+  score = (100*alarm_pixels)/polygon.Area();
+  if(score < 1)
+    score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
+  Debug( 5, "Current score is %d", score );
+  
+  if ( check_method >= FILTERED_PIXELS )
+  {
+    int bx = filter_box.X();
+    int by = filter_box.Y();
+    int bx1 = bx-1;
+    int by1 = by-1;
 
-		Debug( 5, "Checking for filtered pixels" );
-		if ( bx > 1 || by > 1 )
-		{
-			// Now remove any pixels smaller than our filter size
-			unsigned char *cpdiff;
-			int ldx, hdx, ldy, hdy;
-			bool block;
-			for ( unsigned int y = lo_y; y <= hi_y; y++ )
-			{
-				int lo_x = ranges[y].lo_x;
-				int hi_x = ranges[y].hi_x;
+    Debug( 5, "Checking for filtered pixels" );
+    if ( bx > 1 || by > 1 )
+    {
+      // Now remove any pixels smaller than our filter size
+      unsigned char *cpdiff;
+      int ldx, hdx, ldy, hdy;
+      bool block;
+      for ( unsigned int y = lo_y; y <= hi_y; y++ )
+      {
+        int lo_x = ranges[y].lo_x;
+        int hi_x = ranges[y].hi_x;
 
-				pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
+        pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
 
-				for ( int x = lo_x; x <= hi_x; x++, pdiff++ )
-				{
-					if ( *pdiff == WHITE )
-					{
-						// Check participation in an X block
-						ldx = (x>=(lo_x+bx1))?-bx1:lo_x-x;
-						hdx = (x<=(hi_x-bx1))?0:((hi_x-x)-bx1);
-						ldy = (y>=(lo_y+by1))?-by1:lo_y-y;
-						hdy = (y<=(hi_y-by1))?0:((hi_y-y)-by1);
-						block = false;
-						for ( int dy = ldy; !block && dy <= hdy; dy++ )
-						{
-							for ( int dx = ldx; !block && dx <= hdx; dx++ )
-							{
-								block = true;
-								for ( int dy2 = 0; block && dy2 < by; dy2++ )
-								{
-									for ( int dx2 = 0; block && dx2 < bx; dx2++ )
-									{
-										cpdiff = diff_buff + (((y+dy+dy2)*diff_width) + (x+dx+dx2));
-										if ( !*cpdiff )
-										{
-											block = false;
-										}
-									}
-								}
-							}
-						}
-						if ( !block )
-						{
-							*pdiff = BLACK;
-							continue;
-						}
-						alarm_filter_pixels++;
-					}
-				}
-			}
-		}
-		else
-		{
-			alarm_filter_pixels = alarm_pixels;
-		}
-		
-		if ( config.record_diag_images )
-		{
-			static char diag_path[PATH_MAX] = "";
-			if ( !diag_path[0] )
-			{
-				snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 2 );
-			}
-			diff_image->WriteJpeg( diag_path );
-		}
-		
-		Debug( 5, "Got %d filtered pixels, need %d -> %d", alarm_filter_pixels, min_filter_pixels, max_filter_pixels );
-		
-		if( alarm_filter_pixels ) {
-			if( min_filter_pixels && (alarm_filter_pixels < min_filter_pixels) ) {
-				/* Not enough pixels alarmed */
-				return (false);
-			} else if( max_filter_pixels && (alarm_filter_pixels > max_filter_pixels) ) {
-				/* Too many pixels alarmed */
-				overload_count = overload_frames;
-				return (false);
-			}
-		} else {
-			/* No filtered pixels */
-			return (false);
-		}
-		
-		score = (100*alarm_filter_pixels)/(polygon.Area());
-		if(score < 1)
-			score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
-		Debug( 5, "Current score is %d", score );
+        for ( int x = lo_x; x <= hi_x; x++, pdiff++ )
+        {
+          if ( *pdiff == WHITE )
+          {
+            // Check participation in an X block
+            ldx = (x>=(lo_x+bx1))?-bx1:lo_x-x;
+            hdx = (x<=(hi_x-bx1))?0:((hi_x-x)-bx1);
+            ldy = (y>=(lo_y+by1))?-by1:lo_y-y;
+            hdy = (y<=(hi_y-by1))?0:((hi_y-y)-by1);
+            block = false;
+            for ( int dy = ldy; !block && dy <= hdy; dy++ )
+            {
+              for ( int dx = ldx; !block && dx <= hdx; dx++ )
+              {
+                block = true;
+                for ( int dy2 = 0; block && dy2 < by; dy2++ )
+                {
+                  for ( int dx2 = 0; block && dx2 < bx; dx2++ )
+                  {
+                    cpdiff = diff_buff + (((y+dy+dy2)*diff_width) + (x+dx+dx2));
+                    if ( !*cpdiff )
+                    {
+                      block = false;
+                    }
+                  }
+                }
+              }
+            }
+            if ( !block )
+            {
+              *pdiff = BLACK;
+              continue;
+            }
+            alarm_filter_pixels++;
+          }
+        }
+      }
+    }
+    else
+    {
+      alarm_filter_pixels = alarm_pixels;
+    }
+    
+    if ( config.record_diag_images )
+    {
+      static char diag_path[PATH_MAX] = "";
+      if ( !diag_path[0] )
+      {
+        snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 2 );
+      }
+      diff_image->WriteJpeg( diag_path );
+    }
+    
+    Debug( 5, "Got %d filtered pixels, need %d -> %d", alarm_filter_pixels, min_filter_pixels, max_filter_pixels );
+    
+    if( alarm_filter_pixels ) {
+      if( min_filter_pixels && (alarm_filter_pixels < min_filter_pixels) ) {
+        /* Not enough pixels alarmed */
+        return (false);
+      } else if( max_filter_pixels && (alarm_filter_pixels > max_filter_pixels) ) {
+        /* Too many pixels alarmed */
+        overload_count = overload_frames;
+        return (false);
+      }
+    } else {
+      /* No filtered pixels */
+      return (false);
+    }
+    
+    score = (100*alarm_filter_pixels)/(polygon.Area());
+    if(score < 1)
+      score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
+    Debug( 5, "Current score is %d", score );
 
-		if ( check_method >= BLOBS )
-		{
-			Debug( 5, "Checking for blob pixels" );
-			typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
-			BlobStats blob_stats[256];
-			memset( blob_stats, 0, sizeof(BlobStats)*256 );
-			uint8_t *spdiff;
-			uint8_t last_x, last_y;
-			BlobStats *bsx, *bsy;
-			BlobStats *bsm, *bss;
-			for ( unsigned int y = lo_y; y <= hi_y; y++ )
-			{
-				int lo_x = ranges[y].lo_x;
-				int hi_x = ranges[y].hi_x;
+    if ( check_method >= BLOBS )
+    {
+      Debug( 5, "Checking for blob pixels" );
+      typedef struct { unsigned char tag; int count; int lo_x; int hi_x; int lo_y; int hi_y; } BlobStats;
+      BlobStats blob_stats[256];
+      memset( blob_stats, 0, sizeof(BlobStats)*256 );
+      uint8_t *spdiff;
+      uint8_t last_x, last_y;
+      BlobStats *bsx, *bsy;
+      BlobStats *bsm, *bss;
+      for ( unsigned int y = lo_y; y <= hi_y; y++ )
+      {
+        int lo_x = ranges[y].lo_x;
+        int hi_x = ranges[y].hi_x;
 
-				pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
-				for ( int x = lo_x; x <= hi_x; x++, pdiff++ )
-				{
-					if ( *pdiff == WHITE )
-					{
-						Debug( 9, "Got white pixel at %d,%d (%p)", x, y, pdiff );
-						//last_x = (x>lo_x)?*(pdiff-1):0;
-						//last_y = (y>lo_y&&x>=last_lo_x&&x<=last_hi_x)?*(pdiff-diff_width):0;
-						
-						last_x = 0;
-						if(x > 0) {
-							if((x-1) >= lo_x) {
-								last_x = *(pdiff-1);
-							}
-						}
-						
-						last_y = 0;
-						if(y > 0) {
-							if((y-1) >= lo_y && ranges[(y-1)].lo_x <= x && ranges[(y-1)].hi_x >= x) {
-								last_y = *(pdiff-diff_width);
-							}
-						}
-						
-						if ( last_x )
-						{
-							Debug( 9, "Left neighbour is %d", last_x );
-							bsx = &blob_stats[last_x];
-							if ( last_y )
-							{
-								Debug( 9, "Top neighbour is %d", last_y );
-								bsy = &blob_stats[last_y];
-								if ( last_x == last_y )
-								{
-									Debug( 9, "Matching neighbours, setting to %d", last_x );
-									// Add to the blob from the x side (either side really)
-									*pdiff = last_x;
-									alarm_blob_pixels++;
-									bsx->count++;
-									if ( x > bsx->hi_x ) bsx->hi_x = x;
-									if ( (int)y > bsx->hi_y ) bsx->hi_y = y;
-								}
-								else
-								{
-									// Aggregate blobs
-									bsm = bsx->count>=bsy->count?bsx:bsy;
-									bss = bsm==bsx?bsy:bsx;
-
-									Debug( 9, "Different neighbours, setting pixels of %d to %d", bss->tag, bsm->tag );
-									Debug( 9, "Master blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bsm->tag, bsm->count, bsm->lo_x, bsm->hi_x, bsm->lo_y, bsm->hi_y );
-									Debug( 9, "Slave blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bss->tag, bss->count, bss->lo_x, bss->hi_x, bss->lo_y, bss->hi_y );
-									// Now change all those pixels to the other setting
-									int changed = 0;
-									for ( int sy = bss->lo_y; sy <= bss->hi_y; sy++)
-									{
-										int lo_sx = bss->lo_x>=ranges[sy].lo_x?bss->lo_x:ranges[sy].lo_x;
-										int hi_sx = bss->hi_x<=ranges[sy].hi_x?bss->hi_x:ranges[sy].hi_x;
-
-										Debug( 9, "Changing %d, %d->%d", sy, lo_sx, hi_sx );
-										Debug( 9, "Range %d, %d->%d", sy, ranges[sy].lo_x, ranges[sy].hi_x );
-										spdiff = diff_buff + ((diff_width * sy) + lo_sx);
-										for ( int sx = lo_sx; sx <= hi_sx; sx++, spdiff++ )
-										{
-											Debug( 9, "Pixel at %d,%d (%p) is %d", sx, sy, spdiff, *spdiff );
-											if ( *spdiff == bss->tag )
-											{
-												Debug( 9, "Setting pixel" );
-												*spdiff = bsm->tag;
-												changed++;
-											}
-										}
-									}
-									*pdiff = bsm->tag;
-									alarm_blob_pixels++;
-									if ( !changed )
-									{
-										Info( "Master blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bsm->tag, bsm->count, bsm->lo_x, bsm->hi_x, bsm->lo_y, bsm->hi_y );
-										Info( "Slave blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bss->tag, bss->count, bss->lo_x, bss->hi_x, bss->lo_y, bss->hi_y );
-										Error( "No pixels changed, exiting" );
-										exit( -1 );
-									}
-
-									// Merge the slave blob into the master
-									bsm->count += bss->count+1;
-									if ( x > bsm->hi_x ) bsm->hi_x = x;
-									if ( (int)y > bsm->hi_y ) bsm->hi_y = y;
-									if ( bss->lo_x < bsm->lo_x ) bsm->lo_x = bss->lo_x;
-									if ( bss->lo_y < bsm->lo_y ) bsm->lo_y = bss->lo_y;
-									if ( bss->hi_x > bsm->hi_x ) bsm->hi_x = bss->hi_x;
-									if ( bss->hi_y > bsm->hi_y ) bsm->hi_y = bss->hi_y;
-
-									alarm_blobs--;
-
-									Debug( 6, "Merging blob %d with %d at %d,%d, %d current blobs", bss->tag, bsm->tag, x, y, alarm_blobs );
-
-									// Clear out the old blob
-									bss->tag = 0;
-									bss->count = 0;
-									bss->lo_x = 0;
-									bss->lo_y = 0;
-									bss->hi_x = 0;
-									bss->hi_y = 0;
-								}
-							}
-							else
-							{
-								Debug( 9, "Setting to left neighbour %d", last_x );
-								// Add to the blob from the x side 
-								*pdiff = last_x;
-								alarm_blob_pixels++;
-								bsx->count++;
-								if ( x > bsx->hi_x ) bsx->hi_x = x;
-								if ( (int)y > bsx->hi_y ) bsx->hi_y = y;
-							}
-						}
-						else
-						{
-							if ( last_y )
-							{
-								Debug( 9, "Top neighbour is %d", last_y );
-								Debug( 9, "Setting to top neighbour %d", last_y );
-								
-								// Add to the blob from the y side
-								BlobStats *bsy = &blob_stats[last_y];
-
-								*pdiff = last_y;
-								alarm_blob_pixels++;
-								bsy->count++;
-								if ( x > bsy->hi_x ) bsy->hi_x = x;
-								if ( (int)y > bsy->hi_y ) bsy->hi_y = y;
-							}
-							else
-							{
-								// Create a new blob
-								int i;
-								for ( i = (WHITE-1); i > 0; i-- )
-								{
-									BlobStats *bs = &blob_stats[i];
-									// See if we can recycle one first, only if it's at least two rows up
-									if ( bs->count && bs->hi_y < (int)(y-1) )
-									{
-										if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) )
-										{
-											if ( config.create_analysis_images || config.record_diag_images )
-											{
-												for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
-												{
-													spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
-													for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
-													{
-														if ( *spdiff == bs->tag )
-														{
-															*spdiff = BLACK;
-														}
-													}
-												}
-											}
-											alarm_blobs--;
-											alarm_blob_pixels -= bs->count;
-										
-											Debug( 6, "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs );
-
-											bs->tag = 0;
-											bs->count = 0;
-											bs->lo_x = 0;
-											bs->lo_y = 0;
-											bs->hi_x = 0;
-											bs->hi_y = 0;
-										}
-									}
-									if ( !bs->count )
-									{
-										Debug( 9, "Creating new blob %d", i );
-										*pdiff = i;
-										alarm_blob_pixels++;
-										bs->tag = i;
-										bs->count++;
-										bs->lo_x = bs->hi_x = x;
-										bs->lo_y = bs->hi_y = y;
-										alarm_blobs++;
-
-										Debug( 6, "Created blob %d at %d,%d, %d current blobs", bs->tag, x, y, alarm_blobs );
-										break;
-									}
-								}
-								if ( i == 0 )
-								{
-									Warning( "Max blob count reached. Unable to allocate new blobs so terminating. Zone settings may be too sensitive." );
-									x = hi_x+1;
-									y = hi_y+1;
-								}
-							}
-						}
-					}
-				}
-			}
-			if ( config.record_diag_images )
-			{
-				static char diag_path[PATH_MAX] = "";
-				if ( !diag_path[0] )
-				{
-					snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 3 );
-				}
-				diff_image->WriteJpeg( diag_path );
-			}
-
-			if ( !alarm_blobs )
-			{
-				return( false );
-			}
-			
-			Debug( 5, "Got %d raw blob pixels, %d raw blobs, need %d -> %d, %d -> %d", alarm_blob_pixels, alarm_blobs, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs );
-
-			// Now eliminate blobs under the threshold
-			for ( int i = 1; i < WHITE; i++ )
-			{
-				BlobStats *bs = &blob_stats[i];
-				if ( bs->count )
-				{
-					if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) )
-					{
-						if ( config.create_analysis_images || config.record_diag_images )
-						{
-							for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
-							{
-								spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
-								for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
-								{
-									if ( *spdiff == bs->tag )
-									{
-										*spdiff = BLACK;
-									}
-								}
-							}
-						}
-						alarm_blobs--;
-						alarm_blob_pixels -= bs->count;
-						
-						Debug( 6, "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs );
-
-						bs->tag = 0;
-						bs->count = 0;
-						bs->lo_x = 0;
-						bs->lo_y = 0;
-						bs->hi_x = 0;
-						bs->hi_y = 0;
-					}
-					else
-					{
-						Debug( 6, "Preserved blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs );
-						if ( !min_blob_size || bs->count < min_blob_size ) min_blob_size = bs->count;
-						if ( !max_blob_size || bs->count > max_blob_size ) max_blob_size = bs->count;
-					}
-				}
-			}
-			if ( config.record_diag_images )
-			{
-				static char diag_path[PATH_MAX] = "";
-				if ( !diag_path[0] )
-				{
-					snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 4 );
-				}
-				diff_image->WriteJpeg( diag_path );
-			}
-			Debug( 5, "Got %d blob pixels, %d blobs, need %d -> %d, %d -> %d", alarm_blob_pixels, alarm_blobs, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs );           
+        pdiff = (uint8_t*)diff_image->Buffer( lo_x, y );
+        for ( int x = lo_x; x <= hi_x; x++, pdiff++ )
+        {
+          if ( *pdiff == WHITE )
+          {
+            Debug( 9, "Got white pixel at %d,%d (%p)", x, y, pdiff );
+            //last_x = (x>lo_x)?*(pdiff-1):0;
+            //last_y = (y>lo_y&&x>=last_lo_x&&x<=last_hi_x)?*(pdiff-diff_width):0;
             
-			if( alarm_blobs ) {
-				if( min_blobs && (alarm_blobs < min_blobs) ) {
-					/* Not enough pixels alarmed */
-					return (false);
-				} else if(max_blobs && (alarm_blobs > max_blobs) ) {
-					/* Too many pixels alarmed */
-					overload_count = overload_frames;
-					return (false);
-				}
-			} else {
-				/* No blobs */
-				return (false);
-			}
-			
-			score = (100*alarm_blob_pixels)/(polygon.Area());
-			if(score < 1)
-				score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
-			Debug( 5, "Current score is %d", score );
+            last_x = 0;
+            if(x > 0) {
+              if((x-1) >= lo_x) {
+                last_x = *(pdiff-1);
+              }
+            }
+            
+            last_y = 0;
+            if(y > 0) {
+              if((y-1) >= lo_y && ranges[(y-1)].lo_x <= x && ranges[(y-1)].hi_x >= x) {
+                last_y = *(pdiff-diff_width);
+              }
+            }
+            
+            if ( last_x )
+            {
+              Debug( 9, "Left neighbour is %d", last_x );
+              bsx = &blob_stats[last_x];
+              if ( last_y )
+              {
+                Debug( 9, "Top neighbour is %d", last_y );
+                bsy = &blob_stats[last_y];
+                if ( last_x == last_y )
+                {
+                  Debug( 9, "Matching neighbours, setting to %d", last_x );
+                  // Add to the blob from the x side (either side really)
+                  *pdiff = last_x;
+                  alarm_blob_pixels++;
+                  bsx->count++;
+                  if ( x > bsx->hi_x ) bsx->hi_x = x;
+                  if ( (int)y > bsx->hi_y ) bsx->hi_y = y;
+                }
+                else
+                {
+                  // Aggregate blobs
+                  bsm = bsx->count>=bsy->count?bsx:bsy;
+                  bss = bsm==bsx?bsy:bsx;
 
-			alarm_lo_x = polygon.HiX()+1;
-			alarm_hi_x = polygon.LoX()-1;
-			alarm_lo_y = polygon.HiY()+1;
-			alarm_hi_y = polygon.LoY()-1;
-			for ( int i = 1; i < WHITE; i++ )
-			{
-				BlobStats *bs = &blob_stats[i];
-				if ( bs->count )
-				{
-					if ( bs->count == max_blob_size )
-					{
-						if ( config.weighted_alarm_centres )
-						{
-							unsigned long x_total = 0;
-							unsigned long y_total = 0;
+                  Debug( 9, "Different neighbours, setting pixels of %d to %d", bss->tag, bsm->tag );
+                  Debug( 9, "Master blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bsm->tag, bsm->count, bsm->lo_x, bsm->hi_x, bsm->lo_y, bsm->hi_y );
+                  Debug( 9, "Slave blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bss->tag, bss->count, bss->lo_x, bss->hi_x, bss->lo_y, bss->hi_y );
+                  // Now change all those pixels to the other setting
+                  int changed = 0;
+                  for ( int sy = bss->lo_y; sy <= bss->hi_y; sy++)
+                  {
+                    int lo_sx = bss->lo_x>=ranges[sy].lo_x?bss->lo_x:ranges[sy].lo_x;
+                    int hi_sx = bss->hi_x<=ranges[sy].hi_x?bss->hi_x:ranges[sy].hi_x;
 
-							for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
-							{
-								spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
-								for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
-								{
-									if ( *spdiff == bs->tag )
-									{
-										x_total += sx;
-										y_total += sy;
-									}
-								}
-							}
-							alarm_mid_x = int(round(x_total/bs->count));
-							alarm_mid_y = int(round(y_total/bs->count));
-						}
-						else
-						{
-							alarm_mid_x = int((bs->hi_x+bs->lo_x+1)/2);
-							alarm_mid_y = int((bs->hi_y+bs->lo_y+1)/2);
-						}
-					}
+                    Debug( 9, "Changing %d, %d->%d", sy, lo_sx, hi_sx );
+                    Debug( 9, "Range %d, %d->%d", sy, ranges[sy].lo_x, ranges[sy].hi_x );
+                    spdiff = diff_buff + ((diff_width * sy) + lo_sx);
+                    for ( int sx = lo_sx; sx <= hi_sx; sx++, spdiff++ )
+                    {
+                      Debug( 9, "Pixel at %d,%d (%p) is %d", sx, sy, spdiff, *spdiff );
+                      if ( *spdiff == bss->tag )
+                      {
+                        Debug( 9, "Setting pixel" );
+                        *spdiff = bsm->tag;
+                        changed++;
+                      }
+                    }
+                  }
+                  *pdiff = bsm->tag;
+                  alarm_blob_pixels++;
+                  if ( !changed )
+                  {
+                    Info( "Master blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bsm->tag, bsm->count, bsm->lo_x, bsm->hi_x, bsm->lo_y, bsm->hi_y );
+                    Info( "Slave blob t:%d, c:%d, lx:%d, hx:%d, ly:%d, hy:%d", bss->tag, bss->count, bss->lo_x, bss->hi_x, bss->lo_y, bss->hi_y );
+                    Error( "No pixels changed, exiting" );
+                    exit( -1 );
+                  }
 
-					if ( alarm_lo_x > bs->lo_x ) alarm_lo_x = bs->lo_x;
-					if ( alarm_lo_y > bs->lo_y ) alarm_lo_y = bs->lo_y;
-					if ( alarm_hi_x < bs->hi_x ) alarm_hi_x = bs->hi_x;
-					if ( alarm_hi_y < bs->hi_y ) alarm_hi_y = bs->hi_y;
-				}
-			}
-		}
-		else
-		{
-			alarm_mid_x = int((alarm_hi_x+alarm_lo_x+1)/2);
-			alarm_mid_y = int((alarm_hi_y+alarm_lo_y+1)/2);
-		}
-	}
+                  // Merge the slave blob into the master
+                  bsm->count += bss->count+1;
+                  if ( x > bsm->hi_x ) bsm->hi_x = x;
+                  if ( (int)y > bsm->hi_y ) bsm->hi_y = y;
+                  if ( bss->lo_x < bsm->lo_x ) bsm->lo_x = bss->lo_x;
+                  if ( bss->lo_y < bsm->lo_y ) bsm->lo_y = bss->lo_y;
+                  if ( bss->hi_x > bsm->hi_x ) bsm->hi_x = bss->hi_x;
+                  if ( bss->hi_y > bsm->hi_y ) bsm->hi_y = bss->hi_y;
 
-	if ( type == INCLUSIVE )
-	{
-		// score >>= 1;
-		score /= 2;
-	}
-	else if ( type == EXCLUSIVE )
-	{
-		// score <<= 1;
-		score *= 2;
-		
-	}
+                  alarm_blobs--;
 
-	Debug( 5, "Adjusted score is %d", score );
+                  Debug( 6, "Merging blob %d with %d at %d,%d, %d current blobs", bss->tag, bsm->tag, x, y, alarm_blobs );
 
-	// Now outline the changed region
-	if ( score )
-	{
-		alarm_box = Box( Coord( alarm_lo_x, alarm_lo_y ), Coord( alarm_hi_x, alarm_hi_y ) );
+                  // Clear out the old blob
+                  bss->tag = 0;
+                  bss->count = 0;
+                  bss->lo_x = 0;
+                  bss->lo_y = 0;
+                  bss->hi_x = 0;
+                  bss->hi_y = 0;
+                }
+              }
+              else
+              {
+                Debug( 9, "Setting to left neighbour %d", last_x );
+                // Add to the blob from the x side 
+                *pdiff = last_x;
+                alarm_blob_pixels++;
+                bsx->count++;
+                if ( x > bsx->hi_x ) bsx->hi_x = x;
+                if ( (int)y > bsx->hi_y ) bsx->hi_y = y;
+              }
+            }
+            else
+            {
+              if ( last_y )
+              {
+                Debug( 9, "Top neighbour is %d", last_y );
+                Debug( 9, "Setting to top neighbour %d", last_y );
+                
+                // Add to the blob from the y side
+                BlobStats *bsy = &blob_stats[last_y];
 
-		//if ( monitor->followMotion() )
-		if ( true )
-		{
-			alarm_centre = Coord( alarm_mid_x, alarm_mid_y );
-		}
-		else
-		{
-			alarm_centre = alarm_box.Centre();
-		}
+                *pdiff = last_y;
+                alarm_blob_pixels++;
+                bsy->count++;
+                if ( x > bsy->hi_x ) bsy->hi_x = x;
+                if ( (int)y > bsy->hi_y ) bsy->hi_y = y;
+              }
+              else
+              {
+                // Create a new blob
+                int i;
+                for ( i = (WHITE-1); i > 0; i-- )
+                {
+                  BlobStats *bs = &blob_stats[i];
+                  // See if we can recycle one first, only if it's at least two rows up
+                  if ( bs->count && bs->hi_y < (int)(y-1) )
+                  {
+                    if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) )
+                    {
+                      if ( config.create_analysis_images || config.record_diag_images )
+                      {
+                        for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
+                        {
+                          spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
+                          for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
+                          {
+                            if ( *spdiff == bs->tag )
+                            {
+                              *spdiff = BLACK;
+                            }
+                          }
+                        }
+                      }
+                      alarm_blobs--;
+                      alarm_blob_pixels -= bs->count;
+                    
+                      Debug( 6, "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs );
 
-		if ( (type < PRECLUSIVE) && check_method >= BLOBS && config.create_analysis_images )
-		{
+                      bs->tag = 0;
+                      bs->count = 0;
+                      bs->lo_x = 0;
+                      bs->lo_y = 0;
+                      bs->hi_x = 0;
+                      bs->hi_y = 0;
+                    }
+                  }
+                  if ( !bs->count )
+                  {
+                    Debug( 9, "Creating new blob %d", i );
+                    *pdiff = i;
+                    alarm_blob_pixels++;
+                    bs->tag = i;
+                    bs->count++;
+                    bs->lo_x = bs->hi_x = x;
+                    bs->lo_y = bs->hi_y = y;
+                    alarm_blobs++;
 
-			// First mask out anything we don't want
-			for ( unsigned int y = lo_y; y <= hi_y; y++ )
-			{
-				pdiff = diff_buff + ((diff_width * y) + lo_x);
+                    Debug( 6, "Created blob %d at %d,%d, %d current blobs", bs->tag, x, y, alarm_blobs );
+                    break;
+                  }
+                }
+                if ( i == 0 )
+                {
+                  Warning( "Max blob count reached. Unable to allocate new blobs so terminating. Zone settings may be too sensitive." );
+                  x = hi_x+1;
+                  y = hi_y+1;
+                }
+              }
+            }
+          }
+        }
+      }
+      if ( config.record_diag_images )
+      {
+        static char diag_path[PATH_MAX] = "";
+        if ( !diag_path[0] )
+        {
+          snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 3 );
+        }
+        diff_image->WriteJpeg( diag_path );
+      }
 
-				int lo_x2 = ranges[y].lo_x;
-				int hi_x2 = ranges[y].hi_x;
+      if ( !alarm_blobs )
+      {
+        return( false );
+      }
+      
+      Debug( 5, "Got %d raw blob pixels, %d raw blobs, need %d -> %d, %d -> %d", alarm_blob_pixels, alarm_blobs, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs );
 
-				int lo_gap = lo_x2-lo_x;
-				if ( lo_gap > 0 )
-				{
-					if ( lo_gap == 1 )
-					{
-						*pdiff++ = BLACK;
-					}
-					else
-					{
-						memset( pdiff, BLACK, lo_gap );
-						pdiff += lo_gap;
-					}
-				}
+      // Now eliminate blobs under the threshold
+      for ( int i = 1; i < WHITE; i++ )
+      {
+        BlobStats *bs = &blob_stats[i];
+        if ( bs->count )
+        {
+          if ( (min_blob_pixels && bs->count < min_blob_pixels) || (max_blob_pixels && bs->count > max_blob_pixels) )
+          {
+            if ( config.create_analysis_images || config.record_diag_images )
+            {
+              for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
+              {
+                spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
+                for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
+                {
+                  if ( *spdiff == bs->tag )
+                  {
+                    *spdiff = BLACK;
+                  }
+                }
+              }
+            }
+            alarm_blobs--;
+            alarm_blob_pixels -= bs->count;
+            
+            Debug( 6, "Eliminated blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs );
 
-				ppoly = pg_image->Buffer( lo_x2, y );
-				for ( int x = lo_x2; x <= hi_x2; x++, pdiff++, ppoly++ )
-				{
-					if ( !*ppoly )
-					{
-						*pdiff = BLACK;
-					}
-				}
+            bs->tag = 0;
+            bs->count = 0;
+            bs->lo_x = 0;
+            bs->lo_y = 0;
+            bs->hi_x = 0;
+            bs->hi_y = 0;
+          }
+          else
+          {
+            Debug( 6, "Preserved blob %d, %d pixels (%d,%d - %d,%d), %d current blobs", i, bs->count, bs->lo_x, bs->lo_y, bs->hi_x, bs->hi_y, alarm_blobs );
+            if ( !min_blob_size || bs->count < min_blob_size ) min_blob_size = bs->count;
+            if ( !max_blob_size || bs->count > max_blob_size ) max_blob_size = bs->count;
+          }
+        }
+      }
+      if ( config.record_diag_images )
+      {
+        static char diag_path[PATH_MAX] = "";
+        if ( !diag_path[0] )
+        {
+          snprintf( diag_path, sizeof(diag_path), "%s/%d/diag-%d-%d.jpg", config.dir_events, monitor->Id(), id, 4 );
+        }
+        diff_image->WriteJpeg( diag_path );
+      }
+      Debug( 5, "Got %d blob pixels, %d blobs, need %d -> %d, %d -> %d", alarm_blob_pixels, alarm_blobs, min_blob_pixels, max_blob_pixels, min_blobs, max_blobs );       
+      
+      if( alarm_blobs ) {
+        if( min_blobs && (alarm_blobs < min_blobs) ) {
+          /* Not enough pixels alarmed */
+          return (false);
+        } else if(max_blobs && (alarm_blobs > max_blobs) ) {
+          /* Too many pixels alarmed */
+          overload_count = overload_frames;
+          return (false);
+        }
+      } else {
+        /* No blobs */
+        return (false);
+      }
+      
+      score = (100*alarm_blob_pixels)/(polygon.Area());
+      if(score < 1)
+        score = 1; /* Fix for score of 0 when frame meets thresholds but alarmed area is not big enough */
+      Debug( 5, "Current score is %d", score );
 
-				int hi_gap = hi_x-hi_x2;
-				if ( hi_gap > 0 )
-				{
-					if ( hi_gap == 1 )
-					{
-						*pdiff = BLACK;
-					}
-					else
-					{
-						memset( pdiff, BLACK, hi_gap );
-					}
-				}
-			}
-			
-			if( monitor->Colours() == ZM_COLOUR_GRAY8 ) {
-				image = diff_image->HighlightEdges( alarm_rgb, ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB, &polygon.Extent() );
-			} else {
-				image = diff_image->HighlightEdges( alarm_rgb, monitor->Colours(), monitor->SubpixelOrder(), &polygon.Extent() );
-			}
-			
-			// Only need to delete this when 'image' becomes detached and points somewhere else
-			delete diff_image;
-		}
-		else
-		{
-			delete image;
-			image = 0;
-		}
+      alarm_lo_x = polygon.HiX()+1;
+      alarm_hi_x = polygon.LoX()-1;
+      alarm_lo_y = polygon.HiY()+1;
+      alarm_hi_y = polygon.LoY()-1;
+      for ( int i = 1; i < WHITE; i++ )
+      {
+        BlobStats *bs = &blob_stats[i];
+        if ( bs->count )
+        {
+          if ( bs->count == max_blob_size )
+          {
+            if ( config.weighted_alarm_centres )
+            {
+              unsigned long x_total = 0;
+              unsigned long y_total = 0;
 
-		Debug( 1, "%s: Pixel Diff: %d, Alarm Pixels: %d, Filter Pixels: %d, Blob Pixels: %d, Blobs: %d, Score: %d", Label(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, score );
-	}
-	return( true );
+              for ( int sy = bs->lo_y; sy <= bs->hi_y; sy++ )
+              {
+                spdiff = diff_buff + ((diff_width * sy) + bs->lo_x);
+                for ( int sx = bs->lo_x; sx <= bs->hi_x; sx++, spdiff++ )
+                {
+                  if ( *spdiff == bs->tag )
+                  {
+                    x_total += sx;
+                    y_total += sy;
+                  }
+                }
+              }
+              alarm_mid_x = int(round(x_total/bs->count));
+              alarm_mid_y = int(round(y_total/bs->count));
+            }
+            else
+            {
+              alarm_mid_x = int((bs->hi_x+bs->lo_x+1)/2);
+              alarm_mid_y = int((bs->hi_y+bs->lo_y+1)/2);
+            }
+          }
+
+          if ( alarm_lo_x > bs->lo_x ) alarm_lo_x = bs->lo_x;
+          if ( alarm_lo_y > bs->lo_y ) alarm_lo_y = bs->lo_y;
+          if ( alarm_hi_x < bs->hi_x ) alarm_hi_x = bs->hi_x;
+          if ( alarm_hi_y < bs->hi_y ) alarm_hi_y = bs->hi_y;
+        }
+      }
+    }
+    else
+    {
+      alarm_mid_x = int((alarm_hi_x+alarm_lo_x+1)/2);
+      alarm_mid_y = int((alarm_hi_y+alarm_lo_y+1)/2);
+    }
+  }
+
+  if ( type == INCLUSIVE )
+  {
+    // score >>= 1;
+    score /= 2;
+  }
+  else if ( type == EXCLUSIVE )
+  {
+    // score <<= 1;
+    score *= 2;
+    
+  }
+
+  Debug( 5, "Adjusted score is %d", score );
+
+  // Now outline the changed region
+  if ( score )
+  {
+    alarm_box = Box( Coord( alarm_lo_x, alarm_lo_y ), Coord( alarm_hi_x, alarm_hi_y ) );
+
+    //if ( monitor->followMotion() )
+    if ( true )
+    {
+      alarm_centre = Coord( alarm_mid_x, alarm_mid_y );
+    }
+    else
+    {
+      alarm_centre = alarm_box.Centre();
+    }
+
+    if ( (type < PRECLUSIVE) && check_method >= BLOBS && config.create_analysis_images )
+    {
+
+      // First mask out anything we don't want
+      for ( unsigned int y = lo_y; y <= hi_y; y++ )
+      {
+        pdiff = diff_buff + ((diff_width * y) + lo_x);
+
+        int lo_x2 = ranges[y].lo_x;
+        int hi_x2 = ranges[y].hi_x;
+
+        int lo_gap = lo_x2-lo_x;
+        if ( lo_gap > 0 )
+        {
+          if ( lo_gap == 1 )
+          {
+            *pdiff++ = BLACK;
+          }
+          else
+          {
+            memset( pdiff, BLACK, lo_gap );
+            pdiff += lo_gap;
+          }
+        }
+
+        ppoly = pg_image->Buffer( lo_x2, y );
+        for ( int x = lo_x2; x <= hi_x2; x++, pdiff++, ppoly++ )
+        {
+          if ( !*ppoly )
+          {
+            *pdiff = BLACK;
+          }
+        }
+
+        int hi_gap = hi_x-hi_x2;
+        if ( hi_gap > 0 )
+        {
+          if ( hi_gap == 1 )
+          {
+            *pdiff = BLACK;
+          }
+          else
+          {
+            memset( pdiff, BLACK, hi_gap );
+          }
+        }
+      }
+      
+      if( monitor->Colours() == ZM_COLOUR_GRAY8 ) {
+        image = diff_image->HighlightEdges( alarm_rgb, ZM_COLOUR_RGB24, ZM_SUBPIX_ORDER_RGB, &polygon.Extent() );
+      } else {
+        image = diff_image->HighlightEdges( alarm_rgb, monitor->Colours(), monitor->SubpixelOrder(), &polygon.Extent() );
+      }
+      
+      // Only need to delete this when 'image' becomes detached and points somewhere else
+      delete diff_image;
+    }
+    else
+    {
+      delete image;
+      image = 0;
+    }
+
+    Debug( 1, "%s: Pixel Diff: %d, Alarm Pixels: %d, Filter Pixels: %d, Blob Pixels: %d, Blobs: %d, Score: %d", Label(), pixel_diff, alarm_pixels, alarm_filter_pixels, alarm_blob_pixels, alarm_blobs, score );
+  }
+  return( true );
 }
 
 bool Zone::ParsePolygonString( const char *poly_string, Polygon &polygon )
 {
-	Debug( 3, "Parsing polygon string '%s'", poly_string );
+  Debug( 3, "Parsing polygon string '%s'", poly_string );
 
-	char *str_ptr = new char[strlen(poly_string)+1];
-	char *str = str_ptr;
-	strcpy( str, poly_string );
+  char *str_ptr = new char[strlen(poly_string)+1];
+  char *str = str_ptr;
+  strcpy( str, poly_string );
 
-	char *ws;
-	int n_coords = 0;
-	int max_n_coords = strlen(str)/4;
-	Coord *coords = new Coord[max_n_coords];
-	while( true )
-	{
-		if ( *str == '\0' )
-		{
-			break;
-		}
-		ws = strchr( str, ' ' );
-		if ( ws )
-		{
-			*ws = '\0';
-		}
-		char *cp = strchr( str, ',' );
-		if ( !cp )
-		{
-			Error( "Bogus coordinate %s found in polygon string", str );
-			delete[] coords;
-			delete[] str_ptr;
-			return( false );
-		}
-		else
-		{
-			*cp = '\0';
-			char *xp = str;
-			char *yp = cp+1;
+  char *ws;
+  int n_coords = 0;
+  int max_n_coords = strlen(str)/4;
+  Coord *coords = new Coord[max_n_coords];
+  while( true )
+  {
+    if ( *str == '\0' )
+    {
+      break;
+    }
+    ws = strchr( str, ' ' );
+    if ( ws )
+    {
+      *ws = '\0';
+    }
+    char *cp = strchr( str, ',' );
+    if ( !cp )
+    {
+      Error( "Bogus coordinate %s found in polygon string", str );
+      delete[] coords;
+      delete[] str_ptr;
+      return( false );
+    }
+    else
+    {
+      *cp = '\0';
+      char *xp = str;
+      char *yp = cp+1;
 
-			int x = atoi(xp);
-			int y = atoi(yp);
+      int x = atoi(xp);
+      int y = atoi(yp);
 
-			Debug( 3, "Got coordinate %d,%d from polygon string", x, y );
+      Debug( 3, "Got coordinate %d,%d from polygon string", x, y );
 #if 0
-			if ( x < 0 )
-				x = 0;
-			else if ( x >= width )
-				x = width-1;
-			if ( y < 0 )
-				y = 0;
-			else if ( y >= height )
-				y = height-1;
+      if ( x < 0 )
+        x = 0;
+      else if ( x >= width )
+        x = width-1;
+      if ( y < 0 )
+        y = 0;
+      else if ( y >= height )
+        y = height-1;
 #endif
-			coords[n_coords++] = Coord( x, y );
-		}
-		if ( ws )
-			str = ws+1;
-		else
-			break;
-	}
-	polygon = Polygon( n_coords, coords );
+      coords[n_coords++] = Coord( x, y );
+    }
+    if ( ws )
+      str = ws+1;
+    else
+      break;
+  }
+  polygon = Polygon( n_coords, coords );
 
-	Debug( 3, "Successfully parsed polygon string" );
-	//printf( "Area: %d\n", pg.Area() );
-	//printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
+  Debug( 3, "Successfully parsed polygon string" );
+  //printf( "Area: %d\n", pg.Area() );
+  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
 
-	delete[] coords;
-	delete[] str_ptr;
+  delete[] coords;
+  delete[] str_ptr;
 
-	return( true );
+  return( true );
 }
 
 bool Zone::ParseZoneString( const char *zone_string, int &zone_id, int &colour, Polygon &polygon )
 {
-	Debug( 3, "Parsing zone string '%s'", zone_string );
+  Debug( 3, "Parsing zone string '%s'", zone_string );
 
-	char *str_ptr = new char[strlen(zone_string)+1];
-	char *str = str_ptr;
-	strcpy( str, zone_string );
+  char *str_ptr = new char[strlen(zone_string)+1];
+  char *str = str_ptr;
+  strcpy( str, zone_string );
 
-	char *ws = strchr( str, ' ' );
-	if ( !ws )
-	{
-		Debug( 3, "No initial whitespace found in zone string '%s', finishing", str );
-	}
-	zone_id = strtol( str, 0, 10 );
-	Debug( 3, "Got zone %d from zone string", zone_id );
-	if ( !ws )
-	{
-		delete str_ptr;
-		return( true );
-	}
+  char *ws = strchr( str, ' ' );
+  if ( !ws )
+  {
+    Debug( 3, "No initial whitespace found in zone string '%s', finishing", str );
+  }
+  zone_id = strtol( str, 0, 10 );
+  Debug( 3, "Got zone %d from zone string", zone_id );
+  if ( !ws )
+  {
+    delete str_ptr;
+    return( true );
+  }
 
-	*ws = '\0';
-	str = ws+1;
+  *ws = '\0';
+  str = ws+1;
 
-	ws = strchr( str, ' ' );
-	if ( !ws )
-	{
-		Debug( 3, "No secondary whitespace found in zone string '%s', finishing", zone_string );
-	}
-	colour = strtol( str, 0, 16 );
-	Debug( 3, "Got colour %06x from zone string", colour );
-	if ( !ws )
-	{
-		delete str_ptr;
-		return( true );
-	}
-	*ws = '\0';
-	str = ws+1;
+  ws = strchr( str, ' ' );
+  if ( !ws )
+  {
+    Debug( 3, "No secondary whitespace found in zone string '%s', finishing", zone_string );
+  }
+  colour = strtol( str, 0, 16 );
+  Debug( 3, "Got colour %06x from zone string", colour );
+  if ( !ws )
+  {
+    delete str_ptr;
+    return( true );
+  }
+  *ws = '\0';
+  str = ws+1;
 
-	bool result = ParsePolygonString( str, polygon );
+  bool result = ParsePolygonString( str, polygon );
 
-	//printf( "Area: %d\n", pg.Area() );
-	//printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
+  //printf( "Area: %d\n", pg.Area() );
+  //printf( "Centre: %d,%d\n", pg.Centre().X(), pg.Centre().Y() );
 
-	delete[] str_ptr;
+  delete[] str_ptr;
 
-	return( result );
+  return( result );
 }
 
 int Zone::Load( Monitor *monitor, Zone **&zones )
 {
-	static char sql[ZM_SQL_MED_BUFSIZ];
-	snprintf( sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames,ExtendAlarmFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
-	if ( mysql_query( &dbconn, sql ) )
-	{
-		Error( "Can't run query: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
+  static char sql[ZM_SQL_MED_BUFSIZ];
+  snprintf( sql, sizeof(sql), "select Id,Name,Type+0,Units,Coords,AlarmRGB,CheckMethod+0,MinPixelThreshold,MaxPixelThreshold,MinAlarmPixels,MaxAlarmPixels,FilterX,FilterY,MinFilterPixels,MaxFilterPixels,MinBlobPixels,MaxBlobPixels,MinBlobs,MaxBlobs,OverloadFrames,ExtendAlarmFrames from Zones where MonitorId = %d order by Type, Id", monitor->Id() );
+  if ( mysql_query( &dbconn, sql ) )
+  {
+    Error( "Can't run query: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
 
-	MYSQL_RES *result = mysql_store_result( &dbconn );
-	if ( !result )
-	{
-		Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-	int n_zones = mysql_num_rows( result );
-	Debug( 1, "Got %d zones for monitor %s", n_zones, monitor->Name() );
-	delete[] zones;
-	zones = new Zone *[n_zones];
-	for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-	{
-		int col = 0;
+  MYSQL_RES *result = mysql_store_result( &dbconn );
+  if ( !result )
+  {
+    Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  int n_zones = mysql_num_rows( result );
+  Debug( 1, "Got %d zones for monitor %s", n_zones, monitor->Name() );
+  delete[] zones;
+  zones = new Zone *[n_zones];
+  for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+  {
+    int col = 0;
 
-		int Id = atoi(dbrow[col++]);
-		const char *Name = dbrow[col++];
-		int Type = atoi(dbrow[col++]);
-		const char *Units = dbrow[col++];
-		const char *Coords = dbrow[col++];
-		int AlarmRGB = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int CheckMethod = atoi(dbrow[col++]);
-		int MinPixelThreshold = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MaxPixelThreshold = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MinAlarmPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MaxAlarmPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int FilterX = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int FilterY = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MinFilterPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MaxFilterPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MinBlobPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MaxBlobPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MinBlobs = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int MaxBlobs = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int OverloadFrames = dbrow[col]?atoi(dbrow[col]):0; col++;
-		int ExtendAlarmFrames = dbrow[col]?atoi(dbrow[col]):0; col++;
-		
-		/* HTML colour code is actually BGR in memory, we want RGB */
-		AlarmRGB = rgb_convert(AlarmRGB, ZM_SUBPIX_ORDER_BGR);
+    int Id = atoi(dbrow[col++]);
+    const char *Name = dbrow[col++];
+    int Type = atoi(dbrow[col++]);
+    const char *Units = dbrow[col++];
+    const char *Coords = dbrow[col++];
+    int AlarmRGB = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int CheckMethod = atoi(dbrow[col++]);
+    int MinPixelThreshold = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MaxPixelThreshold = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MinAlarmPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MaxAlarmPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int FilterX = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int FilterY = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MinFilterPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MaxFilterPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MinBlobPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MaxBlobPixels = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MinBlobs = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int MaxBlobs = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int OverloadFrames = dbrow[col]?atoi(dbrow[col]):0; col++;
+    int ExtendAlarmFrames = dbrow[col]?atoi(dbrow[col]):0; col++;
+    
+    /* HTML colour code is actually BGR in memory, we want RGB */
+    AlarmRGB = rgb_convert(AlarmRGB, ZM_SUBPIX_ORDER_BGR);
 
-		Debug( 5, "Parsing polygon %s", Coords );
-		Polygon polygon;
-		if ( !ParsePolygonString( Coords, polygon ) ) {
-			Error( "Unable to parse polygon string '%s' for zone %d/%s for monitor %s, ignoring", Coords, Id, Name, monitor->Name() );
-            continue;
+    Debug( 5, "Parsing polygon %s", Coords );
+    Polygon polygon;
+    if ( !ParsePolygonString( Coords, polygon ) ) {
+      Error( "Unable to parse polygon string '%s' for zone %d/%s for monitor %s, ignoring", Coords, Id, Name, monitor->Name() );
+      continue;
+    }
+
+    if ( polygon.LoX() < 0 || polygon.HiX() >= (int)monitor->Width() 
+       || polygon.LoY() < 0 || polygon.HiY() >= (int)monitor->Height() ) {
+      Error( "Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), ignoring", Id, Name, monitor->Name(), polygon.LoX(), polygon.LoY(), polygon.HiX(), polygon.HiY() );
+      continue;
+    }
+
+    if ( false && !strcmp( Units, "Percent" ) )
+    {
+      MinAlarmPixels = (MinAlarmPixels*polygon.Area())/100;
+      MaxAlarmPixels = (MaxAlarmPixels*polygon.Area())/100;
+      MinFilterPixels = (MinFilterPixels*polygon.Area())/100;
+      MaxFilterPixels = (MaxFilterPixels*polygon.Area())/100;
+      MinBlobPixels = (MinBlobPixels*polygon.Area())/100;
+      MaxBlobPixels = (MaxBlobPixels*polygon.Area())/100;
+    }
+
+    if ( atoi(dbrow[2]) == Zone::INACTIVE )
+    {
+      zones[i] = new Zone( monitor, Id, Name, polygon );
+    }
+        else if ( atoi(dbrow[2]) == Zone::PRIVACY )
+        {
+            zones[i] = new Zone( monitor, Id, Name, (Zone::ZoneType)Type, polygon );
         }
-
-		if ( polygon.LoX() < 0 || polygon.HiX() >= (int)monitor->Width() 
-           || polygon.LoY() < 0 || polygon.HiY() >= (int)monitor->Height() ) {
-			Error( "Zone %d/%s for monitor %s extends outside of image dimensions, (%d,%d), (%d,%d), ignoring", Id, Name, monitor->Name(), polygon.LoX(), polygon.LoY(), polygon.HiX(), polygon.HiY() );
-            continue;
-        }
-
-		if ( false && !strcmp( Units, "Percent" ) )
-		{
-			MinAlarmPixels = (MinAlarmPixels*polygon.Area())/100;
-			MaxAlarmPixels = (MaxAlarmPixels*polygon.Area())/100;
-			MinFilterPixels = (MinFilterPixels*polygon.Area())/100;
-			MaxFilterPixels = (MaxFilterPixels*polygon.Area())/100;
-			MinBlobPixels = (MinBlobPixels*polygon.Area())/100;
-			MaxBlobPixels = (MaxBlobPixels*polygon.Area())/100;
-		}
-
-		if ( atoi(dbrow[2]) == Zone::INACTIVE )
-		{
-			zones[i] = new Zone( monitor, Id, Name, polygon );
-		}
-                else if ( atoi(dbrow[2]) == Zone::PRIVACY )
-                {
-                        zones[i] = new Zone( monitor, Id, Name, (Zone::ZoneType)Type, polygon );
-                }
-		{
-			zones[i] = new Zone( monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB, (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold, MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), MinFilterPixels, MaxFilterPixels, MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs, OverloadFrames, ExtendAlarmFrames );
-		}
-	}
-	if ( mysql_errno( &dbconn ) )
-	{
-		Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
-		exit( mysql_errno( &dbconn ) );
-	}
-	// Yadda yadda
-	mysql_free_result( result );
-	return( n_zones );
+    {
+      zones[i] = new Zone( monitor, Id, Name, (Zone::ZoneType)Type, polygon, AlarmRGB, (Zone::CheckMethod)CheckMethod, MinPixelThreshold, MaxPixelThreshold, MinAlarmPixels, MaxAlarmPixels, Coord( FilterX, FilterY ), MinFilterPixels, MaxFilterPixels, MinBlobPixels, MaxBlobPixels, MinBlobs, MaxBlobs, OverloadFrames, ExtendAlarmFrames );
+    }
+  }
+  if ( mysql_errno( &dbconn ) )
+  {
+    Error( "Can't fetch row: %s", mysql_error( &dbconn ) );
+    exit( mysql_errno( &dbconn ) );
+  }
+  // Yadda yadda
+  mysql_free_result( result );
+  return( n_zones );
 }
 
 bool Zone::DumpSettings( char *output, bool /*verbose*/ )
 {
-	output[0] = 0;
+  output[0] = 0;
 
-	sprintf( output+strlen(output), "  Id : %d\n", id );
-	sprintf( output+strlen(output), "  Label : %s\n", label );
-	sprintf( output+strlen(output), "  Type: %d - %s\n", type,
-		type==ACTIVE?"Active":(
-		type==INCLUSIVE?"Inclusive":(
-		type==EXCLUSIVE?"Exclusive":(
-		type==PRECLUSIVE?"Preclusive":(
-		type==INACTIVE?"Inactive":(
-		type==PRIVACY?"Privacy":"Unknown"
-	))))));
-	sprintf( output+strlen(output), "  Shape : %d points\n", polygon.getNumCoords() );
-	for ( int i = 0; i < polygon.getNumCoords(); i++ )
-	{
-		sprintf( output+strlen(output), "    %i: %d,%d\n", i, polygon.getCoord( i ).X(), polygon.getCoord( i ).Y() );
-	}
-	sprintf( output+strlen(output), "  Alarm RGB : %06x\n", alarm_rgb );
-	sprintf( output+strlen(output), "  Check Method: %d - %s\n", check_method,
-		check_method==ALARMED_PIXELS?"Alarmed Pixels":(
-		check_method==FILTERED_PIXELS?"FilteredPixels":(
-		check_method==BLOBS?"Blobs":"Unknown"
-	)));
-	sprintf( output+strlen(output), "  Min Pixel Threshold : %d\n", min_pixel_threshold );
-	sprintf( output+strlen(output), "  Max Pixel Threshold : %d\n", max_pixel_threshold );
-	sprintf( output+strlen(output), "  Min Alarm Pixels : %d\n", min_alarm_pixels );
-	sprintf( output+strlen(output), "  Max Alarm Pixels : %d\n", max_alarm_pixels );
-	sprintf( output+strlen(output), "  Filter Box : %d,%d\n", filter_box.X(), filter_box.Y() );
-	sprintf( output+strlen(output), "  Min Filter Pixels : %d\n", min_filter_pixels );
-	sprintf( output+strlen(output), "  Max Filter Pixels : %d\n", max_filter_pixels );
-	sprintf( output+strlen(output), "  Min Blob Pixels : %d\n", min_blob_pixels );
-	sprintf( output+strlen(output), "  Max Blob Pixels : %d\n", max_blob_pixels );
-	sprintf( output+strlen(output), "  Min Blobs : %d\n", min_blobs );
-	sprintf( output+strlen(output), "  Max Blobs : %d\n", max_blobs );
-	return( true );
+  sprintf( output+strlen(output), "  Id : %d\n", id );
+  sprintf( output+strlen(output), "  Label : %s\n", label );
+  sprintf( output+strlen(output), "  Type: %d - %s\n", type,
+    type==ACTIVE?"Active":(
+    type==INCLUSIVE?"Inclusive":(
+    type==EXCLUSIVE?"Exclusive":(
+    type==PRECLUSIVE?"Preclusive":(
+    type==INACTIVE?"Inactive":(
+    type==PRIVACY?"Privacy":"Unknown"
+  ))))));
+  sprintf( output+strlen(output), "  Shape : %d points\n", polygon.getNumCoords() );
+  for ( int i = 0; i < polygon.getNumCoords(); i++ )
+  {
+    sprintf( output+strlen(output), "  %i: %d,%d\n", i, polygon.getCoord( i ).X(), polygon.getCoord( i ).Y() );
+  }
+  sprintf( output+strlen(output), "  Alarm RGB : %06x\n", alarm_rgb );
+  sprintf( output+strlen(output), "  Check Method: %d - %s\n", check_method,
+    check_method==ALARMED_PIXELS?"Alarmed Pixels":(
+    check_method==FILTERED_PIXELS?"FilteredPixels":(
+    check_method==BLOBS?"Blobs":"Unknown"
+  )));
+  sprintf( output+strlen(output), "  Min Pixel Threshold : %d\n", min_pixel_threshold );
+  sprintf( output+strlen(output), "  Max Pixel Threshold : %d\n", max_pixel_threshold );
+  sprintf( output+strlen(output), "  Min Alarm Pixels : %d\n", min_alarm_pixels );
+  sprintf( output+strlen(output), "  Max Alarm Pixels : %d\n", max_alarm_pixels );
+  sprintf( output+strlen(output), "  Filter Box : %d,%d\n", filter_box.X(), filter_box.Y() );
+  sprintf( output+strlen(output), "  Min Filter Pixels : %d\n", min_filter_pixels );
+  sprintf( output+strlen(output), "  Max Filter Pixels : %d\n", max_filter_pixels );
+  sprintf( output+strlen(output), "  Min Blob Pixels : %d\n", min_blob_pixels );
+  sprintf( output+strlen(output), "  Max Blob Pixels : %d\n", max_blob_pixels );
+  sprintf( output+strlen(output), "  Min Blobs : %d\n", min_blobs );
+  sprintf( output+strlen(output), "  Max Blobs : %d\n", max_blobs );
+  return( true );
 }
 
 void Zone::std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum) {
-	uint32_t pixelsalarmed = 0;
-	uint32_t pixelsdifference = 0;
-	uint8_t *pdiff;
-	const uint8_t *ppoly;
-	uint8_t calc_max_pixel_threshold = 255;
-	unsigned int lo_y;
-	unsigned int hi_y;
-	unsigned int lo_x;
-	unsigned int hi_x;
-	
-	if(max_pixel_threshold)
-		calc_max_pixel_threshold = max_pixel_threshold;
-	
-	lo_y = polygon.LoY();
-	hi_y = polygon.HiY();
-	for ( unsigned int y = lo_y; y <= hi_y; y++ )
-	{
-		lo_x = ranges[y].lo_x;
-		hi_x = ranges[y].hi_x;
-		
-		Debug( 7, "Checking line %d from %d -> %d", y, lo_x, hi_x );
-		pdiff = (uint8_t*)pdiff_image->Buffer( lo_x, y );
-		ppoly = ppoly_image->Buffer( lo_x, y );
-	
-		for ( unsigned int x = lo_x; x <= hi_x; x++, pdiff++, ppoly++ )
-		{
-			if ( *ppoly && (*pdiff > min_pixel_threshold) && (*pdiff <= calc_max_pixel_threshold) )
-			{
-				pixelsalarmed++;
-				pixelsdifference += *pdiff;
-				*pdiff = WHITE;
-			}
-			else
-			{
-				*pdiff = BLACK;
-			}
-		}
-	}
-	
-	/* Store the results */
-	*pixel_count = pixelsalarmed;
-	*pixel_sum = pixelsdifference;
+  uint32_t pixelsalarmed = 0;
+  uint32_t pixelsdifference = 0;
+  uint8_t *pdiff;
+  const uint8_t *ppoly;
+  uint8_t calc_max_pixel_threshold = 255;
+  unsigned int lo_y;
+  unsigned int hi_y;
+  unsigned int lo_x;
+  unsigned int hi_x;
+  
+  if(max_pixel_threshold)
+    calc_max_pixel_threshold = max_pixel_threshold;
+  
+  lo_y = polygon.LoY();
+  hi_y = polygon.HiY();
+  for ( unsigned int y = lo_y; y <= hi_y; y++ )
+  {
+    lo_x = ranges[y].lo_x;
+    hi_x = ranges[y].hi_x;
+    
+    Debug( 7, "Checking line %d from %d -> %d", y, lo_x, hi_x );
+    pdiff = (uint8_t*)pdiff_image->Buffer( lo_x, y );
+    ppoly = ppoly_image->Buffer( lo_x, y );
+  
+    for ( unsigned int x = lo_x; x <= hi_x; x++, pdiff++, ppoly++ )
+    {
+      if ( *ppoly && (*pdiff > min_pixel_threshold) && (*pdiff <= calc_max_pixel_threshold) )
+      {
+        pixelsalarmed++;
+        pixelsdifference += *pdiff;
+        *pdiff = WHITE;
+      }
+      else
+      {
+        *pdiff = BLACK;
+      }
+    }
+  }
+  
+  /* Store the results */
+  *pixel_count = pixelsalarmed;
+  *pixel_sum = pixelsdifference;
    Debug( 7, "STORED");
 }
diff --git a/src/zm_zone.h b/src/zm_zone.h
index d40b52b75..9b8a63747 100644
--- a/src/zm_zone.h
+++ b/src/zm_zone.h
@@ -35,141 +35,141 @@ class Monitor;
 class Zone
 {
 protected:
-	struct Range
-	{
-		int lo_x;
-		int hi_x;
-		int off_x;
-	};
+  struct Range
+  {
+    int lo_x;
+    int hi_x;
+    int off_x;
+  };
 
 public:
-	typedef enum { ACTIVE=1, INCLUSIVE, EXCLUSIVE, PRECLUSIVE, INACTIVE, PRIVACY } ZoneType;
-	typedef enum { ALARMED_PIXELS=1, FILTERED_PIXELS, BLOBS } CheckMethod;
+  typedef enum { ACTIVE=1, INCLUSIVE, EXCLUSIVE, PRECLUSIVE, INACTIVE, PRIVACY } ZoneType;
+  typedef enum { ALARMED_PIXELS=1, FILTERED_PIXELS, BLOBS } CheckMethod;
 
 protected:
-	// Inputs
-	Monitor			*monitor;
+  // Inputs
+  Monitor      *monitor;
 
-	int				id;
-	char			*label;
-	ZoneType		type;
-	Polygon			polygon;
-	Rgb				alarm_rgb;
-	CheckMethod		check_method;
+  int        id;
+  char      *label;
+  ZoneType    type;
+  Polygon      polygon;
+  Rgb        alarm_rgb;
+  CheckMethod    check_method;
 
-	int				min_pixel_threshold;
-	int				max_pixel_threshold;
+  int        min_pixel_threshold;
+  int        max_pixel_threshold;
 
-	int				min_alarm_pixels;
-	int				max_alarm_pixels;
+  int        min_alarm_pixels;
+  int        max_alarm_pixels;
 
-	Coord			filter_box;
-	int				min_filter_pixels;
-	int				max_filter_pixels;
+  Coord      filter_box;
+  int        min_filter_pixels;
+  int        max_filter_pixels;
 
-	int				min_blob_pixels;
-	int				max_blob_pixels;
-	int				min_blobs;
-	int				max_blobs;
+  int        min_blob_pixels;
+  int        max_blob_pixels;
+  int        min_blobs;
+  int        max_blobs;
 
-    int             overload_frames;
-	int				extend_alarm_frames;
+  int       overload_frames;
+  int        extend_alarm_frames;
 
-	// Outputs/Statistics
-	bool			alarmed;
-	int				pixel_diff;
-	unsigned int			alarm_pixels;
-	int				alarm_filter_pixels;
-	int				alarm_blob_pixels;
-	int				alarm_blobs;
-	int				min_blob_size;
-	int				max_blob_size;
-	Box				alarm_box;
-	Coord			alarm_centre;
-	unsigned int	score;
-	Image			*pg_image;
-	Range			*ranges;
-	Image			*image;
+  // Outputs/Statistics
+  bool      alarmed;
+  int        pixel_diff;
+  unsigned int      alarm_pixels;
+  int        alarm_filter_pixels;
+  int        alarm_blob_pixels;
+  int        alarm_blobs;
+  int        min_blob_size;
+  int        max_blob_size;
+  Box        alarm_box;
+  Coord      alarm_centre;
+  unsigned int  score;
+  Image      *pg_image;
+  Range      *ranges;
+  Image      *image;
 
-    int             overload_count;
-    int             extend_alarm_count;
+  int       overload_count;
+  int       extend_alarm_count;
 
 protected:
-	void Setup( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold, int p_max_pixel_threshold, int p_min_alarm_pixels, int p_max_alarm_pixels, const Coord &p_filter_box, int p_min_filter_pixels, int p_max_filter_pixels, int p_min_blob_pixels, int p_max_blob_pixels, int p_min_blobs, int p_max_blobs, int p_overload_frames, int p_extend_alarm_frames );
-	void std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum);
-	
+  void Setup( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold, int p_max_pixel_threshold, int p_min_alarm_pixels, int p_max_alarm_pixels, const Coord &p_filter_box, int p_min_filter_pixels, int p_max_filter_pixels, int p_min_blob_pixels, int p_max_blob_pixels, int p_min_blobs, int p_max_blobs, int p_overload_frames, int p_extend_alarm_frames );
+  void std_alarmedpixels(Image* pdiff_image, const Image* ppoly_image, unsigned int* pixel_count, unsigned int* pixel_sum);
+  
 public:
-	Zone( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold=15, int p_max_pixel_threshold=0, int p_min_alarm_pixels=50, int p_max_alarm_pixels=75000, const Coord &p_filter_box=Coord( 3, 3 ), int p_min_filter_pixels=50, int p_max_filter_pixels=50000, int p_min_blob_pixels=10, int p_max_blob_pixels=0, int p_min_blobs=0, int p_max_blobs=0, int p_overload_frames=0, int p_extend_alarm_frames=0 )
-	{
-		Setup( p_monitor, p_id, p_label, p_type, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
-	}
-	Zone( Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold=15, int p_max_pixel_threshold=0, int p_min_alarm_pixels=50, int p_max_alarm_pixels=75000, const Coord &p_filter_box=Coord( 3, 3 ), int p_min_filter_pixels=50, int p_max_filter_pixels=50000, int p_min_blob_pixels=10, int p_max_blob_pixels=0, int p_min_blobs=0, int p_max_blobs=0, int p_overload_frames=0, int p_extend_alarm_frames=0)
-	{
-		Setup( p_monitor, p_id, p_label, Zone::ACTIVE, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
-	}
-	Zone( Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon )
-	{
-		Setup( p_monitor, p_id, p_label, Zone::INACTIVE, p_polygon, RGB_BLACK, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
-	}
-	Zone( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon )
-	{
-		Setup( p_monitor, p_id, p_label, p_type, p_polygon, RGB_BLACK, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
-	}
+  Zone( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold=15, int p_max_pixel_threshold=0, int p_min_alarm_pixels=50, int p_max_alarm_pixels=75000, const Coord &p_filter_box=Coord( 3, 3 ), int p_min_filter_pixels=50, int p_max_filter_pixels=50000, int p_min_blob_pixels=10, int p_max_blob_pixels=0, int p_min_blobs=0, int p_max_blobs=0, int p_overload_frames=0, int p_extend_alarm_frames=0 )
+  {
+    Setup( p_monitor, p_id, p_label, p_type, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
+  }
+  Zone( Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon, const Rgb p_alarm_rgb, CheckMethod p_check_method, int p_min_pixel_threshold=15, int p_max_pixel_threshold=0, int p_min_alarm_pixels=50, int p_max_alarm_pixels=75000, const Coord &p_filter_box=Coord( 3, 3 ), int p_min_filter_pixels=50, int p_max_filter_pixels=50000, int p_min_blob_pixels=10, int p_max_blob_pixels=0, int p_min_blobs=0, int p_max_blobs=0, int p_overload_frames=0, int p_extend_alarm_frames=0)
+  {
+    Setup( p_monitor, p_id, p_label, Zone::ACTIVE, p_polygon, p_alarm_rgb, p_check_method, p_min_pixel_threshold, p_max_pixel_threshold, p_min_alarm_pixels, p_max_alarm_pixels, p_filter_box, p_min_filter_pixels, p_max_filter_pixels, p_min_blob_pixels, p_max_blob_pixels, p_min_blobs, p_max_blobs, p_overload_frames, p_extend_alarm_frames );
+  }
+  Zone( Monitor *p_monitor, int p_id, const char *p_label, const Polygon &p_polygon )
+  {
+    Setup( p_monitor, p_id, p_label, Zone::INACTIVE, p_polygon, RGB_BLACK, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
+  }
+  Zone( Monitor *p_monitor, int p_id, const char *p_label, ZoneType p_type, const Polygon &p_polygon )
+  {
+    Setup( p_monitor, p_id, p_label, p_type, p_polygon, RGB_BLACK, (Zone::CheckMethod)0, 0, 0, 0, 0, Coord( 0, 0 ), 0, 0, 0, 0, 0, 0, 0, 0 );
+  }
 
 public:
-	~Zone();
+  ~Zone();
 
-	inline int Id() const { return( id ); }
-	inline const char *Label() const { return( label ); }
-	inline ZoneType Type() const { return( type ); }
-	inline bool IsActive() const { return( type == ACTIVE ); }
-	inline bool IsInclusive() const { return( type == INCLUSIVE ); }
-	inline bool IsExclusive() const { return( type == EXCLUSIVE ); }
-	inline bool IsPreclusive() const { return( type == PRECLUSIVE ); }
-	inline bool IsInactive() const { return( type == INACTIVE ); }
-	inline bool IsPrivacy() const { return( type == PRIVACY ); }
-	inline const Image *AlarmImage() const { return( image ); }
-	inline const Polygon &GetPolygon() const { return( polygon ); }
-	inline bool Alarmed() const { return( alarmed ); }
-	inline void SetAlarm() { alarmed = true; }
-	inline void ClearAlarm() { alarmed = false; }
-	inline Coord GetAlarmCentre() const { return( alarm_centre ); }
-	inline unsigned int Score() const { return( score ); }
+  inline int Id() const { return( id ); }
+  inline const char *Label() const { return( label ); }
+  inline ZoneType Type() const { return( type ); }
+  inline bool IsActive() const { return( type == ACTIVE ); }
+  inline bool IsInclusive() const { return( type == INCLUSIVE ); }
+  inline bool IsExclusive() const { return( type == EXCLUSIVE ); }
+  inline bool IsPreclusive() const { return( type == PRECLUSIVE ); }
+  inline bool IsInactive() const { return( type == INACTIVE ); }
+  inline bool IsPrivacy() const { return( type == PRIVACY ); }
+  inline const Image *AlarmImage() const { return( image ); }
+  inline const Polygon &GetPolygon() const { return( polygon ); }
+  inline bool Alarmed() const { return( alarmed ); }
+  inline void SetAlarm() { alarmed = true; }
+  inline void ClearAlarm() { alarmed = false; }
+  inline Coord GetAlarmCentre() const { return( alarm_centre ); }
+  inline unsigned int Score() const { return( score ); }
 
-	inline void ResetStats()
-	{
-		alarmed = false;
-		pixel_diff = 0;
-		alarm_pixels = 0;
-		alarm_filter_pixels = 0;
-		alarm_blob_pixels = 0;
-		alarm_blobs = 0;
-		min_blob_size = 0;
-		max_blob_size = 0;
-		score = 0;
-	}
-	void RecordStats( const Event *event );
-	bool CheckAlarms( const Image *delta_image );
-	bool DumpSettings( char *output, bool verbose );
+  inline void ResetStats()
+  {
+    alarmed = false;
+    pixel_diff = 0;
+    alarm_pixels = 0;
+    alarm_filter_pixels = 0;
+    alarm_blob_pixels = 0;
+    alarm_blobs = 0;
+    min_blob_size = 0;
+    max_blob_size = 0;
+    score = 0;
+  }
+  void RecordStats( const Event *event );
+  bool CheckAlarms( const Image *delta_image );
+  bool DumpSettings( char *output, bool verbose );
 
-	static bool ParsePolygonString( const char *polygon_string, Polygon &polygon );
-	static bool ParseZoneString( const char *zone_string, int &zone_id, int &colour, Polygon &polygon );
-	static int Load( Monitor *monitor, Zone **&zones );
-	//=================================================
-    	bool CheckOverloadCount();
-    	int GetOverloadCount();
-    	void SetOverloadCount(int nOverCount);
-    	int GetOverloadFrames();
-	//=================================================
-    	bool CheckExtendAlarmCount();
-    	int GetExtendAlarmCount();
-    	void SetExtendAlarmCount(int nOverCount);
-    	int GetExtendAlarmFrames();
-    	void SetScore(unsigned int nScore);
-    	void SetAlarmImage(const Image* srcImage);
+  static bool ParsePolygonString( const char *polygon_string, Polygon &polygon );
+  static bool ParseZoneString( const char *zone_string, int &zone_id, int &colour, Polygon &polygon );
+  static int Load( Monitor *monitor, Zone **&zones );
+  //=================================================
+  bool CheckOverloadCount();
+  int GetOverloadCount();
+  void SetOverloadCount(int nOverCount);
+  int GetOverloadFrames();
+  //=================================================
+  bool CheckExtendAlarmCount();
+  int GetExtendAlarmCount();
+  void SetExtendAlarmCount(int nOverCount);
+  int GetExtendAlarmFrames();
+  void SetScore(unsigned int nScore);
+  void SetAlarmImage(const Image* srcImage);
 
-	inline const Image *getPgImage() const { return( pg_image ); }
-	inline const Range *getRanges() const { return( ranges ); }
+  inline const Image *getPgImage() const { return( pg_image ); }
+  inline const Range *getRanges() const { return( ranges ); }
 
 };
 
diff --git a/src/zma.cpp b/src/zma.cpp
index 2d22d713a..03ffe1726 100644
--- a/src/zma.cpp
+++ b/src/zma.cpp
@@ -41,9 +41,9 @@ behind.
 
 =head1 OPTIONS
 
- -m, --monitor_id                 - ID of the monitor to analyse
- -h, --help                       - Display usage information
- -v, --version                    - Print the installed version of ZoneMinder
+ -m, --monitor_id         - ID of the monitor to analyse
+ -h, --help             - Display usage information
+ -v, --version          - Print the installed version of ZoneMinder
 
 =cut
 
@@ -59,146 +59,146 @@ behind.
 
 void Usage()
 {
-	fprintf( stderr, "zma -m <monitor_id>\n" );
-	fprintf( stderr, "Options:\n" );
-	fprintf( stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to use\n" );
-	fprintf( stderr, "  -h, --help                   : This screen\n" );
-	fprintf( stderr, "  -v, --version                : Report the installed version of ZoneMinder\n" );		
-	exit( 0 );
+  fprintf( stderr, "zma -m <monitor_id>\n" );
+  fprintf( stderr, "Options:\n" );
+  fprintf( stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to use\n" );
+  fprintf( stderr, "  -h, --help           : This screen\n" );
+  fprintf( stderr, "  -v, --version        : Report the installed version of ZoneMinder\n" );    
+  exit( 0 );
 }
 
 int main( int argc, char *argv[] )
 {
-	self = argv[0];
+  self = argv[0];
 
-	srand( getpid() * time( 0 ) );
+  srand( getpid() * time( 0 ) );
 
-	int id = -1;
+  int id = -1;
 
-	static struct option long_options[] = {
-		{"monitor", 1, 0, 'm'},
-		{"help", 0, 0, 'h'},
-		{"version", 0, 0, 'v'},
-		{0, 0, 0, 0}
-	};
+  static struct option long_options[] = {
+    {"monitor", 1, 0, 'm'},
+    {"help", 0, 0, 'h'},
+    {"version", 0, 0, 'v'},
+    {0, 0, 0, 0}
+  };
 
-	while (1)
-	{
-		int option_index = 0;
+  while (1)
+  {
+    int option_index = 0;
 
-		int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
-		if (c == -1)
-		{
-			break;
-		}
+    int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
+    if (c == -1)
+    {
+      break;
+    }
 
-		switch (c)
-		{
-			case 'm':
-				id = atoi(optarg);
-				break;
-			case 'h':
-			case '?':
-				Usage();
-				break;
-			case 'v':
-				std::cout << ZM_VERSION << "\n";
-				exit(0);
-			default:
-				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-				break;
-		}
-	}
+    switch (c)
+    {
+      case 'm':
+        id = atoi(optarg);
+        break;
+      case 'h':
+      case '?':
+        Usage();
+        break;
+      case 'v':
+        std::cout << ZM_VERSION << "\n";
+        exit(0);
+      default:
+        //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
+        break;
+    }
+  }
 
-	if (optind < argc)
-	{
-		fprintf( stderr, "Extraneous options, " );
-		while (optind < argc)
-			printf ("%s ", argv[optind++]);
-		printf ("\n");
-		Usage();
-	}
+  if (optind < argc)
+  {
+    fprintf( stderr, "Extraneous options, " );
+    while (optind < argc)
+      printf ("%s ", argv[optind++]);
+    printf ("\n");
+    Usage();
+  }
 
-	if ( id < 0 )
-	{
-		fprintf( stderr, "Bogus monitor %d\n", id );
-		Usage();
-		exit( 0 );
-	}
+  if ( id < 0 )
+  {
+    fprintf( stderr, "Bogus monitor %d\n", id );
+    Usage();
+    exit( 0 );
+  }
 
-	char log_id_string[16];
-	snprintf( log_id_string, sizeof(log_id_string), "zma_m%d", id );
+  char log_id_string[16];
+  snprintf( log_id_string, sizeof(log_id_string), "zma_m%d", id );
 
-	zmLoadConfig();
+  zmLoadConfig();
 
-	logInit( log_id_string );
-	
-	ssedetect();
+  logInit( log_id_string );
+  
+  ssedetect();
 
-	Monitor *monitor = Monitor::Load( id, true, Monitor::ANALYSIS );
+  Monitor *monitor = Monitor::Load( id, true, Monitor::ANALYSIS );
 
-	if ( monitor )
-	{
-		Info( "In mode %d/%d, warming up", monitor->GetFunction(), monitor->Enabled() );
+  if ( monitor )
+  {
+    Info( "In mode %d/%d, warming up", monitor->GetFunction(), monitor->Enabled() );
 
-		if ( config.opt_frame_server )
-		{
-			Event::OpenFrameSocket( monitor->Id() );
-		}
+    if ( config.opt_frame_server )
+    {
+      Event::OpenFrameSocket( monitor->Id() );
+    }
 
-		zmSetDefaultHupHandler();
-		zmSetDefaultTermHandler();
-		zmSetDefaultDieHandler();
+    zmSetDefaultHupHandler();
+    zmSetDefaultTermHandler();
+    zmSetDefaultDieHandler();
 
-		sigset_t block_set;
-		sigemptyset( &block_set );
+    sigset_t block_set;
+    sigemptyset( &block_set );
 
-		useconds_t analysis_rate = monitor->GetAnalysisRate();
-		unsigned int analysis_update_delay = monitor->GetAnalysisUpdateDelay();
-		time_t last_analysis_update_time, cur_time;
-		monitor->UpdateAdaptiveSkip();
-		last_analysis_update_time = time( 0 );
+    useconds_t analysis_rate = monitor->GetAnalysisRate();
+    unsigned int analysis_update_delay = monitor->GetAnalysisUpdateDelay();
+    time_t last_analysis_update_time, cur_time;
+    monitor->UpdateAdaptiveSkip();
+    last_analysis_update_time = time( 0 );
 
-		while( !zm_terminate )
-		{
-			// Process the next image
-			sigprocmask( SIG_BLOCK, &block_set, 0 );
+    while( !zm_terminate )
+    {
+      // Process the next image
+      sigprocmask( SIG_BLOCK, &block_set, 0 );
 
-			// Some periodic updates are required for variable capturing framerate
-			if ( analysis_update_delay )
-			{
-				cur_time = time( 0 );
-				if ( ( cur_time - last_analysis_update_time ) > analysis_update_delay )
-				{
-					analysis_rate = monitor->GetAnalysisRate();
-					monitor->UpdateAdaptiveSkip();
-					last_analysis_update_time = cur_time;
-				}
-			}
+      // Some periodic updates are required for variable capturing framerate
+      if ( analysis_update_delay )
+      {
+        cur_time = time( 0 );
+        if ( ( cur_time - last_analysis_update_time ) > analysis_update_delay )
+        {
+          analysis_rate = monitor->GetAnalysisRate();
+          monitor->UpdateAdaptiveSkip();
+          last_analysis_update_time = cur_time;
+        }
+      }
 
-			if ( !monitor->Analyse() )
-			{
-				usleep( monitor->Active()?ZM_SAMPLE_RATE:ZM_SUSPENDED_RATE );
-			}
-			else if ( analysis_rate )
-			{
-				usleep( analysis_rate );
-			}
+      if ( !monitor->Analyse() )
+      {
+        usleep( monitor->Active()?ZM_SAMPLE_RATE:ZM_SUSPENDED_RATE );
+      }
+      else if ( analysis_rate )
+      {
+        usleep( analysis_rate );
+      }
 
-			if ( zm_reload )
-			{
-				monitor->Reload();
-				zm_reload = false;
-			}
-			sigprocmask( SIG_UNBLOCK, &block_set, 0 );
-		}
-		delete monitor;
-	}
-	else
-	{
-		fprintf( stderr, "Can't find monitor with id of %d\n", id );
-	}
-	logTerm();
-	zmDbClose();
-	return( 0 );
+      if ( zm_reload )
+      {
+        monitor->Reload();
+        zm_reload = false;
+      }
+      sigprocmask( SIG_UNBLOCK, &block_set, 0 );
+    }
+    delete monitor;
+  }
+  else
+  {
+    fprintf( stderr, "Can't find monitor with id of %d\n", id );
+  }
+  logTerm();
+  zmDbClose();
+  return( 0 );
 }
diff --git a/src/zmc.cpp b/src/zmc.cpp
index 56417d044..42b6b7aff 100644
--- a/src/zmc.cpp
+++ b/src/zmc.cpp
@@ -44,12 +44,12 @@ possible, this should run at more or less constant speed.
 
 =head1 OPTIONS
 
- -d, --device <device_path>               - For local cameras, device to access. e.g /dev/video0 etc
+ -d, --device <device_path>         - For local cameras, device to access. e.g /dev/video0 etc
  -r <proto> -H <host> -P <port> -p <path> - For remote cameras
- -f, --file <file_path>                   - For local images, jpg file to access.
- -m, --monitor_id                         - ID of the monitor to analyse
- -h, --help                               - Display usage information
- -v, --version                            - Print the installed version of ZoneMinder
+ -f, --file <file_path>           - For local images, jpg file to access.
+ -m, --monitor_id             - ID of the monitor to analyse
+ -h, --help                 - Display usage information
+ -v, --version              - Print the installed version of ZoneMinder
 
 =cut
 
@@ -75,290 +75,290 @@ possible, this should run at more or less constant speed.
 
 void Usage()
 {
-	fprintf( stderr, "zmc -d <device_path> or -r <proto> -H <host> -P <port> -p <path> or -f <file_path> or -m <monitor_id>\n" );
+  fprintf( stderr, "zmc -d <device_path> or -r <proto> -H <host> -P <port> -p <path> or -f <file_path> or -m <monitor_id>\n" );
 
-	fprintf( stderr, "Options:\n" );
+  fprintf( stderr, "Options:\n" );
 #if defined(BSD)
-	fprintf( stderr, "  -d, --device <device_path>               : For local cameras, device to access. E.g /dev/bktr0 etc\n" );
+  fprintf( stderr, "  -d, --device <device_path>         : For local cameras, device to access. E.g /dev/bktr0 etc\n" );
 #else
-	fprintf( stderr, "  -d, --device <device_path>               : For local cameras, device to access. E.g /dev/video0 etc\n" );
+  fprintf( stderr, "  -d, --device <device_path>         : For local cameras, device to access. E.g /dev/video0 etc\n" );
 #endif
-	fprintf( stderr, "  -r <proto> -H <host> -P <port> -p <path> : For remote cameras\n" );
-	fprintf( stderr, "  -f, --file <file_path>                   : For local images, jpg file to access.\n" );
-	fprintf( stderr, "  -m, --monitor <monitor_id>               : For sources associated with a single monitor\n" );
-	fprintf( stderr, "  -h, --help                               : This screen\n" );
-	fprintf( stderr, "  -v, --version                            : Report the installed version of ZoneMinder\n" );
-	exit( 0 );
+  fprintf( stderr, "  -r <proto> -H <host> -P <port> -p <path> : For remote cameras\n" );
+  fprintf( stderr, "  -f, --file <file_path>           : For local images, jpg file to access.\n" );
+  fprintf( stderr, "  -m, --monitor <monitor_id>         : For sources associated with a single monitor\n" );
+  fprintf( stderr, "  -h, --help                 : This screen\n" );
+  fprintf( stderr, "  -v, --version              : Report the installed version of ZoneMinder\n" );
+  exit( 0 );
 }
 
 int main( int argc, char *argv[] )
 {
-	self = argv[0];
+  self = argv[0];
 
-	srand( getpid() * time( 0 ) );
+  srand( getpid() * time( 0 ) );
 
-	const char *device = "";
-	const char *protocol = "";
-	const char *host = "";
-	const char *port = "";
-	const char *path = "";
-	const char *file = "";
-	int monitor_id = -1;
+  const char *device = "";
+  const char *protocol = "";
+  const char *host = "";
+  const char *port = "";
+  const char *path = "";
+  const char *file = "";
+  int monitor_id = -1;
 
-	static struct option long_options[] = {
-		{"device", 1, 0, 'd'},
-		{"protocol", 1, 0, 'r'},
-		{"host", 1, 0, 'H'},
-		{"port", 1, 0, 'P'},
-	 	{"path", 1, 0, 'p'},
-	 	{"file", 1, 0, 'f'},
-		{"monitor", 1, 0, 'm'},
-		{"help", 0, 0, 'h'},
-		{"version", 0, 0, 'v'},
-		{0, 0, 0, 0}
-	};
+  static struct option long_options[] = {
+    {"device", 1, 0, 'd'},
+    {"protocol", 1, 0, 'r'},
+    {"host", 1, 0, 'H'},
+    {"port", 1, 0, 'P'},
+     {"path", 1, 0, 'p'},
+     {"file", 1, 0, 'f'},
+    {"monitor", 1, 0, 'm'},
+    {"help", 0, 0, 'h'},
+    {"version", 0, 0, 'v'},
+    {0, 0, 0, 0}
+  };
 
-	while (1)
-	{
-		int option_index = 0;
+  while (1)
+  {
+    int option_index = 0;
 
-		int c = getopt_long (argc, argv, "d:H:P:p:f:m:h:v", long_options, &option_index);
-		if (c == -1)
-		{
-			break;
-		}
+    int c = getopt_long (argc, argv, "d:H:P:p:f:m:h:v", long_options, &option_index);
+    if (c == -1)
+    {
+      break;
+    }
 
-		switch (c)
-		{
-			case 'd':
-				device = optarg;
-				break;
-			case 'H':
-				host = optarg;
-				break;
-			case 'P':
-				port = optarg;
-				break;
-			case 'p':
-				path = optarg;
-				break;
-			case 'f':
-				file = optarg;
-				break;
-			case 'm':
-				monitor_id = atoi(optarg);
-				break;
-			case 'h':
-			case '?':
-				Usage();
-				break;
-			case 'v':
-				std::cout << ZM_VERSION << "\n";
-				exit(0);
-			default:
-				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-				break;
-		}
-	}
+    switch (c)
+    {
+      case 'd':
+        device = optarg;
+        break;
+      case 'H':
+        host = optarg;
+        break;
+      case 'P':
+        port = optarg;
+        break;
+      case 'p':
+        path = optarg;
+        break;
+      case 'f':
+        file = optarg;
+        break;
+      case 'm':
+        monitor_id = atoi(optarg);
+        break;
+      case 'h':
+      case '?':
+        Usage();
+        break;
+      case 'v':
+        std::cout << ZM_VERSION << "\n";
+        exit(0);
+      default:
+        //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
+        break;
+    }
+  }
 
-	if (optind < argc)
-	{
-		fprintf( stderr, "Extraneous options, " );
-		while (optind < argc)
-			printf ("%s ", argv[optind++]);
-		printf ("\n");
-		Usage();
-	}
+  if (optind < argc)
+  {
+    fprintf( stderr, "Extraneous options, " );
+    while (optind < argc)
+      printf ("%s ", argv[optind++]);
+    printf ("\n");
+    Usage();
+  }
 
-	int modes = ( device[0]?1:0 + host[0]?1:0 + file[0]?1:0 + (monitor_id>0?1:0) );
-	if ( modes > 1 )
-	{
-		fprintf( stderr, "Only one of device, host/port/path, file or monitor id allowed\n" );
-		Usage();
-		exit( 0 );
-	}
+  int modes = ( device[0]?1:0 + host[0]?1:0 + file[0]?1:0 + (monitor_id>0?1:0) );
+  if ( modes > 1 )
+  {
+    fprintf( stderr, "Only one of device, host/port/path, file or monitor id allowed\n" );
+    Usage();
+    exit( 0 );
+  }
 
-	if ( modes < 1 )
-	{
-		fprintf( stderr, "One of device, host/port/path, file or monitor id must be specified\n" );
-		Usage();
-		exit( 0 );
-	}
+  if ( modes < 1 )
+  {
+    fprintf( stderr, "One of device, host/port/path, file or monitor id must be specified\n" );
+    Usage();
+    exit( 0 );
+  }
 
-	char log_id_string[32] = "";
-	if ( device[0] )
-	{
-		const char *slash_ptr = strrchr( device, '/' );
-		snprintf( log_id_string, sizeof(log_id_string), "zmc_d%s", slash_ptr?slash_ptr+1:device );
-	}
-	else if ( host[0] )
-	{
-		snprintf( log_id_string, sizeof(log_id_string), "zmc_h%s", host );
-	}
-	else if ( file[0] )
-	{
-		const char *slash_ptr = strrchr( file, '/' );
-		snprintf( log_id_string, sizeof(log_id_string), "zmc_f%s", slash_ptr?slash_ptr+1:file );
-	}
-	else
-	{
-		snprintf( log_id_string, sizeof(log_id_string), "zmc_m%d", monitor_id );
-	}
+  char log_id_string[32] = "";
+  if ( device[0] )
+  {
+    const char *slash_ptr = strrchr( device, '/' );
+    snprintf( log_id_string, sizeof(log_id_string), "zmc_d%s", slash_ptr?slash_ptr+1:device );
+  }
+  else if ( host[0] )
+  {
+    snprintf( log_id_string, sizeof(log_id_string), "zmc_h%s", host );
+  }
+  else if ( file[0] )
+  {
+    const char *slash_ptr = strrchr( file, '/' );
+    snprintf( log_id_string, sizeof(log_id_string), "zmc_f%s", slash_ptr?slash_ptr+1:file );
+  }
+  else
+  {
+    snprintf( log_id_string, sizeof(log_id_string), "zmc_m%d", monitor_id );
+  }
 
-	zmLoadConfig();
+  zmLoadConfig();
 
-	logInit( log_id_string );
-	
-	ssedetect();
+  logInit( log_id_string );
+  
+  ssedetect();
 
-	Monitor **monitors = 0;
-	int n_monitors = 0;
+  Monitor **monitors = 0;
+  int n_monitors = 0;
 #if ZM_HAS_V4L
-	if ( device[0] )
-	{
-		n_monitors = Monitor::LoadLocalMonitors( device, monitors, Monitor::CAPTURE );
-	}
-	else
+  if ( device[0] )
+  {
+    n_monitors = Monitor::LoadLocalMonitors( device, monitors, Monitor::CAPTURE );
+  }
+  else
 #endif // ZM_HAS_V4L
-    if ( host[0] )
-	{
-		if ( !port )
-			port = "80";
-		n_monitors = Monitor::LoadRemoteMonitors( protocol, host, port, path, monitors, Monitor::CAPTURE );
-	}
-	else if ( file[0] )
-	{
-		n_monitors = Monitor::LoadFileMonitors( file, monitors, Monitor::CAPTURE );
-	}
-	else
-	{
-		Monitor *monitor = Monitor::Load( monitor_id, true, Monitor::CAPTURE );
-		if ( monitor )
-		{
-			monitors = new Monitor *[1];
-			monitors[0] = monitor;
-			n_monitors = 1;
-		}
-	}
+  if ( host[0] )
+  {
+    if ( !port )
+      port = "80";
+    n_monitors = Monitor::LoadRemoteMonitors( protocol, host, port, path, monitors, Monitor::CAPTURE );
+  }
+  else if ( file[0] )
+  {
+    n_monitors = Monitor::LoadFileMonitors( file, monitors, Monitor::CAPTURE );
+  }
+  else
+  {
+    Monitor *monitor = Monitor::Load( monitor_id, true, Monitor::CAPTURE );
+    if ( monitor )
+    {
+      monitors = new Monitor *[1];
+      monitors[0] = monitor;
+      n_monitors = 1;
+    }
+  }
 
-	if ( !n_monitors )
-	{
-		Error( "No monitors found" );
-		exit ( -1 );
-	}
+  if ( !n_monitors )
+  {
+    Error( "No monitors found" );
+    exit ( -1 );
+  }
 
-	Info( "Starting Capture version %s", ZM_VERSION );
+  Info( "Starting Capture version %s", ZM_VERSION );
 
-	zmSetDefaultTermHandler();
-	zmSetDefaultDieHandler();
+  zmSetDefaultTermHandler();
+  zmSetDefaultDieHandler();
 
-	sigset_t block_set;
-	sigemptyset( &block_set );
+  sigset_t block_set;
+  sigemptyset( &block_set );
 
-	sigaddset( &block_set, SIGUSR1 );
-	sigaddset( &block_set, SIGUSR2 );
+  sigaddset( &block_set, SIGUSR1 );
+  sigaddset( &block_set, SIGUSR2 );
 
-	if ( monitors[0]->PrimeCapture() < 0 )
-	{
-        Error( "Failed to prime capture of initial monitor" );
-		exit( -1 );
-	}
+  if ( monitors[0]->PrimeCapture() < 0 )
+  {
+    Error( "Failed to prime capture of initial monitor" );
+    exit( -1 );
+  }
 
-	long *capture_delays = new long[n_monitors];
-	long *alarm_capture_delays = new long[n_monitors];
-	long *next_delays = new long[n_monitors];
-	struct timeval * last_capture_times = new struct timeval[n_monitors];
-	for ( int i = 0; i < n_monitors; i++ )
-	{
-		last_capture_times[i].tv_sec = last_capture_times[i].tv_usec = 0;
-		capture_delays[i] = monitors[i]->GetCaptureDelay();
-		alarm_capture_delays[i] = monitors[i]->GetAlarmCaptureDelay();
-	}
+  long *capture_delays = new long[n_monitors];
+  long *alarm_capture_delays = new long[n_monitors];
+  long *next_delays = new long[n_monitors];
+  struct timeval * last_capture_times = new struct timeval[n_monitors];
+  for ( int i = 0; i < n_monitors; i++ )
+  {
+    last_capture_times[i].tv_sec = last_capture_times[i].tv_usec = 0;
+    capture_delays[i] = monitors[i]->GetCaptureDelay();
+    alarm_capture_delays[i] = monitors[i]->GetAlarmCaptureDelay();
+  }
 
-    int result = 0;
-	struct timeval now;
-	struct DeltaTimeval delta_time;
-	while( !zm_terminate )
-	{
-		sigprocmask( SIG_BLOCK, &block_set, 0 );
-		for ( int i = 0; i < n_monitors; i++ )
-		{
-			long min_delay = MAXINT;
+  int result = 0;
+  struct timeval now;
+  struct DeltaTimeval delta_time;
+  while( !zm_terminate )
+  {
+    sigprocmask( SIG_BLOCK, &block_set, 0 );
+    for ( int i = 0; i < n_monitors; i++ )
+    {
+      long min_delay = MAXINT;
 
-			gettimeofday( &now, NULL );
-			for ( int j = 0; j < n_monitors; j++ )
-			{
-				if ( last_capture_times[j].tv_sec )
-				{
-					DELTA_TIMEVAL( delta_time, now, last_capture_times[j], DT_PREC_3 );
-					if ( monitors[i]->GetState() == Monitor::ALARM )
-						next_delays[j] = alarm_capture_delays[j]-delta_time.delta;
-					else
-						next_delays[j] = capture_delays[j]-delta_time.delta;
-					if ( next_delays[j] < 0 )
-						next_delays[j] = 0;
-				}
-				else
-				{
-					next_delays[j] = 0;
-				}
-				if ( next_delays[j] <= min_delay )
-				{
-					min_delay = next_delays[j];
-				}
-			}
+      gettimeofday( &now, NULL );
+      for ( int j = 0; j < n_monitors; j++ )
+      {
+        if ( last_capture_times[j].tv_sec )
+        {
+          DELTA_TIMEVAL( delta_time, now, last_capture_times[j], DT_PREC_3 );
+          if ( monitors[i]->GetState() == Monitor::ALARM )
+            next_delays[j] = alarm_capture_delays[j]-delta_time.delta;
+          else
+            next_delays[j] = capture_delays[j]-delta_time.delta;
+          if ( next_delays[j] < 0 )
+            next_delays[j] = 0;
+        }
+        else
+        {
+          next_delays[j] = 0;
+        }
+        if ( next_delays[j] <= min_delay )
+        {
+          min_delay = next_delays[j];
+        }
+      }
 
-			if ( next_delays[i] <= min_delay || next_delays[i] <= 0 )
-			{
-				if ( monitors[i]->PreCapture() < 0 )
-				{
-                    Error( "Failed to pre-capture monitor %d %d (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
-                    zm_terminate = true;
-                    result = -1;
-                    break;
-				}
-				if ( monitors[i]->Capture() < 0 )
-				{
-                    Error( "Failed to capture image from monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
-                    zm_terminate = true;
-                    result = -1;
-                    break;
-				}
-				if ( monitors[i]->PostCapture() < 0 )
-				{
-                    Error( "Failed to post-capture monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
-                    zm_terminate = true;
-                    result = -1;
-                    break;
-				}
+      if ( next_delays[i] <= min_delay || next_delays[i] <= 0 )
+      {
+        if ( monitors[i]->PreCapture() < 0 )
+        {
+          Error( "Failed to pre-capture monitor %d %d (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
+          zm_terminate = true;
+          result = -1;
+          break;
+        }
+        if ( monitors[i]->Capture() < 0 )
+        {
+          Error( "Failed to capture image from monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
+          zm_terminate = true;
+          result = -1;
+          break;
+        }
+        if ( monitors[i]->PostCapture() < 0 )
+        {
+          Error( "Failed to post-capture monitor %d %s (%d/%d)", monitors[i]->Id(), monitors[i]->Name(), i+1, n_monitors );
+          zm_terminate = true;
+          result = -1;
+          break;
+        }
 
-				if ( next_delays[i] > 0 )
-				{
-					gettimeofday( &now, NULL );
-					DELTA_TIMEVAL( delta_time, now, last_capture_times[i], DT_PREC_3 );
-					long sleep_time = next_delays[i]-delta_time.delta;
-					if ( sleep_time > 0 )
-					{
-						usleep( sleep_time*(DT_MAXGRAN/DT_PREC_3) );
-					}
-				}
-				gettimeofday( &(last_capture_times[i]), NULL );
-			}
-		}
-		sigprocmask( SIG_UNBLOCK, &block_set, 0 );
-	}
-	for ( int i = 0; i < n_monitors; i++ )
-	{
-		delete monitors[i];
-	}
-	delete [] monitors;
-	delete [] alarm_capture_delays;
-	delete [] capture_delays;
-	delete [] next_delays;
-	delete [] last_capture_times;
+        if ( next_delays[i] > 0 )
+        {
+          gettimeofday( &now, NULL );
+          DELTA_TIMEVAL( delta_time, now, last_capture_times[i], DT_PREC_3 );
+          long sleep_time = next_delays[i]-delta_time.delta;
+          if ( sleep_time > 0 )
+          {
+            usleep( sleep_time*(DT_MAXGRAN/DT_PREC_3) );
+          }
+        }
+        gettimeofday( &(last_capture_times[i]), NULL );
+      }
+    }
+    sigprocmask( SIG_UNBLOCK, &block_set, 0 );
+  }
+  for ( int i = 0; i < n_monitors; i++ )
+  {
+    delete monitors[i];
+  }
+  delete [] monitors;
+  delete [] alarm_capture_delays;
+  delete [] capture_delays;
+  delete [] next_delays;
+  delete [] last_capture_times;
 
-	logTerm();
-	zmDbClose();
+  logTerm();
+  zmDbClose();
 
-	return( result );
+  return( result );
 }
diff --git a/src/zmf.cpp b/src/zmf.cpp
index 7abe7a897..a739927f1 100644
--- a/src/zmf.cpp
+++ b/src/zmf.cpp
@@ -42,9 +42,9 @@ them itself.
 
 =head1 OPTIONS
 
- -m, --monitor_id                 - ID of the monitor to use
- -h, --help                       - Display usage information
- -v, --version                    - Print the installed version of ZoneMinder
+ -m, --monitor_id         - ID of the monitor to use
+ -h, --help             - Display usage information
+ -v, --version          - Print the installed version of ZoneMinder
 
 =cut
 
@@ -73,278 +73,278 @@ them itself.
 
 int OpenSocket( int monitor_id )
 {
-	int sd = socket( AF_UNIX, SOCK_STREAM, 0);
-	if ( sd < 0 )
-	{
-		Error( "Can't create socket: %s", strerror(errno) );
-		return( -1 );
-	}
+  int sd = socket( AF_UNIX, SOCK_STREAM, 0);
+  if ( sd < 0 )
+  {
+    Error( "Can't create socket: %s", strerror(errno) );
+    return( -1 );
+  }
 
-	char sock_path[PATH_MAX] = "";
-	snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
-	if ( unlink( sock_path ) < 0 )
-	{
-		Warning( "Can't unlink '%s': %s", sock_path, strerror(errno) );
-	}
+  char sock_path[PATH_MAX] = "";
+  snprintf( sock_path, sizeof(sock_path), "%s/zmf-%d.sock", config.path_socks, monitor_id );
+  if ( unlink( sock_path ) < 0 )
+  {
+    Warning( "Can't unlink '%s': %s", sock_path, strerror(errno) );
+  }
 
-	struct sockaddr_un addr;
+  struct sockaddr_un addr;
 
-	strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
-	addr.sun_family = AF_UNIX;
+  strncpy( addr.sun_path, sock_path, sizeof(addr.sun_path) );
+  addr.sun_family = AF_UNIX;
 
-	if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
-	{
-		Error( "Can't bind: %s", strerror(errno) );
-		exit( -1 );
-	}
+  if ( bind( sd, (struct sockaddr *)&addr, strlen(addr.sun_path)+sizeof(addr.sun_family)) < 0 )
+  {
+    Error( "Can't bind: %s", strerror(errno) );
+    exit( -1 );
+  }
 
-	if ( listen( sd, SOMAXCONN ) < 0 )
-	{
-		Error( "Can't listen: %s", strerror(errno) );
-		return( -1 );
-	}
+  if ( listen( sd, SOMAXCONN ) < 0 )
+  {
+    Error( "Can't listen: %s", strerror(errno) );
+    return( -1 );
+  }
 
-	struct sockaddr_un rem_addr;
-	socklen_t rem_addr_len = sizeof(rem_addr);
-	int new_sd = -1;
-	if ( (new_sd = accept( sd, (struct sockaddr *)&rem_addr, &rem_addr_len )) < 0 )
-	{
-		Error( "Can't accept: %s", strerror(errno) );
-		exit( -1 );
-	}
-	close( sd );
+  struct sockaddr_un rem_addr;
+  socklen_t rem_addr_len = sizeof(rem_addr);
+  int new_sd = -1;
+  if ( (new_sd = accept( sd, (struct sockaddr *)&rem_addr, &rem_addr_len )) < 0 )
+  {
+    Error( "Can't accept: %s", strerror(errno) );
+    exit( -1 );
+  }
+  close( sd );
 
-	sd = new_sd;
+  sd = new_sd;
 
-	Info( "Frame server socket open, awaiting images" );
-	return( sd );
+  Info( "Frame server socket open, awaiting images" );
+  return( sd );
 }
 
 int ReopenSocket( int &sd, int monitor_id )
 {
-	close( sd );
-	return( sd = OpenSocket( monitor_id ) );
+  close( sd );
+  return( sd = OpenSocket( monitor_id ) );
 }
 
 void Usage()
 {
-	fprintf( stderr, "zmf -m <monitor_id>\n" );
-	fprintf( stderr, "Options:\n" );
-	fprintf( stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to use\n" );
-	fprintf( stderr, "  -h, --help                   : This screen\n" );
-	fprintf( stderr, "  -v, --version                : Report the installed version of ZoneMinder\n" );
-	exit( 0 );
+  fprintf( stderr, "zmf -m <monitor_id>\n" );
+  fprintf( stderr, "Options:\n" );
+  fprintf( stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to use\n" );
+  fprintf( stderr, "  -h, --help           : This screen\n" );
+  fprintf( stderr, "  -v, --version        : Report the installed version of ZoneMinder\n" );
+  exit( 0 );
 }
 
 int main( int argc, char *argv[] )
 {
-	self = argv[0];
+  self = argv[0];
 
-	srand( getpid() * time( 0 ) );
+  srand( getpid() * time( 0 ) );
 
-	int id = -1;
+  int id = -1;
 
-	static struct option long_options[] = {
-		{"monitor", 1, 0, 'm'},
-		{"help", 0, 0, 'h'},
-		{"version", 0, 0, 'v'},
-		{0, 0, 0, 0}
-	};
+  static struct option long_options[] = {
+    {"monitor", 1, 0, 'm'},
+    {"help", 0, 0, 'h'},
+    {"version", 0, 0, 'v'},
+    {0, 0, 0, 0}
+  };
 
-	while (1)
-	{
-		int option_index = 0;
+  while (1)
+  {
+    int option_index = 0;
 
-		int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
-		if (c == -1)
-		{
-			break;
-		}
+    int c = getopt_long (argc, argv, "m:h:v", long_options, &option_index);
+    if (c == -1)
+    {
+      break;
+    }
 
-		switch (c)
-		{
-			case 'm':
-				id = atoi(optarg);
-				break;
-			case 'h':
-			case '?':
-				Usage();
-				break;
-			case 'v':
-				std::cout << ZM_VERSION << "\n";
-				exit(0);
-			default:
-				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-				break;
-		}
-	}
+    switch (c)
+    {
+      case 'm':
+        id = atoi(optarg);
+        break;
+      case 'h':
+      case '?':
+        Usage();
+        break;
+      case 'v':
+        std::cout << ZM_VERSION << "\n";
+        exit(0);
+      default:
+        //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
+        break;
+    }
+  }
 
-	if (optind < argc)
-	{
-		fprintf( stderr, "Extraneous options, " );
-		while (optind < argc)
-			printf ("%s ", argv[optind++]);
-		printf ("\n");
-		Usage();
-	}
+  if (optind < argc)
+  {
+    fprintf( stderr, "Extraneous options, " );
+    while (optind < argc)
+      printf ("%s ", argv[optind++]);
+    printf ("\n");
+    Usage();
+  }
 
-	if ( id < 0 )
-	{
-		fprintf( stderr, "Bogus monitor %d\n", id );
-		Usage();
-		exit( 0 );
-	}
+  if ( id < 0 )
+  {
+    fprintf( stderr, "Bogus monitor %d\n", id );
+    Usage();
+    exit( 0 );
+  }
 
-	char log_id_string[16];
-	snprintf( log_id_string, sizeof(log_id_string), "m%d", id );
+  char log_id_string[16];
+  snprintf( log_id_string, sizeof(log_id_string), "m%d", id );
 
-	zmLoadConfig();
+  zmLoadConfig();
 
-	logInit( "zmf" );
-	
-	ssedetect();
+  logInit( "zmf" );
+  
+  ssedetect();
 
-	Monitor *monitor = Monitor::Load( id, false, Monitor::QUERY );
+  Monitor *monitor = Monitor::Load( id, false, Monitor::QUERY );
 
-	if ( !monitor )
-	{
-		fprintf( stderr, "Can't find monitor with id of %d\n", id );
-		exit( -1 );
-	}
+  if ( !monitor )
+  {
+    fprintf( stderr, "Can't find monitor with id of %d\n", id );
+    exit( -1 );
+  }
 
-	char capt_path[PATH_MAX];
-	char anal_path[PATH_MAX];
-	snprintf( capt_path, sizeof(capt_path), "%s/%d/%%s/%%0%dd-capture.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
-	snprintf( anal_path, sizeof(anal_path), "%s/%d/%%s/%%0%dd-analyse.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
-	zmSetDefaultTermHandler();
-	zmSetDefaultDieHandler();
+  char capt_path[PATH_MAX];
+  char anal_path[PATH_MAX];
+  snprintf( capt_path, sizeof(capt_path), "%s/%d/%%s/%%0%dd-capture.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
+  snprintf( anal_path, sizeof(anal_path), "%s/%d/%%s/%%0%dd-analyse.jpg", config.dir_events, monitor->Id(), config.event_image_digits );
+  zmSetDefaultTermHandler();
+  zmSetDefaultDieHandler();
 
-	sigset_t block_set;
-	sigemptyset( &block_set );
+  sigset_t block_set;
+  sigemptyset( &block_set );
 
-	int sd = OpenSocket( monitor->Id() );
+  int sd = OpenSocket( monitor->Id() );
 
-	FrameHeader frame_header = { 0, 0, false, 0 };
-	//unsigned char *image_data = 0;
+  FrameHeader frame_header = { 0, 0, false, 0 };
+  //unsigned char *image_data = 0;
 
-	fd_set rfds;
+  fd_set rfds;
 
-	struct timeval timeout;
-	timeout.tv_sec = 1;
-	timeout.tv_usec = 0;
-	while( 1 )
-	{
-		struct timeval temp_timeout = timeout;
+  struct timeval timeout;
+  timeout.tv_sec = 1;
+  timeout.tv_usec = 0;
+  while( 1 )
+  {
+    struct timeval temp_timeout = timeout;
 
-		FD_ZERO(&rfds);
-		FD_SET(sd, &rfds);
-		int n_found = select( sd+1, &rfds, NULL, NULL, &temp_timeout );
-		if( n_found == 0 )
-		{
-			Debug( 1, "Select timed out" );
-			continue;
-		}
-		else if ( n_found < 0)
-		{
-			Error( "Select error: %s", strerror(errno) );
-			ReopenSocket( sd, monitor->Id() );
-			continue;
-		}
+    FD_ZERO(&rfds);
+    FD_SET(sd, &rfds);
+    int n_found = select( sd+1, &rfds, NULL, NULL, &temp_timeout );
+    if( n_found == 0 )
+    {
+      Debug( 1, "Select timed out" );
+      continue;
+    }
+    else if ( n_found < 0)
+    {
+      Error( "Select error: %s", strerror(errno) );
+      ReopenSocket( sd, monitor->Id() );
+      continue;
+    }
 
-		sigprocmask( SIG_BLOCK, &block_set, 0 );
+    sigprocmask( SIG_BLOCK, &block_set, 0 );
 
-		int n_bytes = read( sd, &frame_header, sizeof(frame_header) );
-		if ( n_bytes != sizeof(frame_header) )
-		{
-			if ( n_bytes < 0 )
-			{
-				Error( "Can't read frame header: %s", strerror(errno) );
-			}
-			else if ( n_bytes > 0 )
-			{
-				Error( "Incomplete read of frame header, %d bytes only", n_bytes );
-			}
-			else
-			{
-				Warning( "Socket closed at remote end" );
-			}
-			ReopenSocket( sd, monitor->Id() );
-			continue;
-		}
-		Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
-		static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
+    int n_bytes = read( sd, &frame_header, sizeof(frame_header) );
+    if ( n_bytes != sizeof(frame_header) )
+    {
+      if ( n_bytes < 0 )
+      {
+        Error( "Can't read frame header: %s", strerror(errno) );
+      }
+      else if ( n_bytes > 0 )
+      {
+        Error( "Incomplete read of frame header, %d bytes only", n_bytes );
+      }
+      else
+      {
+        Warning( "Socket closed at remote end" );
+      }
+      ReopenSocket( sd, monitor->Id() );
+      continue;
+    }
+    Debug( 1, "Read frame header, expecting %ld bytes of image", frame_header.image_length );
+    static unsigned char image_data[ZM_MAX_IMAGE_SIZE];
 
-                // Read for pipe and loop until bytes expected have been read or an error occurs
-                int bytes_read = 0;
-                do
-		{
-                        n_bytes = read( sd, image_data+bytes_read, frame_header.image_length-bytes_read );
-                        if (n_bytes < 0) break; // break on error
-                        if (n_bytes < (int)frame_header.image_length)
-			{
-                                // print some informational messages 
-                                if (bytes_read == 0)
-                                {
-                                        Debug(4,"Image read : Short read %d bytes of %d expected bytes",n_bytes,frame_header.image_length);
-                                }
-                                else if (bytes_read+n_bytes == (int)frame_header.image_length)
-                                {
-                                        Debug(5,"Image read : Read rest of short read: %d bytes read total of %d bytes",n_bytes,frame_header.image_length);
-                                }
-                                else
-                                {
-                                        Debug(6,"Image read : continuing, read %d bytes (%d so far)", n_bytes, bytes_read+n_bytes);
-                                }
-			}
-                        bytes_read+= n_bytes;
-                } while (n_bytes>0 && (bytes_read < (ssize_t)frame_header.image_length) );
-
-                // Print errors if there was a problem
-                if ( n_bytes < 1 )
+        // Read for pipe and loop until bytes expected have been read or an error occurs
+        int bytes_read = 0;
+        do
+    {
+            n_bytes = read( sd, image_data+bytes_read, frame_header.image_length-bytes_read );
+            if (n_bytes < 0) break; // break on error
+            if (n_bytes < (int)frame_header.image_length)
+      {
+                // print some informational messages 
+                if (bytes_read == 0)
                 {
-                        Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
-                        if ( n_bytes < 0 )
-			{
-                                Error( "Can't read frame image data: %s", strerror(errno) );
-			}
-			else
-			{
-				Warning( "Socket closed at remote end" );
-			}
-			ReopenSocket( sd, monitor->Id() );
-			continue;
-		}
-
-		static char subpath[PATH_MAX] = "";
-                if ( config.use_deep_storage )
+                    Debug(4,"Image read : Short read %d bytes of %d expected bytes",n_bytes,frame_header.image_length);
+                }
+                else if (bytes_read+n_bytes == (int)frame_header.image_length)
                 {
-                    struct tm *time = localtime( &frame_header.event_time );
-                    snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
+                    Debug(5,"Image read : Read rest of short read: %d bytes read total of %d bytes",n_bytes,frame_header.image_length);
                 }
                 else
                 {
-                    snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
+                    Debug(6,"Image read : continuing, read %d bytes (%d so far)", n_bytes, bytes_read+n_bytes);
                 }
+      }
+            bytes_read+= n_bytes;
+        } while (n_bytes>0 && (bytes_read < (ssize_t)frame_header.image_length) );
 
-		static char path[PATH_MAX] = "";
-		snprintf( path, sizeof(path), frame_header.alarm_frame?anal_path:capt_path, subpath, frame_header.frame_id );
-		Debug( 1, "Got image, writing to %s", path );
+        // Print errors if there was a problem
+        if ( n_bytes < 1 )
+        {
+            Error( "Only read %d bytes of %d\n", bytes_read, frame_header.image_length);
+            if ( n_bytes < 0 )
+      {
+                Error( "Can't read frame image data: %s", strerror(errno) );
+      }
+      else
+      {
+        Warning( "Socket closed at remote end" );
+      }
+      ReopenSocket( sd, monitor->Id() );
+      continue;
+    }
 
-		FILE *fd = 0;
-		if ( (fd = fopen( path, "w" )) < 0 )
-		{
-			Error( "Can't fopen '%s': %s", path, strerror(errno) );
-			exit( -1 );
-		}
-		if ( 0 == fwrite( image_data, frame_header.image_length, 1, fd ) )
-		{
-			Error( "Can't fwrite image data: %s", strerror(errno) );
-			exit( -1 );
-		}
-		fclose( fd );
+    static char subpath[PATH_MAX] = "";
+        if ( config.use_deep_storage )
+        {
+          struct tm *time = localtime( &frame_header.event_time );
+          snprintf( subpath, sizeof(subpath), "%02d/%02d/%02d/%02d/%02d/%02d", time->tm_year-100, time->tm_mon+1, time->tm_mday, time->tm_hour, time->tm_min, time->tm_sec );
+        }
+        else
+        {
+          snprintf( subpath, sizeof(subpath), "%ld", frame_header.event_id );
+        }
 
-		sigprocmask( SIG_UNBLOCK, &block_set, 0 );
-	}
-	logTerm();
-	zmDbClose();
+    static char path[PATH_MAX] = "";
+    snprintf( path, sizeof(path), frame_header.alarm_frame?anal_path:capt_path, subpath, frame_header.frame_id );
+    Debug( 1, "Got image, writing to %s", path );
+
+    FILE *fd = 0;
+    if ( (fd = fopen( path, "w" )) < 0 )
+    {
+      Error( "Can't fopen '%s': %s", path, strerror(errno) );
+      exit( -1 );
+    }
+    if ( 0 == fwrite( image_data, frame_header.image_length, 1, fd ) )
+    {
+      Error( "Can't fwrite image data: %s", strerror(errno) );
+      exit( -1 );
+    }
+    fclose( fd );
+
+    sigprocmask( SIG_UNBLOCK, &block_set, 0 );
+  }
+  logTerm();
+  zmDbClose();
 }
diff --git a/src/zmf.h b/src/zmf.h
index f00ffa891..211577309 100644
--- a/src/zmf.h
+++ b/src/zmf.h
@@ -22,11 +22,11 @@
 
 struct FrameHeader
 {
-	unsigned long event_id;
-    time_t event_time;
-	unsigned long frame_id;
-	bool alarm_frame;
-	unsigned long image_length;
+  unsigned long event_id;
+  time_t event_time;
+  unsigned long frame_id;
+  bool alarm_frame;
+  unsigned long image_length;
 };
 
 #endif // ZMFILE_H
diff --git a/src/zms.cpp b/src/zms.cpp
index 9a7fcc941..e40fcdf95 100644
--- a/src/zms.cpp
+++ b/src/zms.cpp
@@ -28,318 +28,318 @@
 
 bool ValidateAccess( User *user, int mon_id )
 {
-	bool allowed = true;
+  bool allowed = true;
 
-	if ( mon_id > 0 )
-	{
-		if ( user->getStream() < User::PERM_VIEW )
-			allowed = false;
-		if ( !user->canAccess( mon_id ) )
-			allowed = false;
-	}
-	else
-	{
-		if ( user->getEvents() < User::PERM_VIEW )
-			allowed = false;
-	}
-	if ( !allowed )
-	{
-		Error( "Error, insufficient privileges for requested action" );
-		exit( -1 );
-	}
-	return( allowed );
+  if ( mon_id > 0 )
+  {
+    if ( user->getStream() < User::PERM_VIEW )
+      allowed = false;
+    if ( !user->canAccess( mon_id ) )
+      allowed = false;
+  }
+  else
+  {
+    if ( user->getEvents() < User::PERM_VIEW )
+      allowed = false;
+  }
+  if ( !allowed )
+  {
+    Error( "Error, insufficient privileges for requested action" );
+    exit( -1 );
+  }
+  return( allowed );
 }
 
 int main( int argc, const char *argv[] )
 {
-	self = argv[0];
+  self = argv[0];
 
-	srand( getpid() * time( 0 ) );
+  srand( getpid() * time( 0 ) );
 
-	enum { ZMS_MONITOR, ZMS_EVENT } source = ZMS_MONITOR;
-	enum { ZMS_JPEG, ZMS_MPEG, ZMS_RAW, ZMS_ZIP, ZMS_SINGLE } mode = ZMS_JPEG;
-	char format[32] = "";
-	int monitor_id = 0;
-	time_t event_time = 0;
-	int event_id = 0;
-	int frame_id = 1;
-	unsigned int scale = 100;
-	unsigned int rate = 100;
-	double maxfps = 10.0;
-	unsigned int bitrate = 100000;
-	unsigned int ttl = 0;
-    EventStream::StreamMode replay = EventStream::MODE_SINGLE;
-	char username[64] = "";
-	char password[64] = "";
-	char auth[64] = "";
-    unsigned int connkey = 0;
-    unsigned int playback_buffer = 0;
+  enum { ZMS_MONITOR, ZMS_EVENT } source = ZMS_MONITOR;
+  enum { ZMS_JPEG, ZMS_MPEG, ZMS_RAW, ZMS_ZIP, ZMS_SINGLE } mode = ZMS_JPEG;
+  char format[32] = "";
+  int monitor_id = 0;
+  time_t event_time = 0;
+  int event_id = 0;
+  unsigned int frame_id = 1;
+  unsigned int scale = 100;
+  unsigned int rate = 100;
+  double maxfps = 10.0;
+  unsigned int bitrate = 100000;
+  unsigned int ttl = 0;
+  EventStream::StreamMode replay = EventStream::MODE_SINGLE;
+  char username[64] = "";
+  char password[64] = "";
+  char auth[64] = "";
+  unsigned int connkey = 0;
+  unsigned int playback_buffer = 0;
 
-	bool nph = false;
-	const char *basename = strrchr( argv[0], '/' );
-	if (basename) //if we found a / lets skip past it
-		basename++;
-	else //argv[0] will not always contain the full path, but rather just the script name
-		basename = argv[0];
-	const char *nph_prefix = "nph-";
-	if ( basename && !strncmp( basename, nph_prefix, strlen(nph_prefix) ) )
-	{
-		nph = true;
-	}
-	
-	zmLoadConfig();
+  bool nph = false;
+  const char *basename = strrchr( argv[0], '/' );
+  if (basename) //if we found a / lets skip past it
+    basename++;
+  else //argv[0] will not always contain the full path, but rather just the script name
+    basename = argv[0];
+  const char *nph_prefix = "nph-";
+  if ( basename && !strncmp( basename, nph_prefix, strlen(nph_prefix) ) )
+  {
+    nph = true;
+  }
+  
+  zmLoadConfig();
 
-	logInit( "zms" );
-	
-	ssedetect();
+  logInit( "zms" );
+  
+  ssedetect();
 
-	zmSetDefaultTermHandler();
-	zmSetDefaultDieHandler();
+  zmSetDefaultTermHandler();
+  zmSetDefaultDieHandler();
 
-	const char *query = getenv( "QUERY_STRING" );
-	if ( query )
-	{
-		Debug( 1, "Query: %s", query );
-	
-		char temp_query[1024];
-		strncpy( temp_query, query, sizeof(temp_query) );
-		char *q_ptr = temp_query;
-		char *parms[16]; // Shouldn't be more than this
-		int parm_no = 0;
-		while( (parm_no < 16) && (parms[parm_no] = strtok( q_ptr, "&" )) )
-		{
-			parm_no++;
-			q_ptr = NULL;
-		}
-	
-		for ( int p = 0; p < parm_no; p++ )
-		{
-			char *name = strtok( parms[p], "=" );
-			char *value = strtok( NULL, "=" );
-            if ( !value )
-                value = (char *)"";
-			if ( !strcmp( name, "source" ) )
-			{
-				source = !strcmp( value, "event" )?ZMS_EVENT:ZMS_MONITOR;
-			}
-			else if ( !strcmp( name, "mode" ) )
-			{
-				mode = !strcmp( value, "jpeg" )?ZMS_JPEG:ZMS_MPEG;
-				mode = !strcmp( value, "raw" )?ZMS_RAW:mode;
-				mode = !strcmp( value, "zip" )?ZMS_ZIP:mode;
-				mode = !strcmp( value, "single" )?ZMS_SINGLE:mode;
-			}
-			else if ( !strcmp( name, "format" ) )
-				strncpy( format, value, sizeof(format) );
-			else if ( !strcmp( name, "monitor" ) )
-				monitor_id = atoi( value );
-			else if ( !strcmp( name, "time" ) )
-				event_time = atoi( value );
-			else if ( !strcmp( name, "event" ) )
-				event_id = strtoull( value, (char **)NULL, 10 );
-			else if ( !strcmp( name, "frame" ) )
-				frame_id = strtoull( value, (char **)NULL, 10 );
-			else if ( !strcmp( name, "scale" ) )
-				scale = atoi( value );
-			else if ( !strcmp( name, "rate" ) )
-				rate = atoi( value );
-			else if ( !strcmp( name, "maxfps" ) )
-				maxfps = atof( value );
-			else if ( !strcmp( name, "bitrate" ) )
-				bitrate = atoi( value );
-			else if ( !strcmp( name, "ttl" ) )
-				ttl = atoi(value);
-			else if ( !strcmp( name, "replay" ) )
-			{
-				replay = !strcmp( value, "gapless" )?EventStream::MODE_ALL_GAPLESS:EventStream::MODE_SINGLE;
-				replay = !strcmp( value, "all" )?EventStream::MODE_ALL:replay;
-			}
-			else if ( !strcmp( name, "connkey" ) )
-				connkey = atoi(value);
-			else if ( !strcmp( name, "buffer" ) )
-				playback_buffer = atoi(value);
-			else if ( config.opt_use_auth )
-			{
-				if ( strcmp( config.auth_relay, "none" ) == 0 )
-				{
-					if ( !strcmp( name, "user" ) )
-					{
-						strncpy( username, value, sizeof(username) );
-					}
-				}
-				else
-				{
-					//if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-					{
-						if ( !strcmp( name, "auth" ) )
-						{
-							strncpy( auth, value, sizeof(auth) );
-						}
-					}
-					//else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-					{
-						if ( !strcmp( name, "user" ) )
-						{
-							strncpy( username, value, sizeof(username) );
-						}
-						if ( !strcmp( name, "pass" ) )
-						{
-							strncpy( password, value, sizeof(password) );
-						}
-					}
-				}
-			}
-		}
-	}
-
-	if ( config.opt_use_auth )
-	{
-		User *user = 0;
-
-		if ( strcmp( config.auth_relay, "none" ) == 0 )
-		{
-			if ( *username )
-			{
-				user = zmLoadUser( username );
-			}
-		}
-		else
-		{
-			//if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-			{
-				if ( *auth )
-				{
-					user = zmLoadAuthUser( auth, config.auth_hash_ips );
-				}
-			}
-			//else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-			{
-				if ( *username && *password )
-				{
-					user = zmLoadUser( username, password );
-				}
-			}
-		}
-		if ( !user )
-		{
-			Error( "Unable to authenticate user" );
-			logTerm();
-			zmDbClose();
-			return( -1 );
-		}
-		ValidateAccess( user, monitor_id );
-	}
-
-	setbuf( stdout, 0 );
-	if ( nph )
-	{
-		fprintf( stdout, "HTTP/1.0 200 OK\r\n" );
-	}
-	fprintf( stdout, "Server: ZoneMinder Video Server/%s\r\n", ZM_VERSION );
-		        
-	time_t now = time( 0 );
-	char date_string[64];
-	strftime( date_string, sizeof(date_string)-1, "%a, %d %b %Y %H:%M:%S GMT", gmtime( &now ) );
-
-	fprintf( stdout, "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n" );
-	fprintf( stdout, "Last-Modified: %s\r\n", date_string );
-	fprintf( stdout, "Cache-Control: no-store, no-cache, must-revalidate\r\n" );
-	fprintf( stdout, "Cache-Control: post-check=0, pre-check=0\r\n" );
-	fprintf( stdout, "Pragma: no-cache\r\n");
-	// Removed as causing more problems than it fixed.
-	//if ( !nph )
-	//{
-		//fprintf( stdout, "Content-Length: 0\r\n");
-	//}
-
-	if ( source == ZMS_MONITOR )
-	{
-        MonitorStream stream;
-        stream.setStreamScale( scale );
-        stream.setStreamReplayRate( rate );
-        stream.setStreamMaxFPS( maxfps );
-        stream.setStreamTTL( ttl );
-        stream.setStreamQueue( connkey );
-        stream.setStreamBuffer( playback_buffer );
-        if ( ! stream.setStreamStart( monitor_id ) ) {
-            Error( "Unable to connect to zmc process for monitor %d", monitor_id );
-            fprintf( stderr, "Unable to connect to zmc process.  Please ensure that it is running." );
-            logTerm();
-            zmDbClose();
-            return( -1 );
-		} 
-
-        if ( mode == ZMS_JPEG )
-        {
-            stream.setStreamType( MonitorStream::STREAM_JPEG );
-		}
-		else if ( mode == ZMS_RAW )
-		{
-            stream.setStreamType( MonitorStream::STREAM_RAW );
-		}
-		else if ( mode == ZMS_ZIP )
-		{
-            stream.setStreamType( MonitorStream::STREAM_ZIP );
-		}
-		else if ( mode == ZMS_SINGLE )
-		{
-            stream.setStreamType( MonitorStream::STREAM_SINGLE );
-        }
-        else
-        {
-#if HAVE_LIBAVCODEC
-            stream.setStreamFormat( format );
-            stream.setStreamBitrate( bitrate );
-            stream.setStreamType( MonitorStream::STREAM_MPEG );
-#else // HAVE_LIBAVCODEC
-            Error( "MPEG streaming of '%s' attempted while disabled", query );
-            fprintf( stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n" );
-            logTerm();
-            zmDbClose();
-            return( -1 );
-#endif // HAVE_LIBAVCODEC
-        }
-        stream.runStream();
-	}
-    else if ( source == ZMS_EVENT )
+  const char *query = getenv( "QUERY_STRING" );
+  if ( query )
+  {
+    Debug( 1, "Query: %s", query );
+  
+    char temp_query[1024];
+    strncpy( temp_query, query, sizeof(temp_query) );
+    char *q_ptr = temp_query;
+    char *parms[16]; // Shouldn't be more than this
+    int parm_no = 0;
+    while( (parm_no < 16) && (parms[parm_no] = strtok( q_ptr, "&" )) )
     {
-        EventStream stream;
-        stream.setStreamScale( scale );
-        stream.setStreamReplayRate( rate );
-        stream.setStreamMaxFPS( maxfps );
-        stream.setStreamMode( replay );
-        stream.setStreamQueue( connkey );
-        if ( monitor_id && event_time )
-        {
-            stream.setStreamStart( monitor_id, event_time );
-        }
-        else
-        {
-            stream.setStreamStart( event_id, frame_id );
-        }
-        if ( mode == ZMS_JPEG )
-        {
-            stream.setStreamType( EventStream::STREAM_JPEG );
-        }
-        else
-        {
-#if HAVE_LIBAVCODEC
-            stream.setStreamFormat( format );
-            stream.setStreamBitrate( bitrate );
-            stream.setStreamType( EventStream::STREAM_MPEG );
-#else // HAVE_LIBAVCODEC
-            Error( "MPEG streaming of '%s' attempted while disabled", query );
-            fprintf( stderr, "MPEG streaming is disabled.\nYou should ensure the ffmpeg libraries are installed and detected and rebuild to use this functionality.\n" );
-            logTerm();
-            zmDbClose();
-            return( -1 );
-#endif // HAVE_LIBAVCODEC
-        }
-        stream.runStream();
+      parm_no++;
+      q_ptr = NULL;
     }
+  
+    for ( int p = 0; p < parm_no; p++ )
+    {
+      char *name = strtok( parms[p], "=" );
+      char *value = strtok( NULL, "=" );
+      if ( !value )
+        value = (char *)"";
+      if ( !strcmp( name, "source" ) )
+      {
+        source = !strcmp( value, "event" )?ZMS_EVENT:ZMS_MONITOR;
+      }
+      else if ( !strcmp( name, "mode" ) )
+      {
+        mode = !strcmp( value, "jpeg" )?ZMS_JPEG:ZMS_MPEG;
+        mode = !strcmp( value, "raw" )?ZMS_RAW:mode;
+        mode = !strcmp( value, "zip" )?ZMS_ZIP:mode;
+        mode = !strcmp( value, "single" )?ZMS_SINGLE:mode;
+      }
+      else if ( !strcmp( name, "format" ) )
+        strncpy( format, value, sizeof(format) );
+      else if ( !strcmp( name, "monitor" ) )
+        monitor_id = atoi( value );
+      else if ( !strcmp( name, "time" ) )
+        event_time = atoi( value );
+      else if ( !strcmp( name, "event" ) )
+        event_id = strtoull( value, (char **)NULL, 10 );
+      else if ( !strcmp( name, "frame" ) )
+        frame_id = strtoull( value, (char **)NULL, 10 );
+      else if ( !strcmp( name, "scale" ) )
+        scale = atoi( value );
+      else if ( !strcmp( name, "rate" ) )
+        rate = atoi( value );
+      else if ( !strcmp( name, "maxfps" ) )
+        maxfps = atof( value );
+      else if ( !strcmp( name, "bitrate" ) )
+        bitrate = atoi( value );
+      else if ( !strcmp( name, "ttl" ) )
+        ttl = atoi(value);
+      else if ( !strcmp( name, "replay" ) )
+      {
+        replay = !strcmp( value, "gapless" )?EventStream::MODE_ALL_GAPLESS:EventStream::MODE_SINGLE;
+        replay = !strcmp( value, "all" )?EventStream::MODE_ALL:replay;
+      }
+      else if ( !strcmp( name, "connkey" ) )
+        connkey = atoi(value);
+      else if ( !strcmp( name, "buffer" ) )
+        playback_buffer = atoi(value);
+      else if ( config.opt_use_auth )
+      {
+        if ( strcmp( config.auth_relay, "none" ) == 0 )
+        {
+          if ( !strcmp( name, "user" ) )
+          {
+            strncpy( username, value, sizeof(username) );
+          }
+        }
+        else
+        {
+          //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
+          {
+            if ( !strcmp( name, "auth" ) )
+            {
+              strncpy( auth, value, sizeof(auth) );
+            }
+          }
+          //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
+          {
+            if ( !strcmp( name, "user" ) )
+            {
+              strncpy( username, value, sizeof(username) );
+            }
+            if ( !strcmp( name, "pass" ) )
+            {
+              strncpy( password, value, sizeof(password) );
+            }
+          }
+        }
+      }
+    }
+  }
 
-    logTerm();
-    zmDbClose();
+  if ( config.opt_use_auth )
+  {
+    User *user = 0;
 
-	return( 0 );
+    if ( strcmp( config.auth_relay, "none" ) == 0 )
+    {
+      if ( *username )
+      {
+        user = zmLoadUser( username );
+      }
+    }
+    else
+    {
+      //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
+      {
+        if ( *auth )
+        {
+          user = zmLoadAuthUser( auth, config.auth_hash_ips );
+        }
+      }
+      //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
+      {
+        if ( *username && *password )
+        {
+          user = zmLoadUser( username, password );
+        }
+      }
+    }
+    if ( !user )
+    {
+      Error( "Unable to authenticate user" );
+      logTerm();
+      zmDbClose();
+      return( -1 );
+    }
+    ValidateAccess( user, monitor_id );
+  }
+
+  setbuf( stdout, 0 );
+  if ( nph )
+  {
+    fprintf( stdout, "HTTP/1.0 200 OK\r\n" );
+  }
+  fprintf( stdout, "Server: ZoneMinder Video Server/%s\r\n", ZM_VERSION );
+        
+  time_t now = time( 0 );
+  char date_string[64];
+  strftime( date_string, sizeof(date_string)-1, "%a, %d %b %Y %H:%M:%S GMT", gmtime( &now ) );
+
+  fprintf( stdout, "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n" );
+  fprintf( stdout, "Last-Modified: %s\r\n", date_string );
+  fprintf( stdout, "Cache-Control: no-store, no-cache, must-revalidate\r\n" );
+  fprintf( stdout, "Cache-Control: post-check=0, pre-check=0\r\n" );
+  fprintf( stdout, "Pragma: no-cache\r\n");
+  // Removed as causing more problems than it fixed.
+  //if ( !nph )
+  //{
+    //fprintf( stdout, "Content-Length: 0\r\n");
+  //}
+
+  if ( source == ZMS_MONITOR )
+  {
+    MonitorStream stream;
+    stream.setStreamScale( scale );
+    stream.setStreamReplayRate( rate );
+    stream.setStreamMaxFPS( maxfps );
+    stream.setStreamTTL( ttl );
+    stream.setStreamQueue( connkey );
+    stream.setStreamBuffer( playback_buffer );
+    if ( ! stream.setStreamStart( monitor_id ) ) {
+      Error( "Unable to connect to zmc process for monitor %d", monitor_id );
+      fprintf( stderr, "Unable to connect to zmc process.  Please ensure that it is running." );
+      logTerm();
+      zmDbClose();
+      return( -1 );
+    } 
+
+    if ( mode == ZMS_JPEG )
+    {
+      stream.setStreamType( MonitorStream::STREAM_JPEG );
+    }
+    else if ( mode == ZMS_RAW )
+    {
+      stream.setStreamType( MonitorStream::STREAM_RAW );
+    }
+    else if ( mode == ZMS_ZIP )
+    {
+      stream.setStreamType( MonitorStream::STREAM_ZIP );
+    }
+    else if ( mode == ZMS_SINGLE )
+    {
+      stream.setStreamType( MonitorStream::STREAM_SINGLE );
+    }
+    else
+    {
+#if HAVE_LIBAVCODEC
+      stream.setStreamFormat( format );
+      stream.setStreamBitrate( bitrate );
+      stream.setStreamType( MonitorStream::STREAM_MPEG );
+#else // HAVE_LIBAVCODEC
+      Error( "MPEG streaming of '%s' attempted while disabled", query );
+      fprintf( stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n" );
+      logTerm();
+      zmDbClose();
+      return( -1 );
+#endif // HAVE_LIBAVCODEC
+    }
+    stream.runStream();
+  }
+  else if ( source == ZMS_EVENT )
+  {
+    EventStream stream;
+    stream.setStreamScale( scale );
+    stream.setStreamReplayRate( rate );
+    stream.setStreamMaxFPS( maxfps );
+    stream.setStreamMode( replay );
+    stream.setStreamQueue( connkey );
+    if ( monitor_id && event_time )
+    {
+      stream.setStreamStart( monitor_id, event_time );
+    }
+    else
+    {
+      stream.setStreamStart( event_id, frame_id );
+    }
+    if ( mode == ZMS_JPEG )
+    {
+      stream.setStreamType( EventStream::STREAM_JPEG );
+    }
+    else
+    {
+#if HAVE_LIBAVCODEC
+      stream.setStreamFormat( format );
+      stream.setStreamBitrate( bitrate );
+      stream.setStreamType( EventStream::STREAM_MPEG );
+#else // HAVE_LIBAVCODEC
+      Error( "MPEG streaming of '%s' attempted while disabled", query );
+      fprintf( stderr, "MPEG streaming is disabled.\nYou should ensure the ffmpeg libraries are installed and detected and rebuild to use this functionality.\n" );
+      logTerm();
+      zmDbClose();
+      return( -1 );
+#endif // HAVE_LIBAVCODEC
+    }
+    stream.runStream();
+  }
+
+  logTerm();
+  zmDbClose();
+
+  return( 0 );
 }
diff --git a/src/zmstreamer.cpp b/src/zmstreamer.cpp
index a16e50704..b33c61246 100644
--- a/src/zmstreamer.cpp
+++ b/src/zmstreamer.cpp
@@ -50,16 +50,16 @@ running the eyeZm app.
 
 =head1 OPTIONS
 
- -e <mode>                        - Specify output mode: mpeg/jpg/zip/single/raw.
- -o <format>                      - Specify output format.
- -u <buffer size>                 - Specify buffer size in ms.
- -f <maximum fps>                 - Specify maximum framerate.
- -s <scale>                       - Specify scale.
- -b <bitrate in bps>              - Specify bitrate.
- -m <monitor id>                  - Specify monitor id.
- -d <debug mode>                  - 0 = off, 1 = no streaming, 2 = with streaming.
- -i, -?, -h                       - Display usage information
- -v                               - Print the installed version of ZoneMinder
+ -e <mode>            - Specify output mode: mpeg/jpg/zip/single/raw.
+ -o <format>            - Specify output format.
+ -u <buffer size>         - Specify buffer size in ms.
+ -f <maximum fps>         - Specify maximum framerate.
+ -s <scale>             - Specify scale.
+ -b <bitrate in bps>        - Specify bitrate.
+ -m <monitor id>          - Specify monitor id.
+ -d <debug mode>          - 0 = off, 1 = no streaming, 2 = with streaming.
+ -i, -?, -h             - Display usage information
+ -v                 - Print the installed version of ZoneMinder
 
 =cut
 
@@ -92,161 +92,161 @@ running the eyeZm app.
 #define ZMS_DEFAULT_BUFFER 1000
 
 int main(int argc, char** argv) {
-    self = argv[0];
-    // Set initial values to the default values
-    int debug = ZMS_DEFAULT_DEBUG;
-    int id = ZMS_DEFAULT_ID;
-    int bitrate = ZMS_DEFAULT_BITRATE;
-    int scale = ZMS_DEFAULT_SCALE;
-    char mode[32];
-    sprintf(mode, "%s", ZMS_DEFAULT_MODE);
-    char format[32];
-    sprintf(format, "%s", ZMS_DEFAULT_FORMAT);
-    double maxfps = ZMS_DEFAULT_FPS;
-    int buffer = ZMS_DEFAULT_BUFFER;
+  self = argv[0];
+  // Set initial values to the default values
+  int debug = ZMS_DEFAULT_DEBUG;
+  int id = ZMS_DEFAULT_ID;
+  int bitrate = ZMS_DEFAULT_BITRATE;
+  int scale = ZMS_DEFAULT_SCALE;
+  char mode[32];
+  sprintf(mode, "%s", ZMS_DEFAULT_MODE);
+  char format[32];
+  sprintf(format, "%s", ZMS_DEFAULT_FORMAT);
+  double maxfps = ZMS_DEFAULT_FPS;
+  int buffer = ZMS_DEFAULT_BUFFER;
 
-    // Parse command-line options
-    int arg;
-    while ((arg = getopt(argc, argv, OPTIONS)) != -1) {
-        switch (arg) {
-            case 'e':
-                sprintf(mode, "%s", optarg);
-                break;
-            case 'o':
-                sprintf(format, "%s", optarg);
-                break;
-            case 'u':
-                buffer = atoi(optarg);
-                break;
-            case 'f':
-                maxfps = atof(optarg);
-                break;
-            case 's':
-                scale = atoi(optarg);
-                break;
-            case 'b':
-                bitrate = atoi(optarg);
-                break;
-            case 'm':
-                id = atoi(optarg);
-                break;
-            case 'd':
-                debug = atoi(optarg);
-                break;
-            case 'h':
-            case 'i':
-            case '?':
-                printf("-e <mode> : Specify output mode: mpeg/jpg/zip/single/raw. Default = %s\n", ZMS_DEFAULT_MODE);
-                printf("-o <format> : Specify output format. Default = %s\n", ZMS_DEFAULT_FORMAT);
-                printf("-u <buffer size> : Specify buffer size in ms. Default = %d\n", ZMS_DEFAULT_BUFFER);
-                printf("-f <maximum fps> : Specify maximum framerate. Default = %lf\n", ZMS_DEFAULT_FPS);
-                printf("-s <scale> : Specify scale. Default = %d\n", ZMS_DEFAULT_SCALE);
-                printf("-b <bitrate in bps> : Specify bitrate. Default = %d\n", ZMS_DEFAULT_BITRATE);
-                printf("-m <monitor id> : Specify monitor id. Default = %d\n", ZMS_DEFAULT_ID);
-                printf("-d <debug mode> : 0 = off, 1 = no streaming, 2 = with streaming. Default = 0\n");
-                printf("-i or -? or -h: This information\n");
-                printf("-v : This installed version of ZoneMinder\n");
-                return EXIT_SUCCESS;
-            case 'v':
-                std::cout << ZM_VERSION << "\n";
-                exit(0);
-        }
+  // Parse command-line options
+  int arg;
+  while ((arg = getopt(argc, argv, OPTIONS)) != -1) {
+    switch (arg) {
+      case 'e':
+        sprintf(mode, "%s", optarg);
+        break;
+      case 'o':
+        sprintf(format, "%s", optarg);
+        break;
+      case 'u':
+        buffer = atoi(optarg);
+        break;
+      case 'f':
+        maxfps = atof(optarg);
+        break;
+      case 's':
+        scale = atoi(optarg);
+        break;
+      case 'b':
+        bitrate = atoi(optarg);
+        break;
+      case 'm':
+        id = atoi(optarg);
+        break;
+      case 'd':
+        debug = atoi(optarg);
+        break;
+      case 'h':
+      case 'i':
+      case '?':
+        printf("-e <mode> : Specify output mode: mpeg/jpg/zip/single/raw. Default = %s\n", ZMS_DEFAULT_MODE);
+        printf("-o <format> : Specify output format. Default = %s\n", ZMS_DEFAULT_FORMAT);
+        printf("-u <buffer size> : Specify buffer size in ms. Default = %d\n", ZMS_DEFAULT_BUFFER);
+        printf("-f <maximum fps> : Specify maximum framerate. Default = %lf\n", ZMS_DEFAULT_FPS);
+        printf("-s <scale> : Specify scale. Default = %d\n", ZMS_DEFAULT_SCALE);
+        printf("-b <bitrate in bps> : Specify bitrate. Default = %d\n", ZMS_DEFAULT_BITRATE);
+        printf("-m <monitor id> : Specify monitor id. Default = %d\n", ZMS_DEFAULT_ID);
+        printf("-d <debug mode> : 0 = off, 1 = no streaming, 2 = with streaming. Default = 0\n");
+        printf("-i or -? or -h: This information\n");
+        printf("-v : This installed version of ZoneMinder\n");
+        return EXIT_SUCCESS;
+      case 'v':
+        std::cout << ZM_VERSION << "\n";
+        exit(0);
     }
+  }
 
-    // Set stream type
-    StreamBase::StreamType streamtype;
-    if (!strcasecmp("raw", mode))
-        streamtype = MonitorStream::STREAM_RAW;
-    else if (!strcasecmp("mpeg", mode))
-        streamtype = MonitorStream::STREAM_MPEG;
-    else if (!strcasecmp("jpg", mode))
-        streamtype = MonitorStream::STREAM_JPEG;
-    else if (!strcasecmp("single", mode))
-        streamtype = MonitorStream::STREAM_SINGLE;
-    else if (!strcasecmp("zip", mode))
-        streamtype = MonitorStream::STREAM_ZIP;
-    else
-        streamtype = MonitorStream::STREAM_MPEG;
+  // Set stream type
+  StreamBase::StreamType streamtype;
+  if (!strcasecmp("raw", mode))
+    streamtype = MonitorStream::STREAM_RAW;
+  else if (!strcasecmp("mpeg", mode))
+    streamtype = MonitorStream::STREAM_MPEG;
+  else if (!strcasecmp("jpg", mode))
+    streamtype = MonitorStream::STREAM_JPEG;
+  else if (!strcasecmp("single", mode))
+    streamtype = MonitorStream::STREAM_SINGLE;
+  else if (!strcasecmp("zip", mode))
+    streamtype = MonitorStream::STREAM_ZIP;
+  else
+    streamtype = MonitorStream::STREAM_MPEG;
 
-    if (debug) {
-        // Show stream parameters
-        printf("Stream parameters:\n");
-        switch (streamtype) {
-            case MonitorStream::STREAM_MPEG:
-                printf("Output mode (-e) = %s\n", "mpeg");
-                printf("Output format (-o) = %s\n", format);
-                break;
-            default:
-                printf("Output mode (-e) = %s\n", mode);
-        }
-        printf("Buffer size (-u) = %d ms\n", buffer);
-        printf("Maximum FPS (-f) = %lf FPS\n", maxfps);
-        printf("Scale (-s) = %d%%\n", scale);
-        printf("Bitrate (-b) = %d bps\n", bitrate);
-        printf("Monitor Id (-m) = %d\n", id);
+  if (debug) {
+    // Show stream parameters
+    printf("Stream parameters:\n");
+    switch (streamtype) {
+      case MonitorStream::STREAM_MPEG:
+        printf("Output mode (-e) = %s\n", "mpeg");
+        printf("Output format (-o) = %s\n", format);
+        break;
+      default:
+        printf("Output mode (-e) = %s\n", mode);
     }
+    printf("Buffer size (-u) = %d ms\n", buffer);
+    printf("Maximum FPS (-f) = %lf FPS\n", maxfps);
+    printf("Scale (-s) = %d%%\n", scale);
+    printf("Bitrate (-b) = %d bps\n", bitrate);
+    printf("Monitor Id (-m) = %d\n", id);
+  }
 
-    if (debug) {
-        // Set ZM debugger to print to stdout
-        printf("Setting up ZoneMinder debugger to print to stdout...");
-        setenv("ZM_DBG_PRINT", "1", 1);
-        printf("Done.\n");
-    }
-
-    // Loading ZM configurations
-    printf("Loading ZoneMinder configurations...");
-    zmLoadConfig();
+  if (debug) {
+    // Set ZM debugger to print to stdout
+    printf("Setting up ZoneMinder debugger to print to stdout...");
+    setenv("ZM_DBG_PRINT", "1", 1);
     printf("Done.\n");
+  }
 
-    logInit("zmstreamer");
-    
-    ssedetect();
+  // Loading ZM configurations
+  printf("Loading ZoneMinder configurations...");
+  zmLoadConfig();
+  printf("Done.\n");
 
-    // Setting stream parameters
-    MonitorStream stream;
-    stream.setStreamScale(scale); // default = 100 (scale)
-    stream.setStreamReplayRate(100); // default = 100 (rate)
-    stream.setStreamMaxFPS(maxfps); // default = 10 (maxfps)
-    if (debug) stream.setStreamTTL(1);
-    else stream.setStreamTTL(0); // default = 0 (ttl)
-    stream.setStreamQueue(0); // default = 0 (connkey)
-    stream.setStreamBuffer(buffer); // default = 0 (buffer)
-    stream.setStreamStart(id); // default = 0 (monitor_id)
-    stream.setStreamType(streamtype);
-    if (streamtype == MonitorStream::STREAM_MPEG) {
+  logInit("zmstreamer");
+  
+  ssedetect();
+
+  // Setting stream parameters
+  MonitorStream stream;
+  stream.setStreamScale(scale); // default = 100 (scale)
+  stream.setStreamReplayRate(100); // default = 100 (rate)
+  stream.setStreamMaxFPS(maxfps); // default = 10 (maxfps)
+  if (debug) stream.setStreamTTL(1);
+  else stream.setStreamTTL(0); // default = 0 (ttl)
+  stream.setStreamQueue(0); // default = 0 (connkey)
+  stream.setStreamBuffer(buffer); // default = 0 (buffer)
+  stream.setStreamStart(id); // default = 0 (monitor_id)
+  stream.setStreamType(streamtype);
+  if (streamtype == MonitorStream::STREAM_MPEG) {
 #if HAVE_LIBAVCODEC
-        if (debug) printf("HAVE_LIBAVCODEC is set\n");
-        stream.setStreamFormat(format); // default = "" (format)
-        stream.setStreamBitrate(bitrate); // default = 100000 (bitrate)
+    if (debug) printf("HAVE_LIBAVCODEC is set\n");
+    stream.setStreamFormat(format); // default = "" (format)
+    stream.setStreamBitrate(bitrate); // default = 100000 (bitrate)
 #else
-        fprintf(stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n");
-        logTerm();
-        zmDbClose();
-        return EXIT_FAILURE;
-#endif
-    }
-
-    if (debug != 1) {
-        if (debug) printf("Running stream...");
-
-        // Output headers
-        fprintf(stdout, "Server: ZoneMinder Video Server/%s\r\n", ZM_VERSION);
-        time_t now = time(0);
-        char date_string[64];
-        strftime(date_string, sizeof (date_string) - 1, "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
-        fprintf(stdout, "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n");
-        fprintf(stdout, "Last-Modified: %s\r\n", date_string);
-        fprintf(stdout, "Cache-Control: no-store, no-cache, must-revalidate\r\n");
-        fprintf(stdout, "Cache-Control: post-check=0, pre-check=0\r\n");
-        fprintf(stdout, "Pragma: no-cache\r\n");
-
-        // Run stream
-        stream.runStream();
-    }
-    if (debug) printf("Done.\n");
-
+    fprintf(stderr, "MPEG streaming is disabled.\nYou should configure with the --with-ffmpeg option and rebuild to use this functionality.\n");
     logTerm();
     zmDbClose();
+    return EXIT_FAILURE;
+#endif
+  }
 
-    return (EXIT_SUCCESS);
+  if (debug != 1) {
+    if (debug) printf("Running stream...");
+
+    // Output headers
+    fprintf(stdout, "Server: ZoneMinder Video Server/%s\r\n", ZM_VERSION);
+    time_t now = time(0);
+    char date_string[64];
+    strftime(date_string, sizeof (date_string) - 1, "%a, %d %b %Y %H:%M:%S GMT", gmtime(&now));
+    fprintf(stdout, "Expires: Mon, 26 Jul 1997 05:00:00 GMT\r\n");
+    fprintf(stdout, "Last-Modified: %s\r\n", date_string);
+    fprintf(stdout, "Cache-Control: no-store, no-cache, must-revalidate\r\n");
+    fprintf(stdout, "Cache-Control: post-check=0, pre-check=0\r\n");
+    fprintf(stdout, "Pragma: no-cache\r\n");
+
+    // Run stream
+    stream.runStream();
+  }
+  if (debug) printf("Done.\n");
+
+  logTerm();
+  zmDbClose();
+
+  return (EXIT_SUCCESS);
 }
diff --git a/src/zmu.cpp b/src/zmu.cpp
index a1e8887bd..0c5a5a41e 100644
--- a/src/zmu.cpp
+++ b/src/zmu.cpp
@@ -41,46 +41,46 @@ problems.
 =head1 OPTIONS
 
 General options:
-  -v, --verbose                           - Produce more verbose output
-  -l, --list                              - List the current status of active (or all with -v) monitors
-  -h, --help                               - Display usage information
-  -v, --version                            - Print the installed version of ZoneMinder
+  -v, --verbose               - Produce more verbose output
+  -l, --list                - List the current status of active (or all with -v) monitors
+  -h, --help                 - Display usage information
+  -v, --version              - Print the installed version of ZoneMinder
 
 Options for use with devices:
-  -d, --device [device_path]              - Get the current video device settings for [device_path] or all devices
-  -V, --version <V4L version>             - Set the Video 4 Linux API version to use for the query, use 1 or 2
-  -q, --query                             - Query the current settings for the device
+  -d, --device [device_path]        - Get the current video device settings for [device_path] or all devices
+  -V, --version <V4L version>       - Set the Video 4 Linux API version to use for the query, use 1 or 2
+  -q, --query               - Query the current settings for the device
 
 Options for use with monitors:
-  -m, --monitor <monitor_id>              - Specify which monitor to address, default 1 if absent
-  -q, --query                             - Query the current settings for the monitor
-  -s, --state                             - Output the current monitor state, 0 = idle, 1 = prealarm, 2 = alarm,
-                                            3 = alert, 4 = tape
-  -B, --brightness [value]                - Output the current brightness, set to value if given 
-  -C, --contrast [value]                  - Output the current contrast, set to value if given 
-  -H, --hue [value]                       - Output the current hue, set to value if given 
-  -O, --colour [value]                    - Output the current colour, set to value if given 
-  -i, --image [image_index]               - Write captured image to disk as <monitor_name>.jpg, last image captured
-                                            or specified ring buffer index if given.
-  -S, --scale <scale_%%ge>                - With --image specify any scaling (in %%) to be applied to the image
-  -t, --timestamp [image_index]           - Output captured image timestamp, last image captured or specified
-                                            ring buffer index if given
-  -R, --read_index                        - Output ring buffer read index
-  -W, --write_index                       - Output ring buffer write index
-  -e, --event                             - Output last event index
-  -f, --fps                               - Output last Frames Per Second captured reading
-  -z, --zones                             - Write last captured image overlaid with zones to <monitor_name>-Zones.jpg
-  -a, --alarm                             - Force alarm in monitor, this will trigger recording until cancelled with -c
-  -n, --noalarm                           - Force no alarms in monitor, this will prevent alarms until cancelled with -c
-  -c, --cancel                            - Cancel a forced alarm/noalarm in monitor, required after being enabled with -a or -n
-  -L, --reload                            - Signal monitor to reload settings
-  -E, --enable                            - Enable detection, wake monitor up
-  -D, --disable                           - Disable detection, put monitor to sleep
-  -u, --suspend                           - Suspend detection, useful to prevent bogus alarms when panning etc
-  -r, --resume                            - Resume detection after a suspend
-  -U, --username <username>               - When running in authenticated mode the username and
-  -P, --password <password>               - password combination of the given user
-  -A, --auth <authentication>             - Pass authentication hash string instead of user details
+  -m, --monitor <monitor_id>        - Specify which monitor to address, default 1 if absent
+  -q, --query               - Query the current settings for the monitor
+  -s, --state               - Output the current monitor state, 0 = idle, 1 = prealarm, 2 = alarm,
+                      3 = alert, 4 = tape
+  -B, --brightness [value]        - Output the current brightness, set to value if given 
+  -C, --contrast [value]          - Output the current contrast, set to value if given 
+  -H, --hue [value]             - Output the current hue, set to value if given 
+  -O, --colour [value]          - Output the current colour, set to value if given 
+  -i, --image [image_index]         - Write captured image to disk as <monitor_name>.jpg, last image captured
+                      or specified ring buffer index if given.
+  -S, --scale <scale_%%ge>        - With --image specify any scaling (in %%) to be applied to the image
+  -t, --timestamp [image_index]       - Output captured image timestamp, last image captured or specified
+                      ring buffer index if given
+  -R, --read_index            - Output ring buffer read index
+  -W, --write_index             - Output ring buffer write index
+  -e, --event               - Output last event index
+  -f, --fps                 - Output last Frames Per Second captured reading
+  -z, --zones               - Write last captured image overlaid with zones to <monitor_name>-Zones.jpg
+  -a, --alarm               - Force alarm in monitor, this will trigger recording until cancelled with -c
+  -n, --noalarm               - Force no alarms in monitor, this will prevent alarms until cancelled with -c
+  -c, --cancel              - Cancel a forced alarm/noalarm in monitor, required after being enabled with -a or -n
+  -L, --reload              - Signal monitor to reload settings
+  -E, --enable              - Enable detection, wake monitor up
+  -D, --disable               - Disable detection, put monitor to sleep
+  -u, --suspend               - Suspend detection, useful to prevent bogus alarms when panning etc
+  -r, --resume              - Resume detection after a suspend
+  -U, --username <username>         - When running in authenticated mode the username and
+  -P, --password <password>         - password combination of the given user
+  -A, --auth <authentication>       - Pass authentication hash string instead of user details
 
 =cut
 
@@ -97,740 +97,739 @@ Options for use with monitors:
 
 void Usage( int status=-1 )
 {
-	fprintf( stderr, "zmu <-d device_path> [-v] [function] [-U<username> -P<password>]\n" );
-	fprintf( stderr, "zmu <-m monitor_id> [-v] [function] [-U<username> -P<password>]\n" );
-	fprintf( stderr, "General options:\n" );
-	fprintf( stderr, "  -h, --help                     : This screen\n" );
-	fprintf( stderr, "  -v, --verbose                  : Produce more verbose output\n" );
-	fprintf( stderr, "  -l, --list                     : List the current status of active (or all with -v) monitors\n" );
-	fprintf( stderr, "Options for use with devices:\n" );
-	fprintf( stderr, "  -d, --device [device_path]     : Get the current video device settings for [device_path] or all devices\n" );
-	fprintf( stderr, "  -V, --version <V4L version>    : Set the Video 4 Linux API version to use for the query, use 1 or 2\n" );
-	fprintf( stderr, "  -q, --query                    : Query the current settings for the device\n" );
-	fprintf( stderr, "Options for use with monitors:\n" );
-	fprintf( stderr, "  -m, --monitor <monitor_id>     : Specify which monitor to address, default 1 if absent\n" );
-	fprintf( stderr, "  -q, --query                    : Query the current settings for the monitor\n" );
-	fprintf( stderr, "  -s, --state                    : Output the current monitor state, 0 = idle, 1 = prealarm, 2 = alarm,\n" );
-	fprintf( stderr, "                                   3 = alert, 4 = tape\n" );
-	fprintf( stderr, "  -B, --brightness [value]       : Output the current brightness, set to value if given \n" );
-	fprintf( stderr, "  -C, --contrast [value]         : Output the current contrast, set to value if given \n" );
-	fprintf( stderr, "  -H, --hue [value]              : Output the current hue, set to value if given \n" );
-	fprintf( stderr, "  -O, --colour [value]           : Output the current colour, set to value if given \n" );
-	fprintf( stderr, "  -i, --image [image_index]      : Write captured image to disk as <monitor_name>.jpg, last image captured\n" );
-	fprintf( stderr, "                                   or specified ring buffer index if given.\n" );
-	fprintf( stderr, "  -S, --scale <scale_%%ge>        : With --image specify any scaling (in %%) to be applied to the image\n" );
-	fprintf( stderr, "  -t, --timestamp [image_index]  : Output captured image timestamp, last image captured or specified\n" );
-	fprintf( stderr, "                                   ring buffer index if given\n" );
-	fprintf( stderr, "  -R, --read_index               : Output ring buffer read index\n" );
-	fprintf( stderr, "  -W, --write_index              : Output ring buffer write index\n" );
-	fprintf( stderr, "  -e, --event                    : Output last event index\n" );
-	fprintf( stderr, "  -f, --fps                      : Output last Frames Per Second captured reading\n" );
-	fprintf( stderr, "  -z, --zones                    : Write last captured image overlaid with zones to <monitor_name>-Zones.jpg\n" );
-	fprintf( stderr, "  -a, --alarm                    : Force alarm in monitor, this will trigger recording until cancelled with -c\n" );
-	fprintf( stderr, "  -n, --noalarm                  : Force no alarms in monitor, this will prevent alarms until cancelled with -c\n" );
-	fprintf( stderr, "  -c, --cancel                   : Cancel a forced alarm/noalarm in monitor, required after being enabled with -a or -n\n" );
-	fprintf( stderr, "  -L, --reload                   : Signal monitor to reload settings\n" );
-	fprintf( stderr, "  -E, --enable                   : Enable detection, wake monitor up\n" );
-	fprintf( stderr, "  -D, --disable                  : Disable detection, put monitor to sleep\n" );
-	fprintf( stderr, "  -u, --suspend                  : Suspend detection, useful to prevent bogus alarms when panning etc\n" );
-	fprintf( stderr, "  -r, --resume                   : Resume detection after a suspend\n" );
-	fprintf( stderr, "  -U, --username <username>      : When running in authenticated mode the username and\n" );
-	fprintf( stderr, "  -P, --password <password>      : password combination of the given user\n" );
-	fprintf( stderr, "  -A, --auth <authentication>    : Pass authentication hash string instead of user details\n" );
+  fprintf( stderr, "zmu <-d device_path> [-v] [function] [-U<username> -P<password>]\n" );
+  fprintf( stderr, "zmu <-m monitor_id> [-v] [function] [-U<username> -P<password>]\n" );
+  fprintf( stderr, "General options:\n" );
+  fprintf( stderr, "  -h, --help           : This screen\n" );
+  fprintf( stderr, "  -v, --verbose          : Produce more verbose output\n" );
+  fprintf( stderr, "  -l, --list           : List the current status of active (or all with -v) monitors\n" );
+  fprintf( stderr, "Options for use with devices:\n" );
+  fprintf( stderr, "  -d, --device [device_path]   : Get the current video device settings for [device_path] or all devices\n" );
+  fprintf( stderr, "  -V, --version <V4L version>  : Set the Video 4 Linux API version to use for the query, use 1 or 2\n" );
+  fprintf( stderr, "  -q, --query          : Query the current settings for the device\n" );
+  fprintf( stderr, "Options for use with monitors:\n" );
+  fprintf( stderr, "  -m, --monitor <monitor_id>   : Specify which monitor to address, default 1 if absent\n" );
+  fprintf( stderr, "  -q, --query          : Query the current settings for the monitor\n" );
+  fprintf( stderr, "  -s, --state          : Output the current monitor state, 0 = idle, 1 = prealarm, 2 = alarm,\n" );
+  fprintf( stderr, "                   3 = alert, 4 = tape\n" );
+  fprintf( stderr, "  -B, --brightness [value]     : Output the current brightness, set to value if given \n" );
+  fprintf( stderr, "  -C, --contrast [value]     : Output the current contrast, set to value if given \n" );
+  fprintf( stderr, "  -H, --hue [value]        : Output the current hue, set to value if given \n" );
+  fprintf( stderr, "  -O, --colour [value]       : Output the current colour, set to value if given \n" );
+  fprintf( stderr, "  -i, --image [image_index]    : Write captured image to disk as <monitor_name>.jpg, last image captured\n" );
+  fprintf( stderr, "                   or specified ring buffer index if given.\n" );
+  fprintf( stderr, "  -S, --scale <scale_%%ge>    : With --image specify any scaling (in %%) to be applied to the image\n" );
+  fprintf( stderr, "  -t, --timestamp [image_index]  : Output captured image timestamp, last image captured or specified\n" );
+  fprintf( stderr, "                   ring buffer index if given\n" );
+  fprintf( stderr, "  -R, --read_index         : Output ring buffer read index\n" );
+  fprintf( stderr, "  -W, --write_index        : Output ring buffer write index\n" );
+  fprintf( stderr, "  -e, --event          : Output last event index\n" );
+  fprintf( stderr, "  -f, --fps            : Output last Frames Per Second captured reading\n" );
+  fprintf( stderr, "  -z, --zones          : Write last captured image overlaid with zones to <monitor_name>-Zones.jpg\n" );
+  fprintf( stderr, "  -a, --alarm          : Force alarm in monitor, this will trigger recording until cancelled with -c\n" );
+  fprintf( stderr, "  -n, --noalarm          : Force no alarms in monitor, this will prevent alarms until cancelled with -c\n" );
+  fprintf( stderr, "  -c, --cancel           : Cancel a forced alarm/noalarm in monitor, required after being enabled with -a or -n\n" );
+  fprintf( stderr, "  -L, --reload           : Signal monitor to reload settings\n" );
+  fprintf( stderr, "  -E, --enable           : Enable detection, wake monitor up\n" );
+  fprintf( stderr, "  -D, --disable          : Disable detection, put monitor to sleep\n" );
+  fprintf( stderr, "  -u, --suspend          : Suspend detection, useful to prevent bogus alarms when panning etc\n" );
+  fprintf( stderr, "  -r, --resume           : Resume detection after a suspend\n" );
+  fprintf( stderr, "  -U, --username <username>    : When running in authenticated mode the username and\n" );
+  fprintf( stderr, "  -P, --password <password>    : password combination of the given user\n" );
+  fprintf( stderr, "  -A, --auth <authentication>  : Pass authentication hash string instead of user details\n" );
 
-	exit( status );
+  exit( status );
 }
 
 typedef enum {
-	ZMU_BOGUS      = 0x00000000,
-	ZMU_STATE      = 0x00000001,
-	ZMU_IMAGE      = 0x00000002,
-	ZMU_TIME       = 0x00000004,
-	ZMU_READ_IDX   = 0x00000008,
-	ZMU_WRITE_IDX  = 0x00000010,
-	ZMU_EVENT      = 0x00000020,
-	ZMU_FPS        = 0x00000040,
-	ZMU_ZONES      = 0x00000080,
-	ZMU_ALARM      = 0x00000100,
-	ZMU_NOALARM    = 0x00000200,
-	ZMU_CANCEL     = 0x00000400,
-	ZMU_QUERY      = 0x00000800,
-	ZMU_BRIGHTNESS = 0x00001000,
-	ZMU_CONTRAST   = 0x00002000,
-	ZMU_HUE        = 0x00004000,
-	ZMU_COLOUR     = 0x00008000,
-	ZMU_RELOAD     = 0x00010000,
-	ZMU_ENABLE     = 0x00100000,
-	ZMU_DISABLE    = 0x00200000,
-	ZMU_SUSPEND    = 0x00400000,
-	ZMU_RESUME     = 0x00800000,
-	ZMU_LIST       = 0x10000000,
+  ZMU_BOGUS    = 0x00000000,
+  ZMU_STATE    = 0x00000001,
+  ZMU_IMAGE    = 0x00000002,
+  ZMU_TIME     = 0x00000004,
+  ZMU_READ_IDX   = 0x00000008,
+  ZMU_WRITE_IDX  = 0x00000010,
+  ZMU_EVENT    = 0x00000020,
+  ZMU_FPS    = 0x00000040,
+  ZMU_ZONES    = 0x00000080,
+  ZMU_ALARM    = 0x00000100,
+  ZMU_NOALARM  = 0x00000200,
+  ZMU_CANCEL   = 0x00000400,
+  ZMU_QUERY    = 0x00000800,
+  ZMU_BRIGHTNESS = 0x00001000,
+  ZMU_CONTRAST   = 0x00002000,
+  ZMU_HUE    = 0x00004000,
+  ZMU_COLOUR   = 0x00008000,
+  ZMU_RELOAD   = 0x00010000,
+  ZMU_ENABLE   = 0x00100000,
+  ZMU_DISABLE  = 0x00200000,
+  ZMU_SUSPEND  = 0x00400000,
+  ZMU_RESUME   = 0x00800000,
+  ZMU_LIST     = 0x10000000,
 } Function;
 
 bool ValidateAccess( User *user, int mon_id, int function )
 {
-	bool allowed = true;
-	if ( function & (ZMU_STATE|ZMU_IMAGE|ZMU_TIME|ZMU_READ_IDX|ZMU_WRITE_IDX|ZMU_FPS) )
-	{
-		if ( user->getStream() < User::PERM_VIEW )
-			allowed = false;
-	}
-	if ( function & ZMU_EVENT )
-	{
-		if ( user->getEvents() < User::PERM_VIEW )
-			allowed = false;
-	}
-	if ( function & (ZMU_ZONES|ZMU_QUERY|ZMU_LIST) )
-	{
-		if ( user->getMonitors() < User::PERM_VIEW )
-			allowed = false;
-	}
-	if ( function & (ZMU_ALARM|ZMU_NOALARM|ZMU_CANCEL|ZMU_RELOAD|ZMU_ENABLE|ZMU_DISABLE|ZMU_SUSPEND|ZMU_RESUME|ZMU_BRIGHTNESS|ZMU_CONTRAST|ZMU_HUE|ZMU_COLOUR) )
-	{
-		if ( user->getMonitors() < User::PERM_EDIT )
-			allowed = false;
-	}
-	if ( mon_id > 0 )
-	{
-		if ( !user->canAccess( mon_id ) )
-		{
-			allowed = false;
-		}
-	}
-	if ( !allowed )
-	{
-		fprintf( stderr, "Error, insufficient privileges for requested action\n" );
-		exit( -1 );
-	}
-	return( allowed );
+  bool allowed = true;
+  if ( function & (ZMU_STATE|ZMU_IMAGE|ZMU_TIME|ZMU_READ_IDX|ZMU_WRITE_IDX|ZMU_FPS) )
+  {
+    if ( user->getStream() < User::PERM_VIEW )
+      allowed = false;
+  }
+  if ( function & ZMU_EVENT )
+  {
+    if ( user->getEvents() < User::PERM_VIEW )
+      allowed = false;
+  }
+  if ( function & (ZMU_ZONES|ZMU_QUERY|ZMU_LIST) )
+  {
+    if ( user->getMonitors() < User::PERM_VIEW )
+      allowed = false;
+  }
+  if ( function & (ZMU_ALARM|ZMU_NOALARM|ZMU_CANCEL|ZMU_RELOAD|ZMU_ENABLE|ZMU_DISABLE|ZMU_SUSPEND|ZMU_RESUME|ZMU_BRIGHTNESS|ZMU_CONTRAST|ZMU_HUE|ZMU_COLOUR) )
+  {
+    if ( user->getMonitors() < User::PERM_EDIT )
+      allowed = false;
+  }
+  if ( mon_id > 0 )
+  {
+    if ( !user->canAccess( mon_id ) )
+    {
+      allowed = false;
+    }
+  }
+  if ( !allowed )
+  {
+    fprintf( stderr, "Error, insufficient privileges for requested action\n" );
+    exit( -1 );
+  }
+  return( allowed );
 }
 
 int main( int argc, char *argv[] )
 {
-	if ( access(ZM_CONFIG, R_OK) != 0 )
-	{
-		fprintf( stderr, "Can't open %s: %s\n", ZM_CONFIG, strerror(errno) );
-		exit( -1 );
-	}
+  if ( access(ZM_CONFIG, R_OK) != 0 )
+  {
+    fprintf( stderr, "Can't open %s: %s\n", ZM_CONFIG, strerror(errno) );
+    exit( -1 );
+  }
 
-	self = argv[0];
+  self = argv[0];
 
-	srand( getpid() * time( 0 ) );
+  srand( getpid() * time( 0 ) );
 
-	static struct option long_options[] = {
-		{"device", 2, 0, 'd'},
-		{"monitor", 1, 0, 'm'},
-		{"verbose", 0, 0, 'v'},
-		{"image", 2, 0, 'i'},
-		{"scale", 1, 0, 'S'},
-		{"timestamp", 2, 0, 't'},
-		{"state", 0, 0, 's'},
-		{"brightness", 2, 0, 'B'},
-		{"contrast", 2, 0, 'C'},
-		{"hue", 2, 0, 'H'},
-		{"contrast", 2, 0, 'O'},
-		{"read_index", 0, 0, 'R'},
-		{"write_index", 0, 0, 'W'},
-		{"event", 0, 0, 'e'},
-		{"fps", 0, 0, 'f'},
-		{"zones", 2, 0, 'z'},
-		{"alarm", 0, 0, 'a'},
-		{"noalarm", 0, 0, 'n'},
-		{"cancel", 0, 0, 'c'},
-		{"reload", 0, 0, 'L'},
-		{"enable", 0, 0, 'E'},
-		{"disable", 0, 0, 'D'},
-		{"suspend", 0, 0, 'u'},
-		{"resume", 0, 0, 'r'},
-		{"query", 0, 0, 'q'},
-		{"username", 1, 0, 'U'},
-		{"password", 1, 0, 'P'},
-		{"auth", 1, 0, 'A'},
-		{"version", 1, 0, 'V'},
-		{"help", 0, 0, 'h'},
-		{"list", 0, 0, 'l'},
-		{0, 0, 0, 0}
-	};
+  static struct option long_options[] = {
+    {"device", 2, 0, 'd'},
+    {"monitor", 1, 0, 'm'},
+    {"verbose", 0, 0, 'v'},
+    {"image", 2, 0, 'i'},
+    {"scale", 1, 0, 'S'},
+    {"timestamp", 2, 0, 't'},
+    {"state", 0, 0, 's'},
+    {"brightness", 2, 0, 'B'},
+    {"contrast", 2, 0, 'C'},
+    {"hue", 2, 0, 'H'},
+    {"contrast", 2, 0, 'O'},
+    {"read_index", 0, 0, 'R'},
+    {"write_index", 0, 0, 'W'},
+    {"event", 0, 0, 'e'},
+    {"fps", 0, 0, 'f'},
+    {"zones", 2, 0, 'z'},
+    {"alarm", 0, 0, 'a'},
+    {"noalarm", 0, 0, 'n'},
+    {"cancel", 0, 0, 'c'},
+    {"reload", 0, 0, 'L'},
+    {"enable", 0, 0, 'E'},
+    {"disable", 0, 0, 'D'},
+    {"suspend", 0, 0, 'u'},
+    {"resume", 0, 0, 'r'},
+    {"query", 0, 0, 'q'},
+    {"username", 1, 0, 'U'},
+    {"password", 1, 0, 'P'},
+    {"auth", 1, 0, 'A'},
+    {"version", 1, 0, 'V'},
+    {"help", 0, 0, 'h'},
+    {"list", 0, 0, 'l'},
+    {0, 0, 0, 0}
+  };
 
-	const char *device = 0;
-	int mon_id = 0;
-	bool verbose = false;
-	int function = ZMU_BOGUS;
+  const char *device = 0;
+  int mon_id = 0;
+  bool verbose = false;
+  int function = ZMU_BOGUS;
 
-	int image_idx = -1;
-	int scale = -1;
-	int brightness = -1;
-	int contrast = -1;
-	int hue = -1;
-	int colour = -1;
-	char *zoneString = 0;
-	char *username = 0;
-	char *password = 0;
-	char *auth = 0;
+  int image_idx = -1;
+  int scale = -1;
+  int brightness = -1;
+  int contrast = -1;
+  int hue = -1;
+  int colour = -1;
+  char *zoneString = 0;
+  char *username = 0;
+  char *password = 0;
+  char *auth = 0;
 #if ZM_HAS_V4L
 #if ZM_HAS_V4L2
-    int v4lVersion = 2;
+  int v4lVersion = 2;
 #elif ZM_HAS_V4L1
-    int v4lVersion = 1;
+  int v4lVersion = 1;
 #endif // ZM_HAS_V4L2/1
 #endif // ZM_HAS_V4L
-	while (1)
-	{
-		int option_index = 0;
+  while (1)
+  {
+    int option_index = 0;
 
-		int c = getopt_long (argc, argv, "d:m:vsEDLurwei::S:t::fz::ancqhlB::C::H::O::U:P:A:V:", long_options, &option_index);
-		if (c == -1)
-		{
-			break;
-		}
+    int c = getopt_long (argc, argv, "d:m:vsEDLurwei::S:t::fz::ancqhlB::C::H::O::U:P:A:V:", long_options, &option_index);
+    if (c == -1)
+    {
+      break;
+    }
 
-		switch (c)
-		{
-			case 'd':
-                if ( optarg )
-				    device = optarg;
-				break;
-			case 'm':
-				mon_id = atoi(optarg);
-				break;
-			case 'v':
-				verbose = true;
-				break;
-			case 's':
-				function |= ZMU_STATE;
-				break;
-			case 'i':
-				function |= ZMU_IMAGE;
-				if ( optarg )
-					image_idx = atoi( optarg );
-				break;
-			case 'S':
-				scale = atoi(optarg);
-				break;
-			case 't':
-				function |= ZMU_TIME;
-				if ( optarg )
-					image_idx = atoi( optarg );
-				break;
-			case 'R':
-				function |= ZMU_READ_IDX;
-				break;
-			case 'W':
-				function |= ZMU_WRITE_IDX;
-				break;
-			case 'e':
-				function |= ZMU_EVENT;
-				break;
-			case 'f':
-				function |= ZMU_FPS;
-				break;
-			case 'z':
-				function |= ZMU_ZONES;
-				if ( optarg )
-					zoneString = optarg;
-				break;
-			case 'a':
-				function |= ZMU_ALARM;
-				break;
-			case 'n':
-				function |= ZMU_NOALARM;
-				break;
-			case 'c':
-				function |= ZMU_CANCEL;
-				break;
-			case 'L':
-				function |= ZMU_RELOAD;
-				break;
-			case 'E':
-				function |= ZMU_ENABLE;
-				break;
-			case 'D':
-				function |= ZMU_DISABLE;
-				break;
-			case 'u':
-				function |= ZMU_SUSPEND;
-				break;
-			case 'r':
-				function |= ZMU_RESUME;
-				break;
-			case 'q':
-				function |= ZMU_QUERY;
-				break;
-			case 'B':
-				function |= ZMU_BRIGHTNESS;
-				if ( optarg )
-					brightness = atoi( optarg );
-				break;
-			case 'C':
-				function |= ZMU_CONTRAST;
-				if ( optarg )
-					contrast = atoi( optarg );
-				break;
-			case 'H':
-				function |= ZMU_HUE;
-				if ( optarg )
-					hue = atoi( optarg );
-				break;
-			case 'O':
-				function |= ZMU_COLOUR;
-				if ( optarg )
-					colour = atoi( optarg );
-				break;
-			case 'U':
-				username = optarg;
-				break;
-			case 'P':
-				password = optarg;
-				break;
-			case 'A':
-				auth = optarg;
-				break;
+    switch (c)
+    {
+      case 'd':
+        if ( optarg )
+          device = optarg;
+        break;
+      case 'm':
+        mon_id = atoi(optarg);
+        break;
+      case 'v':
+        verbose = true;
+        break;
+      case 's':
+        function |= ZMU_STATE;
+        break;
+      case 'i':
+        function |= ZMU_IMAGE;
+        if ( optarg )
+          image_idx = atoi( optarg );
+        break;
+      case 'S':
+        scale = atoi(optarg);
+        break;
+      case 't':
+        function |= ZMU_TIME;
+        if ( optarg )
+          image_idx = atoi( optarg );
+        break;
+      case 'R':
+        function |= ZMU_READ_IDX;
+        break;
+      case 'W':
+        function |= ZMU_WRITE_IDX;
+        break;
+      case 'e':
+        function |= ZMU_EVENT;
+        break;
+      case 'f':
+        function |= ZMU_FPS;
+        break;
+      case 'z':
+        function |= ZMU_ZONES;
+        if ( optarg )
+          zoneString = optarg;
+        break;
+      case 'a':
+        function |= ZMU_ALARM;
+        break;
+      case 'n':
+        function |= ZMU_NOALARM;
+        break;
+      case 'c':
+        function |= ZMU_CANCEL;
+        break;
+      case 'L':
+        function |= ZMU_RELOAD;
+        break;
+      case 'E':
+        function |= ZMU_ENABLE;
+        break;
+      case 'D':
+        function |= ZMU_DISABLE;
+        break;
+      case 'u':
+        function |= ZMU_SUSPEND;
+        break;
+      case 'r':
+        function |= ZMU_RESUME;
+        break;
+      case 'q':
+        function |= ZMU_QUERY;
+        break;
+      case 'B':
+        function |= ZMU_BRIGHTNESS;
+        if ( optarg )
+          brightness = atoi( optarg );
+        break;
+      case 'C':
+        function |= ZMU_CONTRAST;
+        if ( optarg )
+          contrast = atoi( optarg );
+        break;
+      case 'H':
+        function |= ZMU_HUE;
+        if ( optarg )
+          hue = atoi( optarg );
+        break;
+      case 'O':
+        function |= ZMU_COLOUR;
+        if ( optarg )
+          colour = atoi( optarg );
+        break;
+      case 'U':
+        username = optarg;
+        break;
+      case 'P':
+        password = optarg;
+        break;
+      case 'A':
+        auth = optarg;
+        break;
 #if ZM_HAS_V4L
-			case 'V':
-				v4lVersion = (atoi(optarg)==1)?1:2;
-				break;
+      case 'V':
+        v4lVersion = (atoi(optarg)==1)?1:2;
+        break;
 #endif // ZM_HAS_V4L
-			case 'h':
-				Usage( 0 );
-				break;
-			case 'l':
-				function |= ZMU_LIST;
-				break;
-			case '?':
-				Usage();
-				break;
-			default:
-				//fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
-				break;
-		}
-	}
+      case 'h':
+        Usage( 0 );
+        break;
+      case 'l':
+        function |= ZMU_LIST;
+        break;
+      case '?':
+        Usage();
+        break;
+      default:
+        //fprintf( stderr, "?? getopt returned character code 0%o ??\n", c );
+        break;
+    }
+  }
 
-	if (optind < argc)
-	{
-		fprintf( stderr, "Extraneous options, " );
-		while (optind < argc)
-			fprintf( stderr, "%s ", argv[optind++]);
-		fprintf( stderr, "\n");
-		Usage();
-	}
+  if (optind < argc)
+  {
+    fprintf( stderr, "Extraneous options, " );
+    while (optind < argc)
+      fprintf( stderr, "%s ", argv[optind++]);
+    fprintf( stderr, "\n");
+    Usage();
+  }
 
-	if ( device && !(function&ZMU_QUERY) )
-	{
-		fprintf( stderr, "Error, -d option cannot be used with this option\n" );
-		Usage();
-	}
-	if ( scale != -1 && !(function&ZMU_IMAGE) )
-	{
-		fprintf( stderr, "Error, -S option cannot be used with this option\n" );
-		Usage();
-	}
-	//printf( "Monitor %d, Function %d\n", mon_id, function );
+  if ( device && !(function&ZMU_QUERY) )
+  {
+    fprintf( stderr, "Error, -d option cannot be used with this option\n" );
+    Usage();
+  }
+  if ( scale != -1 && !(function&ZMU_IMAGE) )
+  {
+    fprintf( stderr, "Error, -S option cannot be used with this option\n" );
+    Usage();
+  }
+  //printf( "Monitor %d, Function %d\n", mon_id, function );
 
-	zmLoadConfig();
+  zmLoadConfig();
 
-	logInit( "zmu" );
+  logInit( "zmu" );
 
-	zmSetDefaultTermHandler();
-	zmSetDefaultDieHandler();
+  zmSetDefaultTermHandler();
+  zmSetDefaultDieHandler();
 
-	User *user = 0;
+  User *user = 0;
 
-	if ( config.opt_use_auth )
-	{
-		if ( strcmp( config.auth_relay, "none" ) == 0 )
-		{
-			if ( !username )
-			{
-				fprintf( stderr, "Error, username must be supplied\n" );
-				exit( -1 );
-			}
+  if ( config.opt_use_auth )
+  {
+    if ( strcmp( config.auth_relay, "none" ) == 0 )
+    {
+      if ( !username )
+      {
+        fprintf( stderr, "Error, username must be supplied\n" );
+        exit( -1 );
+      }
 
-			if ( username )
-			{
-				user = zmLoadUser( username );
-			}
-		}
-		else
-		{
-			if ( !(username && password) && !auth )
-			{
-				fprintf( stderr, "Error, username and password or auth string must be supplied\n" );
-				exit( -1 );
-			}
+      if ( username )
+      {
+        user = zmLoadUser( username );
+      }
+    }
+    else
+    {
+      if ( !(username && password) && !auth )
+      {
+        fprintf( stderr, "Error, username and password or auth string must be supplied\n" );
+        exit( -1 );
+      }
 
-			//if ( strcmp( config.auth_relay, "hashed" ) == 0 )
-			{
-				if ( auth )
-				{
-					user = zmLoadAuthUser( auth, false );
-				}
-			}
-			//else if ( strcmp( config.auth_relay, "plain" ) == 0 )
-			{
-				if ( username && password )
-				{
-					user = zmLoadUser( username, password );
-				}
-			}
-		}
-		if ( !user )
-		{
-			fprintf( stderr, "Error, unable to authenticate user\n" );
-			exit( -1 );
-		}
-		ValidateAccess( user, mon_id, function );
-	}
-	
+      //if ( strcmp( config.auth_relay, "hashed" ) == 0 )
+      {
+        if ( auth )
+        {
+          user = zmLoadAuthUser( auth, false );
+        }
+      }
+      //else if ( strcmp( config.auth_relay, "plain" ) == 0 )
+      {
+        if ( username && password )
+        {
+          user = zmLoadUser( username, password );
+        }
+      }
+    }
+    if ( !user )
+    {
+      fprintf( stderr, "Error, unable to authenticate user\n" );
+      exit( -1 );
+    }
+    ValidateAccess( user, mon_id, function );
+  }
+  
 
-	if ( mon_id > 0 )
-	{
-		Monitor *monitor = Monitor::Load( mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY );
-		if ( monitor )
-		{
-			if ( verbose )
-			{
-				printf( "Monitor %d(%s)\n", monitor->Id(), monitor->Name() );
-			}
-			if ( ! monitor->connect() ) {
-				Error( "Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name() );
-				exit( -1 );
-			} 
+  if ( mon_id > 0 )
+  {
+    Monitor *monitor = Monitor::Load( mon_id, function&(ZMU_QUERY|ZMU_ZONES), Monitor::QUERY );
+    if ( monitor )
+    {
+      if ( verbose )
+      {
+        printf( "Monitor %d(%s)\n", monitor->Id(), monitor->Name() );
+      }
+      if ( ! monitor->connect() ) {
+        Error( "Can't connect to capture daemon: %d %s", monitor->Id(), monitor->Name() );
+        exit( -1 );
+      } 
 
-			char separator = ' ';
-			bool have_output = false;
-			if ( function & ZMU_STATE )
-			{
-				Monitor::State state = monitor->GetState();
-				if ( verbose )
-					printf( "Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle") );
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					printf( "%d", state );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_TIME )
-			{
-				struct timeval timestamp = monitor->GetTimestamp( image_idx );
-				if ( verbose )
-				{
-					char timestamp_str[64] = "None";
-					if ( timestamp.tv_sec )
-						strftime( timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime( &timestamp.tv_sec ) );
-					if ( image_idx == -1 )
-						printf( "Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000 );
-					else
-						printf( "Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000 );
-				}
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					printf( "%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000 );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_READ_IDX )
-			{
-				if ( verbose )
-					printf( "Last read index: %d\n", monitor->GetLastReadIndex() );
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					printf( "%d", monitor->GetLastReadIndex() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_WRITE_IDX )
-			{
-				if ( verbose )
-					printf( "Last write index: %d\n", monitor->GetLastWriteIndex() );
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					printf( "%d", monitor->GetLastWriteIndex() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_EVENT )
-			{
-				if ( verbose )
-					printf( "Last event id: %d\n", monitor->GetLastEvent() );
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					printf( "%d", monitor->GetLastEvent() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_FPS )
-			{
-				if ( verbose )
-					printf( "Current capture rate: %.2f frames per second\n", monitor->GetFPS() );
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					printf( "%.2f", monitor->GetFPS() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_IMAGE )
-			{
-				if ( verbose )
-				{
-					if ( image_idx == -1 )
-						printf( "Dumping last image captured to Monitor%d.jpg", monitor->Id() );
-					else
-						printf( "Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id() );
-					if ( scale != -1 )
-						printf( ", scaling by %d%%", scale );
-					printf( "\n" );
-				}
-				monitor->GetImage( image_idx, scale>0?scale:100 );
-			}
-			if ( function & ZMU_ZONES )
-			{
-				if ( verbose )
-					printf( "Dumping zone image to Zones%d.jpg\n", monitor->Id() );
-				monitor->DumpZoneImage( zoneString );
-			}
-			if ( function & ZMU_ALARM )
-			{
-				if ( verbose )
-					printf( "Forcing alarm on\n" );
-				monitor->ForceAlarmOn( config.forced_alarm_score, "Forced Web" );
-			}
-			if ( function & ZMU_NOALARM )
-			{
-				if ( verbose )
-					printf( "Forcing alarm off\n" );
-				monitor->ForceAlarmOff();
-			}
-			if ( function & ZMU_CANCEL )
-			{
-				if ( verbose )
-					printf( "Cancelling forced alarm on/off\n" );
-				monitor->CancelForced();
-			}
-			if ( function & ZMU_RELOAD )
-			{
-				if ( verbose )
-					printf( "Reloading monitor settings\n" );
-				monitor->actionReload();
-			}
-			if ( function & ZMU_ENABLE )
-			{
-				if ( verbose )
-					printf( "Enabling event generation\n" );
-				monitor->actionEnable();
-			}
-			if ( function & ZMU_DISABLE )
-			{
-				if ( verbose )
-					printf( "Disabling event generation\n" );
-				monitor->actionDisable();
-			}
-			if ( function & ZMU_SUSPEND )
-			{
-				if ( verbose )
-					printf( "Suspending event generation\n" );
-				monitor->actionSuspend();
-			}
-			if ( function & ZMU_RESUME )
-			{
-				if ( verbose )
-					printf( "Resuming event generation\n" );
-				monitor->actionResume();
-			}
-			if ( function & ZMU_QUERY )
-			{
-				char monString[16382] = "";
-				monitor->DumpSettings( monString, verbose );
-				printf( "%s\n", monString );
-			}
-			if ( function & ZMU_BRIGHTNESS )
-			{
-				if ( verbose )
-				{
-					if ( brightness >= 0 )
-						printf( "New brightness: %d\n", monitor->actionBrightness( brightness ) );
-					else
-						printf( "Current brightness: %d\n", monitor->actionBrightness() );
-				}
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					if ( brightness >= 0 )
-						printf( "%d", monitor->actionBrightness( brightness ) );
-					else
-						printf( "%d", monitor->actionBrightness() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_CONTRAST )
-			{
-				if ( verbose )
-				{
-					if ( contrast >= 0 )
-						printf( "New brightness: %d\n", monitor->actionContrast( contrast ) );
-					else
-						printf( "Current contrast: %d\n", monitor->actionContrast() );
-				}
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					if ( contrast >= 0 )
-						printf( "%d", monitor->actionContrast( contrast ) );
-					else
-						printf( "%d", monitor->actionContrast() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_HUE )
-			{
-				if ( verbose )
-				{
-					if ( hue >= 0 )
-						printf( "New hue: %d\n", monitor->actionHue( hue ) );
-					else
-						printf( "Current hue: %d\n", monitor->actionHue() );
-				}
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					if ( hue >= 0 )
-						printf( "%d", monitor->actionHue( hue ) );
-					else
-						printf( "%d", monitor->actionHue() );
-					have_output = true;
-				}
-			}
-			if ( function & ZMU_COLOUR )
-			{
-				if ( verbose )
-				{
-					if ( colour >= 0 )
-						printf( "New colour: %d\n", monitor->actionColour( colour ) );
-					else
-						printf( "Current colour: %d\n", monitor->actionColour() );
-				}
-				else
-				{
-					if ( have_output ) printf( "%c", separator );
-					if ( colour >= 0 )
-						printf( "%d", monitor->actionColour( colour ) );
-					else
-						printf( "%d", monitor->actionColour() );
-					have_output = true;
-				}
-			}
-			if ( have_output )
-			{
-				printf( "\n" );
-			}
-			if ( !function )
-			{
-				Usage();
-			}
-			delete monitor;
-		}
-		else
-		{
-			fprintf( stderr, "Error, invalid monitor id %d\n", mon_id );
-			exit( -1 );
-		}
-	}
-	else
-	{
-		if ( function & ZMU_QUERY )
-		{
+      char separator = ' ';
+      bool have_output = false;
+      if ( function & ZMU_STATE )
+      {
+        Monitor::State state = monitor->GetState();
+        if ( verbose )
+          printf( "Current state: %s\n", state==Monitor::ALARM?"Alarm":(state==Monitor::ALERT?"Alert":"Idle") );
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          printf( "%d", state );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_TIME )
+      {
+        struct timeval timestamp = monitor->GetTimestamp( image_idx );
+        if ( verbose )
+        {
+          char timestamp_str[64] = "None";
+          if ( timestamp.tv_sec )
+            strftime( timestamp_str, sizeof(timestamp_str), "%Y-%m-%d %H:%M:%S", localtime( &timestamp.tv_sec ) );
+          if ( image_idx == -1 )
+            printf( "Time of last image capture: %s.%02ld\n", timestamp_str, timestamp.tv_usec/10000 );
+          else
+            printf( "Time of image %d capture: %s.%02ld\n", image_idx, timestamp_str, timestamp.tv_usec/10000 );
+        }
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          printf( "%ld.%02ld", timestamp.tv_sec, timestamp.tv_usec/10000 );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_READ_IDX )
+      {
+        if ( verbose )
+          printf( "Last read index: %d\n", monitor->GetLastReadIndex() );
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          printf( "%d", monitor->GetLastReadIndex() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_WRITE_IDX )
+      {
+        if ( verbose )
+          printf( "Last write index: %d\n", monitor->GetLastWriteIndex() );
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          printf( "%d", monitor->GetLastWriteIndex() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_EVENT )
+      {
+        if ( verbose )
+          printf( "Last event id: %d\n", monitor->GetLastEvent() );
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          printf( "%d", monitor->GetLastEvent() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_FPS )
+      {
+        if ( verbose )
+          printf( "Current capture rate: %.2f frames per second\n", monitor->GetFPS() );
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          printf( "%.2f", monitor->GetFPS() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_IMAGE )
+      {
+        if ( verbose )
+        {
+          if ( image_idx == -1 )
+            printf( "Dumping last image captured to Monitor%d.jpg", monitor->Id() );
+          else
+            printf( "Dumping buffer image %d to Monitor%d.jpg", image_idx, monitor->Id() );
+          if ( scale != -1 )
+            printf( ", scaling by %d%%", scale );
+          printf( "\n" );
+        }
+        monitor->GetImage( image_idx, scale>0?scale:100 );
+      }
+      if ( function & ZMU_ZONES )
+      {
+        if ( verbose )
+          printf( "Dumping zone image to Zones%d.jpg\n", monitor->Id() );
+        monitor->DumpZoneImage( zoneString );
+      }
+      if ( function & ZMU_ALARM )
+      {
+        if ( verbose )
+          printf( "Forcing alarm on\n" );
+        monitor->ForceAlarmOn( config.forced_alarm_score, "Forced Web" );
+      }
+      if ( function & ZMU_NOALARM )
+      {
+        if ( verbose )
+          printf( "Forcing alarm off\n" );
+        monitor->ForceAlarmOff();
+      }
+      if ( function & ZMU_CANCEL )
+      {
+        if ( verbose )
+          printf( "Cancelling forced alarm on/off\n" );
+        monitor->CancelForced();
+      }
+      if ( function & ZMU_RELOAD )
+      {
+        if ( verbose )
+          printf( "Reloading monitor settings\n" );
+        monitor->actionReload();
+      }
+      if ( function & ZMU_ENABLE )
+      {
+        if ( verbose )
+          printf( "Enabling event generation\n" );
+        monitor->actionEnable();
+      }
+      if ( function & ZMU_DISABLE )
+      {
+        if ( verbose )
+          printf( "Disabling event generation\n" );
+        monitor->actionDisable();
+      }
+      if ( function & ZMU_SUSPEND )
+      {
+        if ( verbose )
+          printf( "Suspending event generation\n" );
+        monitor->actionSuspend();
+      }
+      if ( function & ZMU_RESUME )
+      {
+        if ( verbose )
+          printf( "Resuming event generation\n" );
+        monitor->actionResume();
+      }
+      if ( function & ZMU_QUERY )
+      {
+        char monString[16382] = "";
+        monitor->DumpSettings( monString, verbose );
+        printf( "%s\n", monString );
+      }
+      if ( function & ZMU_BRIGHTNESS )
+      {
+        if ( verbose )
+        {
+          if ( brightness >= 0 )
+            printf( "New brightness: %d\n", monitor->actionBrightness( brightness ) );
+          else
+            printf( "Current brightness: %d\n", monitor->actionBrightness() );
+        }
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          if ( brightness >= 0 )
+            printf( "%d", monitor->actionBrightness( brightness ) );
+          else
+            printf( "%d", monitor->actionBrightness() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_CONTRAST )
+      {
+        if ( verbose )
+        {
+          if ( contrast >= 0 )
+            printf( "New brightness: %d\n", monitor->actionContrast( contrast ) );
+          else
+            printf( "Current contrast: %d\n", monitor->actionContrast() );
+        }
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          if ( contrast >= 0 )
+            printf( "%d", monitor->actionContrast( contrast ) );
+          else
+            printf( "%d", monitor->actionContrast() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_HUE )
+      {
+        if ( verbose )
+        {
+          if ( hue >= 0 )
+            printf( "New hue: %d\n", monitor->actionHue( hue ) );
+          else
+            printf( "Current hue: %d\n", monitor->actionHue() );
+        }
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          if ( hue >= 0 )
+            printf( "%d", monitor->actionHue( hue ) );
+          else
+            printf( "%d", monitor->actionHue() );
+          have_output = true;
+        }
+      }
+      if ( function & ZMU_COLOUR )
+      {
+        if ( verbose )
+        {
+          if ( colour >= 0 )
+            printf( "New colour: %d\n", monitor->actionColour( colour ) );
+          else
+            printf( "Current colour: %d\n", monitor->actionColour() );
+        }
+        else
+        {
+          if ( have_output ) printf( "%c", separator );
+          if ( colour >= 0 )
+            printf( "%d", monitor->actionColour( colour ) );
+          else
+            printf( "%d", monitor->actionColour() );
+          have_output = true;
+        }
+      }
+      if ( have_output )
+      {
+        printf( "\n" );
+      }
+      if ( !function )
+      {
+        Usage();
+      }
+      delete monitor;
+    }
+    else
+    {
+      fprintf( stderr, "Error, invalid monitor id %d\n", mon_id );
+      exit( -1 );
+    }
+  }
+  else
+  {
+    if ( function & ZMU_QUERY )
+    {
 #if ZM_HAS_V4L
-			char vidString[0x10000] = "";
-			bool ok = LocalCamera::GetCurrentSettings( device, vidString, v4lVersion, verbose );
-			printf( "%s", vidString );
-			exit( ok?0:-1 );
+      char vidString[0x10000] = "";
+      bool ok = LocalCamera::GetCurrentSettings( device, vidString, v4lVersion, verbose );
+      printf( "%s", vidString );
+      exit( ok?0:-1 );
 #else // ZM_HAS_V4L
-			fprintf( stderr, "Error, video4linux is required for device querying\n" );
-            exit( -1 );
+      fprintf( stderr, "Error, video4linux is required for device querying\n" );
+      exit( -1 );
 #endif // ZM_HAS_V4L
-		}
+    }
 
-		if ( function & ZMU_LIST )
-		{
-           char sql[ZM_SQL_SML_BUFSIZ];
-			strncpy( sql, "select Id, Function+0 from Monitors", sizeof(sql) );
-			if ( !verbose )
-			{
-				strncat( sql, " where Function != 'None'", sizeof(sql)-strlen(sql) );
-			}
-			strncat( sql, " order by Id asc", sizeof(sql)-strlen(sql) );
+    if ( function & ZMU_LIST )
+    {
+      std::string sql = "select Id, Function+0 from Monitors";
+      if ( !verbose )
+      {
+        sql += "where Function != 'None'";
+      }
+      sql += " order by Id asc";
 
-			if ( mysql_query( &dbconn, sql ) )
-			{
-				Error( "Can't run query: %s", mysql_error( &dbconn ) );
-				exit( mysql_errno( &dbconn ) );
-			}
+      if ( mysql_query( &dbconn, sql.c_str() ) )
+      {
+        Error( "Can't run query: %s", mysql_error( &dbconn ) );
+        exit( mysql_errno( &dbconn ) );
+      }
 
-			MYSQL_RES *result = mysql_store_result( &dbconn );
-			if ( !result )
-			{
-				Error( "Can't use query result: %s", mysql_error( &dbconn ) );
-				exit( mysql_errno( &dbconn ) );
-			}
-			int n_monitors = mysql_num_rows( result );
-			Debug( 1, "Got %d monitors", n_monitors );
+      MYSQL_RES *result = mysql_store_result( &dbconn );
+      if ( !result )
+      {
+        Error( "Can't use query result: %s", mysql_error( &dbconn ) );
+        exit( mysql_errno( &dbconn ) );
+      }
+      int n_monitors = mysql_num_rows( result );
+      Debug( 1, "Got %d monitors", n_monitors );
 
-			printf( "%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate" );
-			for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
-			{
-				int mon_id = atoi(dbrow[0]);
-				int function = atoi(dbrow[1]);
-				if ( !user || user->canAccess( mon_id ) )
-				{
-					if ( function > 1 )
-					{
-						Monitor *monitor = Monitor::Load( mon_id, false, Monitor::QUERY );
-						if ( monitor && monitor->connect() )
-						{
-							struct timeval tv = monitor->GetTimestamp();
-							printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
-								monitor->Id(),
-								function,
-								monitor->GetState(),
-								monitor->GetTriggerState(),
-								tv.tv_sec, tv.tv_usec/10000,
-								monitor->GetLastReadIndex(),
-								monitor->GetLastWriteIndex(),
-								monitor->GetLastEvent(),
-								monitor->GetFPS()
-							);
-							delete monitor;
-						}
-					}
-					else
-					{
-						struct timeval tv = { 0, 0 };
-						printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
-							mon_id,
-							function,
-							0,
-							0,
-							tv.tv_sec, tv.tv_usec/10000,
-							0,
-							0,
-							0,
-							0.0
-						);
-					}
-				}
-			}
-			mysql_free_result( result );
-		}
-	}
-	delete user;
+      printf( "%4s%5s%6s%9s%14s%6s%6s%8s%8s\n", "Id", "Func", "State", "TrgState", "LastImgTim", "RdIdx", "WrIdx", "LastEvt", "FrmRate" );
+      for( int i = 0; MYSQL_ROW dbrow = mysql_fetch_row( result ); i++ )
+      {
+        int mon_id = atoi(dbrow[0]);
+        int function = atoi(dbrow[1]);
+        if ( !user || user->canAccess( mon_id ) )
+        {
+          if ( function > 1 )
+          {
+            Monitor *monitor = Monitor::Load( mon_id, false, Monitor::QUERY );
+            if ( monitor && monitor->connect() )
+            {
+              struct timeval tv = monitor->GetTimestamp();
+              printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
+                monitor->Id(),
+                function,
+                monitor->GetState(),
+                monitor->GetTriggerState(),
+                tv.tv_sec, tv.tv_usec/10000,
+                monitor->GetLastReadIndex(),
+                monitor->GetLastWriteIndex(),
+                monitor->GetLastEvent(),
+                monitor->GetFPS()
+              );
+              delete monitor;
+            }
+          }
+          else
+          {
+            struct timeval tv = { 0, 0 };
+            printf( "%4d%5d%6d%9d%11ld.%02ld%6d%6d%8d%8.2f\n",
+              mon_id,
+              function,
+              0,
+              0,
+              tv.tv_sec, tv.tv_usec/10000,
+              0,
+              0,
+              0,
+              0.0
+            );
+          }
+        }
+      }
+      mysql_free_result( result );
+    }
+  }
+  delete user;
 
-	logTerm();
-	zmDbClose();
+  logTerm();
+  zmDbClose();
 
-	return( 0 );
+  return( 0 );
 }
diff --git a/utils/do_debian_package.sh b/utils/do_debian_package.sh
index 6fff59967..f594f05d3 100755
--- a/utils/do_debian_package.sh
+++ b/utils/do_debian_package.sh
@@ -47,9 +47,9 @@ cd zoneminder_$VERSION-$DISTRO-$SNAPSHOT.orig
 git submodule init
 git submodule update --init --recursive
 if [ $DISTRO == "trusty" ]; then 
-ln -sf distros/ubuntu1204_cmake debian
+ln -sf distros/ubuntu1204 debian
 else
-ln -sf distros/ubuntu1504_cmake debian
+ln -sf distros/ubuntu1504 debian
 fi;
 
 # Auto-install all ZoneMinder's depedencies using the Debian control file
diff --git a/version b/version
index 5e57fb895..412114252 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-1.29.0
+1.29.2
diff --git a/web/Makefile.am b/web/Makefile.am
deleted file mode 100644
index 077a4ff91..000000000
--- a/web/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-# This should be set to your web directory
-webdir = @WEB_PREFIX@
-# And these to the user and group of your webserver
-webuser = @WEB_USER@
-webgroup = @WEB_GROUP@
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	js \
-	lang \
-	skins \
-	tools \
-	views
-
-dist_web_DATA = \
-	index.php
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(webdir); chown $(webuser):$(webgroup) $(dist_web_DATA) )
-	( cd $(DESTDIR)$(webdir); chown -R $(webuser):$(webgroup) $(SUBDIRS) )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e events; then mkdir events; fi; chown $(webuser):$(webgroup) events; chmod u+w events )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e images; then mkdir images; fi; chown $(webuser):$(webgroup) images; chmod u+w images )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e sounds; then mkdir sounds; fi; chown $(webuser):$(webgroup) sounds; chmod u+w sounds )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e tools; then mkdir tools; fi; chown $(webuser):$(webgroup) tools; chmod u+w tools )
-	@-( cd $(DESTDIR)$(webdir); if ! test -e temp; then mkdir temp; fi; chown $(webuser):$(webgroup) temp; chmod u+w temp )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -rf $(SUBDIRS) )
-	@-( cd $(DESTDIR)$(webdir); rm -rf events images sounds tools temp )
diff --git a/web/ajax/Makefile.am b/web/ajax/Makefile.am
deleted file mode 100644
index ef79e6cae..000000000
--- a/web/ajax/Makefile.am
+++ /dev/null
@@ -1,12 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/ajax
-
-dist_web_DATA = \
-	alarm.php \
-	control.php \
-	event.php \
-	log.php \
-	status.php \
-	stream.php \
-	zone.php
diff --git a/web/ajax/zone.php b/web/ajax/zone.php
index 905ef7ac1..bfa77a922 100644
--- a/web/ajax/zone.php
+++ b/web/ajax/zone.php
@@ -17,7 +17,7 @@ if ( canView( 'Monitors' ) )
         {
             $wd = getcwd();
             chdir( ZM_DIR_IMAGES );
-            $hiColor = "0x00ff00";
+            $hiColor = '0x00ff00';
 
             $command = getZmuCommand( " -m ".$_REQUEST['mid']." -z" );
             if ( !isset($_REQUEST['zid']) )
diff --git a/web/api/app/Controller/MonitorsController.php b/web/api/app/Controller/MonitorsController.php
index 9ab7461f9..11857942c 100644
--- a/web/api/app/Controller/MonitorsController.php
+++ b/web/api/app/Controller/MonitorsController.php
@@ -97,7 +97,7 @@ public function beforeFilter() {
 
 			if ($this->Session->Read('systemPermission') != 'Edit')
 			{
-				 throw new UnauthotizedException(__('Insufficient privileges'));
+				 throw new UnauthorizedException(__('Insufficient privileges'));
 				return;
 			}
 
diff --git a/web/api/app/Controller/StatesController.php b/web/api/app/Controller/StatesController.php
index 2b007f08f..051837b27 100644
--- a/web/api/app/Controller/StatesController.php
+++ b/web/api/app/Controller/StatesController.php
@@ -11,6 +11,18 @@ class StatesController extends AppController {
 
 public $components = array('RequestHandler');
 
+public function beforeFilter() {
+        parent::beforeFilter();
+        $canView = $this->Session->Read('systemPermission');
+        if ($canView =='None')
+        {
+                throw new UnauthorizedException(__('Insufficient Privileges'));
+                return;
+        }
+
+}
+
+
 /**
  * index method
  *
@@ -46,7 +58,15 @@ public $components = array('RequestHandler');
  * @return void
  */
 	public function add() {
+		
 		if ($this->request->is('post')) {
+
+			if ($this->Session->Read('systemPermission') != 'Edit')
+                        {
+                                 throw new UnauthorizedException(__('Insufficient privileges'));
+                                return;
+                        }
+
 			$this->State->create();
 			if ($this->State->save($this->request->data)) {
 				return $this->flash(__('The state has been saved.'), array('action' => 'index'));
@@ -65,6 +85,13 @@ public $components = array('RequestHandler');
 		if (!$this->State->exists($id)) {
 			throw new NotFoundException(__('Invalid state'));
 		}
+
+		if ($this->Session->Read('systemPermission') != 'Edit')
+                {
+                       throw new UnauthorizedException(__('Insufficient privileges'));
+                       return;
+                }
+
 		if ($this->request->is(array('post', 'put'))) {
 			if ($this->State->save($this->request->data)) {
 				return $this->flash(__('The state has been saved.'), array('action' => 'index'));
@@ -84,6 +111,12 @@ public $components = array('RequestHandler');
  */
 	public function delete($id = null) {
 		$this->State->id = $id;
+		if ($this->Session->Read('systemPermission') != 'Edit')
+		{
+			 throw new UnauthorizedException(__('Insufficient privileges'));
+			return;
+		}
+
 		if (!$this->State->exists()) {
 			throw new NotFoundException(__('Invalid state'));
 		}
@@ -96,6 +129,12 @@ public $components = array('RequestHandler');
 	}
 
 	public function change() {
+		if ($this->Session->Read('systemPermission') != 'Edit')
+                {
+                    throw new UnauthorizedException(__('Insufficient privileges'));
+                    return;
+                }
+
 		$newState = $this->request->params['pass'][0];
 		$blah = $this->packageControl($newState);
 
diff --git a/web/css/Makefile.am b/web/css/Makefile.am
deleted file mode 100644
index 917b8f389..000000000
--- a/web/css/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/css
-
-dist_web_DATA = \
-	reset.css \
-	spinner.css \
-	overlay.css
diff --git a/web/graphics/Makefile.am b/web/graphics/Makefile.am
deleted file mode 100644
index ec252c82e..000000000
--- a/web/graphics/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/graphics
-
-dist_web_DATA = \
-	favicon.ico \
-    spinner.gif \
-	transparent.gif
diff --git a/web/includes/Makefile.am b/web/includes/Makefile.am
deleted file mode 100644
index d4a1ece9b..000000000
--- a/web/includes/Makefile.am
+++ /dev/null
@@ -1,19 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/includes
-
-web_DATA = \
-	config.php
-
-dist_web_DATA = \
-	Monitor.php \
-	Server.php \
-	actions.php \
-	database.php \
-	functions.php \
-	control_functions.php \
-	lang.php \
-	logger.php
-
-EXTRA_DIST = \
-	config.php.in
diff --git a/web/includes/actions.php b/web/includes/actions.php
index 7de7a8238..ba6a1f075 100644
--- a/web/includes/actions.php
+++ b/web/includes/actions.php
@@ -525,6 +525,7 @@ if ( !empty($action) )
                 'DoNativeMotDet' => 'toggle',
                 'Exif' => 'toggle',
                 'RTSPDescribe' => 'toggle',
+                'RecordAudio' => 'toggle',
             );
 
             $columns = getTableColumns( 'Monitors' );
@@ -921,7 +922,6 @@ if ( !empty($action) )
                     case "highband" :
                     case "medband" :
                     case "lowband" :
-                    case "phoneband" :
                         break;
                 }
             }
diff --git a/web/includes/config.php.in b/web/includes/config.php.in
index 2ca819210..ba96d9a54 100644
--- a/web/includes/config.php.in
+++ b/web/includes/config.php.in
@@ -104,6 +104,7 @@ define( "CMD_PREV", 12 );
 define( "CMD_NEXT", 13 );
 define( "CMD_SEEK", 14 );
 define( "CMD_VARPLAY", 15 );
+define( "CMD_QUIT", 17 );
 define( "CMD_QUERY", 99 );
 
 //
diff --git a/web/includes/database.php b/web/includes/database.php
index 2d7bfd7a9..809145032 100644
--- a/web/includes/database.php
+++ b/web/includes/database.php
@@ -81,7 +81,7 @@ function dbLog( $sql, $update=false )
 
 function dbError( $sql )
 {
-    Fatal( "SQL-ERR '".mysql_error()."', statement was '".$sql."'" );
+    Fatal( "SQL-ERR '".$dbConn->errorInfo()."', statement was '".$sql."'" );
 }
 
 function dbEscape( $string )
diff --git a/web/includes/functions.php b/web/includes/functions.php
index 89ca33e40..af22062a1 100644
--- a/web/includes/functions.php
+++ b/web/includes/functions.php
@@ -985,6 +985,7 @@ function daemonControl( $command, $daemon=false, $args=false )
 
 function zmcControl( $monitor, $mode=false )
 {
+  if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
 	$row = NULL;
     if ( $monitor['Type'] == "Local" )
     {
@@ -1010,10 +1011,12 @@ function zmcControl( $monitor, $mode=false )
         }
         daemonControl( "start", "zmc", $zmcArgs );
     }
+  }
 }
 
 function zmaControl( $monitor, $mode=false )
 {
+  if ( (!defined('ZM_SERVER_ID')) or ( ZM_SERVER_ID==$monitor['ServerId'] ) ) {
     if ( !is_array( $monitor ) )
     {
         $monitor = dbFetchOne( "select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id=?", NULL, array($monitor) );
@@ -1058,6 +1061,7 @@ function zmaControl( $monitor, $mode=false )
             daemonControl( "reload", "zma", "-m ".$monitor['Id'] );
         }
     }
+  }
 }
 
 function initDaemonStatus()
@@ -1149,30 +1153,38 @@ function zmaCheck( $monitor )
 
 function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $overwrite=false )
 {
-    $eventPath = getEventPath( $event );
+    $eventPath = ZM_DIR_EVENTS.'/'.getEventPath( $event );
 
     if ( !is_array($frame) )
         $frame = array( 'FrameId'=>$frame, 'Type'=>'' );
 
-    //echo "S:$scale, CO:$captureOnly<br>";
-    $currEvent = dbFetchOne( 'SELECT M.SaveJPEGs FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = '.$event['Id'] );
-    if ( $currEvent['SaveJPEGs'] == "4" )
+    if ( file_exists( $eventPath.'/snapshot.jpg' ) ) {
         $captImage = "snapshot.jpg";
-    else
+    } else {
         $captImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg", $frame['FrameId'] );
+        if ( ! file_exists( $eventPath.'/'.$captImage ) ) {
+            # Generate the frame JPG
+            if ( $event['DefaultVideo'] ) {
+                $command ='ffmpeg -v 0 -i '.$eventPath.'/'.$Event->DefaultVideo().' -vf "select=gte(n\\,'.$frame['FrameId'].'),setpts=PTS-STARTPTS" '.$eventPath.'/'.$captImage;
+                system( $command, $output, $retval );
+            } else {
+                Error("Can't create frame images from video because there is no video file for this event " );
+            }
+        }
+    }
+
     $captPath = $eventPath.'/'.$captImage;
     $thumbCaptPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$captImage;
     //echo "CI:$captImage, CP:$captPath, TCP:$thumbCaptPath<br>";
 
     $analImage = sprintf( "%0".ZM_EVENT_IMAGE_DIGITS."d-analyse.jpg", $frame['FrameId'] );
     $analPath = $eventPath.'/'.$analImage;
-    $analFile =  ZM_DIR_EVENTS."/".$analPath;
     $thumbAnalPath = ZM_DIR_IMAGES.'/'.$event['Id'].'-'.$analImage;
     //echo "AI:$analImage, AP:$analPath, TAP:$thumbAnalPath<br>";
 
     $alarmFrame = $frame['Type']=='Alarm';
 
-    $hasAnalImage = $alarmFrame && file_exists( $analFile ) && filesize( $analFile );
+    $hasAnalImage = $alarmFrame && file_exists( $analPath ) && filesize( $analPath );
     $isAnalImage = $hasAnalImage && !$captureOnly;
 
     if ( !ZM_WEB_SCALE_THUMBS || $scale >= SCALE_BASE || !function_exists( 'imagecreatefromjpeg' ) )
@@ -1203,22 +1215,20 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
             $thumbPath = $thumbCaptPath;
         }
 
-        $imageFile = ZM_DIR_EVENTS."/".$imagePath;
-        //$thumbFile = ZM_DIR_EVENTS."/".$thumbPath;
         $thumbFile = $thumbPath;
         if ( $overwrite || !file_exists( $thumbFile ) || !filesize( $thumbFile ) )
         {
             // Get new dimensions
-            list( $imageWidth, $imageHeight ) = getimagesize( $imageFile );
+            list( $imageWidth, $imageHeight ) = getimagesize( $imagePath );
             $thumbWidth = $imageWidth * $fraction;
             $thumbHeight = $imageHeight * $fraction;
 
             // Resample
             $thumbImage = imagecreatetruecolor( $thumbWidth, $thumbHeight );
-            $image = imagecreatefromjpeg( $imageFile );
+            $image = imagecreatefromjpeg( $imagePath );
             imagecopyresampled( $thumbImage, $image, 0, 0, 0, 0, $thumbWidth, $thumbHeight, $imageWidth, $imageHeight );
 
-            if ( !imagejpeg( $thumbImage, $thumbFile ) )
+            if ( !imagejpeg( $thumbImage, $thumbPath ) )
                 Error( "Can't create thumbnail '$thumbPath'" );
         }
     }
@@ -1227,15 +1237,13 @@ function getImageSrc( $event, $frame, $scale=SCALE_BASE, $captureOnly=false, $ov
         'eventPath' => $eventPath,
         'imagePath' => $imagePath,
         'thumbPath' => $thumbPath,
-        'imageFile' => $imageFile,
+        'imageFile' => $imagePath,
         'thumbFile' => $thumbFile,
         'imageClass' => $alarmFrame?"alarm":"normal",
         'isAnalImage' => $isAnalImage,
         'hasAnalImage' => $hasAnalImage,
     );
 
-    //echo "IP:$imagePath<br>";
-    //echo "TP:$thumbPath<br>";
     return( $imageData );
 }
 
@@ -1310,26 +1318,30 @@ function executeFilter( $filter )
     return( $status );
 }
 
+# This takes more than one scale amount, so it runs through each and alters dimension.
+# I can't imagine why you would want to do that.
 function reScale( $dimension, $dummy )
 {
+    $new_dimension = $dimension;
     for ( $i = 1; $i < func_num_args(); $i++ )
     {
         $scale = func_get_arg( $i );
         if ( !empty($scale) && $scale != SCALE_BASE )
-            $dimension = (int)(($dimension*$scale)/SCALE_BASE);
+            $new_dimension = (int)(($new_dimension*$scale)/SCALE_BASE);
     }
-    return( $dimension );
+    return( $new_dimension );
 }
 
 function deScale( $dimension, $dummy )
 {
+    $new_dimension = $dimension;
     for ( $i = 1; $i < func_num_args(); $i++ )
     {
         $scale = func_get_arg( $i );
         if ( !empty($scale) && $scale != SCALE_BASE )
-            $dimension = (int)(($dimension*SCALE_BASE)/$scale);
+            $new_dimension = (int)(($new_dimension*SCALE_BASE)/$scale);
     }
-    return( $dimension );
+    return( $new_dimension );
 }
 
 function monitorLimitSql()
@@ -1671,7 +1683,15 @@ function getLoad()
 function getDiskPercent()
 {
     $total = disk_total_space(ZM_DIR_EVENTS);
-    $space = round(($total - disk_free_space(ZM_DIR_EVENTS)) / $total * 100);
+    if ( ! $total ) {
+        Error("disk_total_space returned false for " . ZM_DIR_EVENTS );
+        return 0;
+    }
+    $free = disk_free_space(ZM_DIR_EVENTS);
+    if ( ! $free ) {
+        Error("disk_free_space returned false for " . ZM_DIR_EVENTS );
+    }
+    $space = round(($total - $free) / $total * 100);
     return( $space );
 }
 
@@ -2489,4 +2509,22 @@ function validHtmlStr( $input )
     return( htmlspecialchars( $input, ENT_QUOTES ) );
 }
 
+function getStreamHTML( $monitor, $scale=100 ) {
+//FIXME, the width and height of the image need to be scaled.
+    if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT ) {
+        $streamSrc = $monitor->getStreamSrc( array( "mode=mpeg", "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
+        outputVideoStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), ZM_MPEG_LIVE_FORMAT, $monitor->Name() );
+    } else if ( canStream() ) {
+        $streamSrc = $monitor->getStreamSrc( array( 'mode=jpeg', 'scale='.$scale, 'maxfps='.ZM_WEB_VIDEO_MAXFPS, 'buffer='.$monitor->StreamReplayBuffer() ) );
+        if ( canStreamNative() )
+            outputImageStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+        elseif ( canStreamApplet() )
+            outputHelperStream( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+    } else {
+        $streamSrc = $monitor->getStreamSrc( array( 'mode=single', "scale=".$scale ) );
+        outputImageStill( "liveStream", $streamSrc, reScale( $monitor->Width(), $scale ), reScale( $monitor->Height(), $scale ), $monitor->Name() );
+        Info( "The system has fallen back to single jpeg mode for streaming. Consider enabling Cambozola or upgrading the client browser.");
+    }
+} // end function getStreamHTML
+
 ?>
diff --git a/web/index.php b/web/index.php
index 72e6dc8c0..4beaaa985 100644
--- a/web/index.php
+++ b/web/index.php
@@ -49,6 +49,7 @@ if ( false )
 require_once( 'includes/config.php' );
 require_once( 'includes/logger.php' );
 require_once( 'includes/Server.php' );
+require_once( 'includes/Monitor.php' );
 
 if ( isset($_SERVER["HTTPS"]) && $_SERVER["HTTPS"] == 'on' )
 {
@@ -143,7 +144,7 @@ CORSHeaders();
 // Check for valid content dirs
 if ( !is_writable(ZM_DIR_EVENTS) || !is_writable(ZM_DIR_IMAGES) )
 {
-	Fatal( "Cannot write to content dirs('".ZM_DIR_EVENTS."','".ZM_DIR_IMAGES."').  Check that these exist and are owned by the web account user");
+	Error( "Cannot write to content dirs('".ZM_DIR_EVENTS."','".ZM_DIR_IMAGES."').  Check that these exist and are owned by the web account user");
 }
 
 if ( isset($_REQUEST['view']) )
diff --git a/web/js/Makefile.am b/web/js/Makefile.am
deleted file mode 100644
index 23e027180..000000000
--- a/web/js/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/js
-
-dist_web_DATA = \
-    logger.js \
-    overlay.js \
-    mootools.ext.js \
-    videojs.zoomrotate.js
diff --git a/web/lang/Makefile.am b/web/lang/Makefile.am
deleted file mode 100644
index 22d256a2e..000000000
--- a/web/lang/Makefile.am
+++ /dev/null
@@ -1,25 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/lang
-
-dist_web_DATA = \
-	big5_big5.php \
-	cn_zh.php \
-	cs_cz.php \
-	de_de.php \
-	dk_dk.php \
-	et_ee.php \
-	en_gb.php \
-	en_us.php \
-	es_ar.php \
-	fr_fr.php \
-	he_il.php \
-	hu_hu.php \
-	it_it.php \
-	ja_jp.php \
-	nl_nl.php \
-	pl_pl.php \
-	pt_br.php \
-	ro_ro.php \
-	ru_ru.php \
-	se_se.php
diff --git a/web/lang/big5_big5.php b/web/lang/big5_big5.php
index 7f4b52d9b..631bdc1ce 100644
--- a/web/lang/big5_big5.php
+++ b/web/lang/big5_big5.php
@@ -890,14 +890,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/cn_zh.php b/web/lang/cn_zh.php
index 7b8232e1b..2a17f42ea 100644
--- a/web/lang/cn_zh.php
+++ b/web/lang/cn_zh.php
@@ -885,14 +885,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/cs_cz.php b/web/lang/cs_cz.php
index 88f7b05b7..b4f26145b 100644
--- a/web/lang/cs_cz.php
+++ b/web/lang/cs_cz.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/de_de.php b/web/lang/de_de.php
index 64477ecd2..316c49e1d 100644
--- a/web/lang/de_de.php
+++ b/web/lang/de_de.php
@@ -146,7 +146,7 @@ $SLANG = array(
     'BadLabelY'            => 'Die y-Koordinate der Bezeichnung muss ganzzahlig 0 oder größer sein',
     'BadMaxFPS'            => 'Maximum-FPS muss eine positive Ganzzahl oder eine Gleitkommazahl sein',
     'BadMotionFrameSkip'   => 'Bewegungsrahmen Skip-Zählung muß eine ganze Zahl von null oder mehr betragen,',
-    'BadNameChars'         => 'Namen dürfen nur aus Buchstaben, Zahlen und Trenn- oder Unterstrichen bestehen',
+    'BadNameChars'         => 'Namen dürfen nur aus Buchstaben, Zahlen, Leerzeichen und Trenn- oder Unterstrichen bestehen',
     'BadPalette'           => 'Palette muss auf einen gültigen Wert gesetzt sein', // Added - 2009-03-31
     'BadPath'              => 'Der Pfad muss auf einen gültigen Wert eingestellt sein',
     'BadPort'              => 'Der Port muss auf eine gültige Zahl eingestellt sein',
@@ -889,14 +889,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/dk_dk.php b/web/lang/dk_dk.php
index 8ba852bd2..b04487d1b 100644
--- a/web/lang/dk_dk.php
+++ b/web/lang/dk_dk.php
@@ -145,7 +145,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Navne m� kun indeholde alphanumeric karaktere plus hyphen og underscore',
+    'BadNameChars'         => 'Navne m� kun indeholde alphanumeric karaktere, rum plus hyphen og underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
@@ -887,14 +887,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/en_gb.php b/web/lang/en_gb.php
index 3b1ec9ef3..25714eb02 100644
--- a/web/lang/en_gb.php
+++ b/web/lang/en_gb.php
@@ -156,7 +156,7 @@ $SLANG = array(
     'BadLabelX'             => 'Label X co-ordinate must be set to an integer of zero or more',
     'BadLabelY'             => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'             => 'Maximum FPS must be a positive integer or floating point value',
-    'BadNameChars'          => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'          => 'Names may only contain alphanumeric characters plus spaces, hyphen and underscore',
     'BadPalette'            => 'Palette must be set to a valid value',
     'BadColours'            => 'Target colour must be set to a valid value',
     'BadPath'               => 'Path must be set to a valid value',
@@ -230,6 +230,7 @@ $SLANG = array(
     'ChooseLogFormat'       => 'Choose a log format',
     'ChooseLogSelection'    => 'Choose a log selection',
     'ChoosePreset'          => 'Choose Preset',
+    'CloneMonitor'          => 'Clone Monitor',
     'Close'                 => 'Close',
     'Colour'                => 'Colour',
     'Command'               => 'Command',
@@ -584,6 +585,7 @@ $SLANG = array(
     'Protocol'              => 'Protocol',
     'Rate'                  => 'Rate',
     'RecaptchaWarning'      => 'Your reCaptcha secret key is invalid. Please correct it, or reCaptcha will not work', // added Sep 24 2015 - PP
+	'RecordAudio'			=> 'Whether to store the audio stream when saving an event.',
     'Real'                  => 'Real',
     'Record'                => 'Record',
     'RefImageBlendPct'      => 'Reference Image Blend %ge',
@@ -897,11 +899,11 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
 		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
@@ -926,7 +928,7 @@ $OLANG = array(
                           " camera, instead. You can, however, use a value that is slightly higher than the frame rate in the camera. ".
 		          "In this case, this helps keep the cpu from being overtaxed in the event of a network problem.~~". 
 		          "Some, mostly older, IP cameras support snapshot mode. In this case ZoneMinder is actively polling the camera ".
-		          "for new images. In this case, it is safe to use thie field."
+		          "for new images. In this case, it is safe to use the field."
 	),
 	
 //    'LANG_DEFAULT' => array(
diff --git a/web/lang/es_ar.php b/web/lang/es_ar.php
index cb050361a..0f1b9b70d 100644
--- a/web/lang/es_ar.php
+++ b/web/lang/es_ar.php
@@ -743,14 +743,14 @@ function zmVlang( $langVarArray, $count )
 
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/es_es.php b/web/lang/es_es.php
index d33044ba8..03489b381 100644
--- a/web/lang/es_es.php
+++ b/web/lang/es_es.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'             => 'La coordenada de la etiqueta Y debe ser un entero de cero o más',
     'BadMaxFPS'             => 'MPS máximos debe tener un valor entero positivo o de punto flotante',
     'BadMotionFrameSkip'    => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'          => 'Los nombre sólo pueden contener carácteres alfanuméricos además de guiones y guiones bajos',
+    'BadNameChars'          => 'Los nombre sólo pueden contener carácteres alfanuméricos, espacios además de guiones y guiones bajos',
     'BadPalette'            => 'La paleta debe tener un valor válido',
     'BadPath'               => 'La ruta debe tener un valo válido',
     'BadPort'               => 'El puerto debe ser un número válido',
@@ -794,14 +794,14 @@ function zmVlang( $langVarArray, $count )
 
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/et_ee.php b/web/lang/et_ee.php
index f6777bbf9..b48192507 100644
--- a/web/lang/et_ee.php
+++ b/web/lang/et_ee.php
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/fr_fr.php b/web/lang/fr_fr.php
index 13986efec..6c4eaca22 100644
--- a/web/lang/fr_fr.php
+++ b/web/lang/fr_fr.php
@@ -150,7 +150,7 @@ $SLANG = array(
     'BadLabelY'            => 'La coordonnée Y pour l\'horodatage doit être un entier supérieur ou égal à 0',
     'BadMaxFPS'            => 'Le nombre maximum d\'i/s doit être un entier ou un nombre à virgule flottante supérieur à 0',
     'BadMotionFrameSkip'   => 'Le nombre d\'images à sauter en cas de détection doit être un entier supérieur ou égal à 0',
-    'BadNameChars'         => 'Les noms ne peuvent contenir que des lettres, chiffres, trait d\'union ou souligné',
+    'BadNameChars'         => 'Les noms ne peuvent contenir que des lettres, chiffres, les espaces, trait d\'union ou souligné',
     'BadPalette'           => 'La palette doit être définie', // Added - 2009-03-31
     'BadPath'              => 'Le chemin doit être défini',
     'BadPort'              => 'Le port doit être un nombre entier supérieur ou égal à 0',
@@ -893,14 +893,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/he_il.php b/web/lang/he_il.php
index c452b52bc..69f9348e5 100644
--- a/web/lang/he_il.php
+++ b/web/lang/he_il.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'         => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/hu_hu.php b/web/lang/hu_hu.php
index 564e9d1f6..56f763ae4 100644
--- a/web/lang/hu_hu.php
+++ b/web/lang/hu_hu.php
@@ -929,14 +929,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/it_it.php b/web/lang/it_it.php
index 22b03ef40..d456b3c48 100644
--- a/web/lang/it_it.php
+++ b/web/lang/it_it.php
@@ -891,14 +891,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/ja_jp.php b/web/lang/ja_jp.php
index be18787e4..f3a8aa049 100644
--- a/web/lang/ja_jp.php
+++ b/web/lang/ja_jp.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'         => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/nl_nl.php b/web/lang/nl_nl.php
index 4c3f6a060..1535d02d8 100644
--- a/web/lang/nl_nl.php
+++ b/web/lang/nl_nl.php
@@ -144,7 +144,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate moet een nummer nul of groter zijn',
     'BadMaxFPS'            => 'Maximum FPS moet een positieve integer of floating point waarde zijn',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Namen mogen alleen alpha numerieke karakters bevatten plus hyphens en underscores',
+    'BadNameChars'         => 'Namen mogen alleen alpha numerieke karakters, ruimten bevatten plus hyphens en underscores',
     'BadPalette'           => 'Palette moet een geldige waarde zijn', // Added - 2009-03-31
     'BadPath'              => 'Pad  moet een geldige waarde zijn',
     'BadPort'              => 'Port moet een geldige nummer zijn',
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/pl_pl.php b/web/lang/pl_pl.php
index 14688e189..5f36dedac 100644
--- a/web/lang/pl_pl.php
+++ b/web/lang/pl_pl.php
@@ -865,14 +865,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/pt_br.php b/web/lang/pt_br.php
index 6ac24a837..f47882da5 100644
--- a/web/lang/pt_br.php
+++ b/web/lang/pt_br.php
@@ -826,14 +826,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/ro_ro.php b/web/lang/ro_ro.php
index 761a24527..33d11aa0a 100644
--- a/web/lang/ro_ro.php
+++ b/web/lang/ro_ro.php
@@ -1317,14 +1317,14 @@ $OLANG = array(
     
 // Options on Monitor view
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/ru_ru.php b/web/lang/ru_ru.php
index e12c857d2..5bd27b991 100644
--- a/web/lang/ru_ru.php
+++ b/web/lang/ru_ru.php
@@ -145,7 +145,7 @@ $SLANG = array(
     'BadLabelY'            => 'Label Y co-ordinate must be set to an integer of zero or more',
     'BadMaxFPS'            => 'Maximum FPS must be a positive integer or floating point value',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Names may only contain alphanumeric characters plus hyphen and underscore',
+    'BadNameChars'         => 'Names may only contain alphanumeric characters, spaces plus hyphen and underscore',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'Path must be set to a valid value',
     'BadPort'              => 'Port must be set to a valid number',
@@ -886,14 +886,14 @@ function zmVlang( $langVarArray, $count )
 // So for example, to override the help text for ZM_LANG_DEFAULT do
 $OLANG = array(
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/lang/se_se.php b/web/lang/se_se.php
index eaa712259..afb14e11d 100644
--- a/web/lang/se_se.php
+++ b/web/lang/se_se.php
@@ -145,7 +145,7 @@ $SLANG = array(
     'BadLabelY'            => 'Etiketten f�r Y koordinaten m�ste s�ttas till ett heltal, 0 eller h�gre',
     'BadMaxFPS'            => 'Max. ramar/s m�ste vara ett positivt heltal eller ett flyttal',
     'BadMotionFrameSkip'   => 'Motion Frame skip count must be an integer of zero or more',
-    'BadNameChars'         => 'Namn kan endast inneh�lla alfanumeriska tecken, bindestreck och understreck',
+    'BadNameChars'         => 'Namn kan endast inneh�lla alfanumeriska tecken, utrymmen, bindestreck och understreck',
     'BadPalette'           => 'Palette must be set to a valid value', // Added - 2009-03-31
     'BadPath'              => 'S�kv�gen m�ste inneh�lla ett giltigt v�rde',
     'BadPort'              => 'Porten m�ste inneh�lla ett giltigt nummer',
@@ -890,14 +890,14 @@ $OLANG = array(
         'Help' => "ZoneMinder kan anv�nda annat spr�k �n engelska i menyer och texter. V�lj h�r det spr�k du vill anv�nda till ZoneMinder."
     ),
 	'OPTIONS_FFMPEG' => array(
-		'Help' => "Parameters in this field are passwd on to FFmpeg. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to FFmpeg. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"allowed_media_types=video\" Set datatype to request fromcam (audio, video, data)~~~~".
 		          "\"reorder_queue_size=nnn\" Set number of packets to buffer for handling of reordered packets~~~~".
-		          "\"loglevel=debug\" Set verbosiy of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
+		          "\"loglevel=debug\" Set verbosity of FFmpeg (quiet, panic, fatal, error, warning, info, verbose, debug)"
 	),
 	'OPTIONS_LIBVLC' => array(
-		'Help' => "Parameters in this field are passwd on to libVLC. Multiple parameters can be separated by ,~~ ".
+		'Help' => "Parameters in this field are passed on to libVLC. Multiple parameters can be separated by ,~~ ".
 		          "Examples (do not enter quotes)~~~~".
 		          "\"--rtp-client-port=nnn\" Set local port to use for rtp data~~~~". 
 		          "\"--verbose=2\" Set verbosity of libVLC"
diff --git a/web/skins/Makefile.am b/web/skins/Makefile.am
deleted file mode 100644
index ae0abd8e8..000000000
--- a/web/skins/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	classic \
-	mobile \
-	xml
diff --git a/web/skins/classic/Makefile.am b/web/skins/classic/Makefile.am
deleted file mode 100644
index 986beae0d..000000000
--- a/web/skins/classic/Makefile.am
+++ /dev/null
@@ -1,15 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	js \
-	lang \
-	views
-
-dist_web_DATA = \
-    skin.php
diff --git a/web/skins/classic/ajax/Makefile.am b/web/skins/classic/ajax/Makefile.am
deleted file mode 100644
index f910cbc5c..000000000
--- a/web/skins/classic/ajax/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/ajax
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/classic/css/Makefile.am b/web/skins/classic/css/Makefile.am
deleted file mode 100644
index 2c43d2e47..000000000
--- a/web/skins/classic/css/Makefile.am
+++ /dev/null
@@ -1,7 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css
-
-SUBDIRS = dark \
-		flat \
-		classic
diff --git a/web/skins/classic/css/classic/Makefile.am b/web/skins/classic/css/classic/Makefile.am
deleted file mode 100644
index 48dc58ab7..000000000
--- a/web/skins/classic/css/classic/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/classic
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/classic/views/Makefile.am b/web/skins/classic/css/classic/views/Makefile.am
deleted file mode 100644
index d07eaac4f..000000000
--- a/web/skins/classic/css/classic/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/classic/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/classic/views/zone.css b/web/skins/classic/css/classic/views/zone.css
index a86c5d1e4..52611f5ea 100644
--- a/web/skins/classic/css/classic/views/zone.css
+++ b/web/skins/classic/css/classic/views/zone.css
@@ -93,3 +93,23 @@
 #zonePoints table a {
     margin: 0 2px;
 }
+.zones polygon {
+	fill-opacity: 0.25;
+	stroke-width: 2px;
+}
+.Active {
+	stroke: #ff0000;
+	fill: #ff0000;
+}
+.Inclusive {
+	stroke: #FFA500;
+	fill: #FFA500;
+}
+.Exclusive {
+	stroke: #800080;
+	fill: #800080;
+}
+.Preclusive {
+	stroke: #0000FF;
+	fill: #0000FF;
+}
diff --git a/web/skins/classic/css/classic/views/zones.css b/web/skins/classic/css/classic/views/zones.css
new file mode 100644
index 000000000..9952e5db4
--- /dev/null
+++ b/web/skins/classic/css/classic/views/zones.css
@@ -0,0 +1,20 @@
+.zones polygon {
+	fill-opacity: 0.25;
+	stroke-width: 2px;
+}
+.Active {
+	stroke: #ff0000;
+	fill: #ff0000;
+}
+.Inclusive {
+	stroke: #FFA500;
+	fill: #FFA500;
+}
+.Exclusive {
+	stroke: #800080;
+	fill: #800080;
+}
+.Preclusive {
+	stroke: #0000FF;
+	fill: #0000FF;
+}
diff --git a/web/skins/classic/css/dark/Makefile.am b/web/skins/classic/css/dark/Makefile.am
deleted file mode 100644
index 6961860eb..000000000
--- a/web/skins/classic/css/dark/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/dark
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/dark/views/Makefile.am b/web/skins/classic/css/dark/views/Makefile.am
deleted file mode 100644
index 2180d6432..000000000
--- a/web/skins/classic/css/dark/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/dark/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/dark/views/zone.css b/web/skins/classic/css/dark/views/zone.css
index a86c5d1e4..52611f5ea 100644
--- a/web/skins/classic/css/dark/views/zone.css
+++ b/web/skins/classic/css/dark/views/zone.css
@@ -93,3 +93,23 @@
 #zonePoints table a {
     margin: 0 2px;
 }
+.zones polygon {
+	fill-opacity: 0.25;
+	stroke-width: 2px;
+}
+.Active {
+	stroke: #ff0000;
+	fill: #ff0000;
+}
+.Inclusive {
+	stroke: #FFA500;
+	fill: #FFA500;
+}
+.Exclusive {
+	stroke: #800080;
+	fill: #800080;
+}
+.Preclusive {
+	stroke: #0000FF;
+	fill: #0000FF;
+}
diff --git a/web/skins/classic/css/dark/views/zones.css b/web/skins/classic/css/dark/views/zones.css
new file mode 100644
index 000000000..9952e5db4
--- /dev/null
+++ b/web/skins/classic/css/dark/views/zones.css
@@ -0,0 +1,20 @@
+.zones polygon {
+	fill-opacity: 0.25;
+	stroke-width: 2px;
+}
+.Active {
+	stroke: #ff0000;
+	fill: #ff0000;
+}
+.Inclusive {
+	stroke: #FFA500;
+	fill: #FFA500;
+}
+.Exclusive {
+	stroke: #800080;
+	fill: #800080;
+}
+.Preclusive {
+	stroke: #0000FF;
+	fill: #0000FF;
+}
diff --git a/web/skins/classic/css/flat/Makefile.am b/web/skins/classic/css/flat/Makefile.am
deleted file mode 100644
index 297982929..000000000
--- a/web/skins/classic/css/flat/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/flat
-
-SUBDIRS = views
-
-dist_web_DATA = \
-	skin.css \
-	control.css \
-	export.css
diff --git a/web/skins/classic/css/flat/views/Makefile.am b/web/skins/classic/css/flat/views/Makefile.am
deleted file mode 100644
index dff0aa29b..000000000
--- a/web/skins/classic/css/flat/views/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/css/flat/views
-
-dist_web_DATA = \
-	console.css \
-	controlcaps.css \
-	control.css \
-	devices.css \
-	event.css \
-	events.css \
-	export.css \
-	filter.css \
-	frame.css \
-	frames.css \
-	groups.css \
-	log.css \
-	monitor.css \
-	montage_2wide.css \
-	montage_3wide50enlarge.css \
-	montage_3wide.css \
-	montage_4wide.css \
-	montage.css \
-	montage_freeform.css \
-	options.css \
-	stats.css \
-	timeline.css \
-	timeline.css.php \
-	video.css \
-	watch.css \
-	zone.css
diff --git a/web/skins/classic/css/flat/views/zone.css b/web/skins/classic/css/flat/views/zone.css
index a86c5d1e4..52611f5ea 100644
--- a/web/skins/classic/css/flat/views/zone.css
+++ b/web/skins/classic/css/flat/views/zone.css
@@ -93,3 +93,23 @@
 #zonePoints table a {
     margin: 0 2px;
 }
+.zones polygon {
+	fill-opacity: 0.25;
+	stroke-width: 2px;
+}
+.Active {
+	stroke: #ff0000;
+	fill: #ff0000;
+}
+.Inclusive {
+	stroke: #FFA500;
+	fill: #FFA500;
+}
+.Exclusive {
+	stroke: #800080;
+	fill: #800080;
+}
+.Preclusive {
+	stroke: #0000FF;
+	fill: #0000FF;
+}
diff --git a/web/skins/classic/css/flat/views/zones.css b/web/skins/classic/css/flat/views/zones.css
new file mode 100644
index 000000000..9952e5db4
--- /dev/null
+++ b/web/skins/classic/css/flat/views/zones.css
@@ -0,0 +1,20 @@
+.zones polygon {
+	fill-opacity: 0.25;
+	stroke-width: 2px;
+}
+.Active {
+	stroke: #ff0000;
+	fill: #ff0000;
+}
+.Inclusive {
+	stroke: #FFA500;
+	fill: #FFA500;
+}
+.Exclusive {
+	stroke: #800080;
+	fill: #800080;
+}
+.Preclusive {
+	stroke: #0000FF;
+	fill: #0000FF;
+}
diff --git a/web/skins/classic/graphics/Makefile.am b/web/skins/classic/graphics/Makefile.am
deleted file mode 100644
index c5c7b6bba..000000000
--- a/web/skins/classic/graphics/Makefile.am
+++ /dev/null
@@ -1,23 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/graphics
-
-dist_web_DATA =  \
-	arrow-d.gif \
-	arrow-dl.gif \
-	arrow-dr.gif \
-	arrow-l-d.gif \
-	arrow-l.gif \
-	arrow-l-u.gif \
-	arrow-r.gif \
-	arrow-s-d.gif \
-	arrow-s-u.gif \
-	arrow-u.gif \
-	arrow-ul.gif \
-	arrow-ur.gif \
-	center.gif \
-	point-g.gif \
-	point-o.gif \
-	point-r.gif \
-	seq-d.gif \
-	seq-u.gif
diff --git a/web/skins/classic/includes/Makefile.am b/web/skins/classic/includes/Makefile.am
deleted file mode 100644
index 690df231a..000000000
--- a/web/skins/classic/includes/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php \
-	control_functions.php \
-	export_functions.php \
-	timeline_functions.php
diff --git a/web/skins/classic/js/Makefile.am b/web/skins/classic/js/Makefile.am
deleted file mode 100644
index 3f5ffdda2..000000000
--- a/web/skins/classic/js/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/js
-
-dist_web_DATA = \
-	skin.js \
-	classic.js \
-	dark.js \
-	flat.js \
-	skin.js.php
diff --git a/web/skins/classic/lang/Makefile.am b/web/skins/classic/lang/Makefile.am
deleted file mode 100644
index 6a089b4fa..000000000
--- a/web/skins/classic/lang/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/lang
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/classic/views/Makefile.am b/web/skins/classic/views/Makefile.am
deleted file mode 100644
index 4167a886b..000000000
--- a/web/skins/classic/views/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	js
-
-webdir = @WEB_PREFIX@/skins/classic/views
-
-dist_web_DATA = \
-	bandwidth.php \
-	blank.php \
-	console.php \
-	controlcap.php \
-	controlcaps.php \
-	control.php \
-	controlpreset.php \
-	cycle.php \
-	device.php \
-	devices.php \
-	donate.php \
-	error.php \
-	eventdetail.php \
-	event.php \
-	events.php \
-	export.php \
-	filter.php \
-	filtersave.php \
-	frame.php \
-	frames.php \
-	function.php \
-	group.php \
-	groups.php \
-	log.php \
-	login.php \
-	logout.php \
-	Makefile.am \
-	monitor.php \
-	monitorpreset.php \
-	monitorprobe.php \
-	montage.php \
-    montagereview.php \
-	none.php \
-  onvifprobe.php \
-	optionhelp.php \
-	options.php \
-	postlogin.php \
-	server.php \
-	settings.php \
-	state.php \
-	stats.php \
-	status.php \
-	timeline.php \
-	user.php \
-	version.php \
-	video.php \
-	watch.php \
-	zone.php \
-	zones.php
diff --git a/web/skins/classic/views/console.php b/web/skins/classic/views/console.php
index 070c85b59..dbf0ea2f4 100644
--- a/web/skins/classic/views/console.php
+++ b/web/skins/classic/views/console.php
@@ -77,8 +77,8 @@ $run_state = dbFetchOne('select Name from States where  IsActive = 1', 'Name' );
 
 $group = NULL;
 if ( ! empty($_COOKIE['zmGroup']) ) {
-	if ( $group = dbFetchOne( 'select * from Groups where Id = ?', NULL, array($_COOKIE['zmGroup'])) )
-		$groupIds = array_flip(explode( ',', $group['MonitorIds'] ));
+    if ( $group = dbFetchOne( 'select * from Groups where Id = ?', NULL, array($_COOKIE['zmGroup'])) )
+        $groupIds = array_flip(explode( ',', $group['MonitorIds'] ));
 }
 
 noCacheHeaders();
@@ -182,6 +182,7 @@ $seqDownFile = getSkinFile( 'graphics/seq-d.gif' );
 
 $versionClass = (ZM_DYN_DB_VERSION&&(ZM_DYN_DB_VERSION!=ZM_VERSION))?'errorText':'';
 
+
 xhtmlHeaders( __FILE__, translate('Console') );
 ?>
 <body>
@@ -243,7 +244,7 @@ else
             <th class="colName"><?php echo translate('Name') ?></th>
             <th class="colFunction"><?php echo translate('Function') ?></th>
 <?php if ( count($servers) ) { ?>
-			<th class="colServer"><?php echo translate('Server') ?></th>
+            <th class="colServer"><?php echo translate('Server') ?></th>
 <?php } ?>
             <th class="colSource"><?php echo translate('Source') ?></th>
 <?php
@@ -270,7 +271,8 @@ if ( canEdit('Monitors') )
           <tr>
             <td class="colLeftButtons" colspan="<?php echo count($servers) ? 4 : 3 ?>">
               <input type="button" value="<?php echo translate('Refresh') ?>" onclick="location.reload(true);"/>
-              <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?>
+          <input type="button" name="addBtn" value="<?php echo translate('AddNewMonitor') ?>" onclick="addMonitor( this )"/>
+              <!-- <?php echo makePopupButton( '?view=monitor', 'zmMonitor0', 'monitor', translate('AddNewMonitor'), (canEdit( 'Monitors' ) && !$user['MonitorIds']) ) ?> -->
               <?php echo makePopupButton( '?view=filter&amp;filter[terms][0][attr]=DateTime&amp;filter[terms][0][op]=%3c&amp;filter[terms][0][val]=now', 'zmFilter', 'filter', translate('Filters'), canView( 'Events' ) ) ?>
             </td>
 <?php
@@ -297,7 +299,7 @@ foreach( $displayMonitors as $monitor )
         $dclass = "errorText";
     else
     {
-	// https://github.com/ZoneMinder/ZoneMinder/issues/1082
+    // https://github.com/ZoneMinder/ZoneMinder/issues/1082
         if ( !$monitor['zma'] && $monitor['Function']!='Monitor' )
             $dclass = "warnText";
         else
@@ -316,7 +318,7 @@ foreach( $displayMonitors as $monitor )
             <td class="colName"><?php echo makePopupLink( '?view=watch&amp;mid='.$monitor['Id'], 'zmWatch'.$monitor['Id'], array( 'watch', reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ) ), $monitor['Name'], $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
             <td class="colFunction"><?php echo makePopupLink( '?view=function&amp;mid='.$monitor['Id'], 'zmFunction', 'function', '<span class="'.$fclass.'">'.translate('Fn'.$monitor['Function']).( empty($monitor['Enabled']) ? ', disabled' : '' ) .'</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php if ( count($servers) ) { ?>
-			<td class="colServer"><?php 
+            <td class="colServer"><?php 
 $Server = new Server( $monitor['ServerId'] );
 echo $Server->Name();
  ?></td>
@@ -330,9 +332,9 @@ echo $Server->Name();
 <?php } elseif ( $monitor['Type'] == "Ffmpeg" || $monitor['Type'] == "Libvlc" ) {
     $domain = parse_url( $monitor['Path'], PHP_URL_HOST );
     $shortpath = $domain ? $domain : preg_replace( '/^.*\//', '', $monitor['Path'] );
-	if ( $shortpath == '' ) {
-		$shortpath = 'Monitor ' . $monitor['Id'];
-	}
+    if ( $shortpath == '' ) {
+        $shortpath = 'Monitor ' . $monitor['Id'];
+    }
 ?>
             <td class="colSource"><?php echo makePopupLink( '?view=monitor&amp;mid='.$monitor['Id'], 'zmMonitor'.$monitor['Id'], 'monitor', '<span class="'.$dclass.'">'.$shortpath.'</span>', canEdit( 'Monitors' ) ) ?></td>
 <?php } elseif ( $monitor['Type'] == "cURL" ) { ?>
diff --git a/web/skins/classic/views/event.php b/web/skins/classic/views/event.php
index 8b146cc7d..94e564dfa 100644
--- a/web/skins/classic/views/event.php
+++ b/web/skins/classic/views/event.php
@@ -27,7 +27,7 @@ if ( !canView( 'Events' ) )
 $eid = validInt( $_REQUEST['eid'] );
 $fid = !empty($_REQUEST['fid'])?validInt($_REQUEST['fid']):1;
 
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.Width,M.Height,M.DefaultRate,M.DefaultScale,M.VideoWriter,M.SaveJPEGs,M.Orientation,M.LabelFormat FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
+$sql = 'SELECT E.*,M.Name AS MonitorName,E.Width,E.Height,M.DefaultRate,M.DefaultScale,M.VideoWriter,M.SaveJPEGs,M.Orientation,M.LabelFormat FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
 $sql_values = array( $eid );
 
 if ( $user['MonitorIds'] ) {
@@ -55,7 +55,7 @@ $replayModes = array(
 if ( isset( $_REQUEST['streamMode'] ) )
     $streamMode = validHtmlStr($_REQUEST['streamMode']);
 else
-    $streamMode = video;
+    $streamMode = 'video';
 
 if ( isset( $_REQUEST['replayMode'] ) )
     $replayMode = validHtmlStr($_REQUEST['replayMode']);
@@ -124,29 +124,29 @@ if ( canEdit( 'Events' ) )
 if ( canView( 'Events' ) )
 {
 ?>
-				<div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo translate('Frames') ?></a></div>
+        <div id="framesEvent"><a href="#" onclick="showEventFrames()"><?php echo translate('Frames') ?></a></div>
 <?php
 if ( $event['SaveJPEGs'] & 3 )
 {
 ?>
-				<div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?php echo translate('Stills') ?></a></div>
+        <div id="stillsEvent"<?php if ( $streamMode == 'still' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showStills()"><?php echo translate('Stills') ?></a></div>
 <?php
 }
 ?>
-				<div id="videoEvent"<?php if ( $streamMode == 'video' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showVideo()"><?php echo translate('Video') ?></a></div>
-				<div id="exportEvent"><a href="#" onclick="exportEvent()"><?php echo translate('Export')  ?></a></div>
-			</div>
-			<div id="eventVideo" class="">
-<?php 
+        <div id="videoEvent"<?php if ( $streamMode == 'video' ) { ?> class="hidden"<?php } ?>><a href="#" onclick="showVideo()"><?php echo translate('Video') ?></a></div>
+        <div id="exportEvent"><a href="#" onclick="exportEvent()"><?php echo translate('Export')  ?></a></div>
+      </div>
+      <div id="eventVideo" class="">
+<?php
 if ( $event['DefaultVideo'] )
-{ 
+{
 ?>
-				<div id="videoFeed">
-					<video id="videoobj" class="video-js vjs-default-skin" width="<?php echo reScale( $event['Width'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $scale ) ?>" data-setup='{ "controls": true, "playbackRates": [0.5, 1, 1.5, 2, 4, 8, 16, 32, 64, 128, 256], "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "rotate": "<?php echo $Rotation ?>", "zoom": "<?php echo $Zoom ?>"}}}'>
-					<source src="<?php echo getEventDefaultVideoPath($event) ?>" type="video/mp4">
-					Your browser does not support the video tag.
-					</video>
-				</div>
+        <div id="videoFeed">
+          <video id="videoobj" class="video-js vjs-default-skin" width="<?php echo reScale( $event['Width'], $scale ) ?>" height="<?php echo reScale( $event['Height'], $scale ) ?>" data-setup='{ "controls": true, "playbackRates": [0.5, 1, 1.5, 2, 4, 8, 16, 32, 64, 128, 256], "autoplay": true, "preload": "auto", "plugins": { "zoomrotate": { "rotate": "<?php echo $Rotation ?>", "zoom": "<?php echo $Zoom ?>"}}}'>
+          <source src="<?php echo getEventDefaultVideoPath($event) ?>" type="video/mp4">
+          Your browser does not support the video tag.
+          </video>
+        </div>
 <!--script>includeVideoJs();</script-->
 <link href="//vjs.zencdn.net/4.11/video-js.css" rel="stylesheet">
 <script src="//vjs.zencdn.net/4.11/video.js"></script>
@@ -165,7 +165,7 @@ addVideoTimingTrack(document.getElementById('videoobj'), LabelFormat, monitorNam
 else
 {
 ?>
-				<div id="imageFeed">
+        <div id="imageFeed">
 <?php
 if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
 {
@@ -212,12 +212,12 @@ else
 <?php
         }
 ?>
-		</div>    
-<?php				    
+    </div>
+<?php
 }
 ?>
-				</div>
-			</div>
+        </div>
+      </div>
 <?php
 if ($event['SaveJPEGs'] & 3)
 {
diff --git a/web/skins/classic/views/events.php b/web/skins/classic/views/events.php
index 7d0669177..b7d707b22 100644
--- a/web/skins/classic/views/events.php
+++ b/web/skins/classic/views/events.php
@@ -66,13 +66,11 @@ if ( !empty($limit) && $nEvents > $limit )
     $nEvents = $limit;
 }
 $pages = (int)ceil($nEvents/ZM_WEB_EVENTS_PER_PAGE);
-if ( $pages > 1 ) {
-    if ( !empty($page) ) {
-        if ( $page < 0 )
-            $page = 1;
-        if ( $page > $pages )
-            $page = $pages;
-    }
+if ( !empty($page) ) {
+    if ( $page < 0 )
+        $page = 1;
+    if ( $page > $pages )
+        $page = $pages;
 }
 if ( !empty($page) ) {
     $limitStart = (($page-1)*ZM_WEB_EVENTS_PER_PAGE);
diff --git a/web/skins/classic/views/group.php b/web/skins/classic/views/group.php
index 758b81f9e..1236835b9 100644
--- a/web/skins/classic/views/group.php
+++ b/web/skins/classic/views/group.php
@@ -67,7 +67,7 @@ xhtmlHeaders( __FILE__, translate('Group')." - ".$newGroup['Name'] );
         if ( visibleMonitor( $monitor['Id'] ) )
         {
 ?>
-                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?>><?php echo validHtmlStr($monitor['Name']) ?></option>
+                  <option value="<?php echo $monitor['Id'] ?>"<?php if ( array_key_exists( $monitor['Id'], $monitorIds ) ) { ?> selected="selected"<?php } ?> onclick="configureButtons( this );"><?php echo validHtmlStr($monitor['Name']) ?></option>
 <?php
         }
     }
@@ -78,7 +78,7 @@ xhtmlHeaders( __FILE__, translate('Group')." - ".$newGroup['Name'] );
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Groups' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="submit" name="saveBtn" value="<?php echo translate('Save') ?>" disabled="disabled" />
           <input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
       </form>
diff --git a/web/skins/classic/views/js/Makefile.am b/web/skins/classic/views/js/Makefile.am
deleted file mode 100644
index 73c74fafe..000000000
--- a/web/skins/classic/views/js/Makefile.am
+++ /dev/null
@@ -1,50 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/classic/views/js
-
-dist_web_DATA = \
-	console.js \
-	console.js.php \
-	control.js \
-	controlpreset.js \
-	controlpreset.js.php \
-	cycle.js \
-	cycle.js.php \
-	devices.js \
-	donate.js \
-	donate.js.php \
-	event.js \
-	event.js.php \
-	events.js \
-	events.js.php \
-	export.js \
-	export.js.php \
-	filter.js \
-	filter.js.php \
-	group.js \
-	groups.js \
-	log.js \
-	login.js \
-	Makefile.am \
-	monitor.js \
-	monitor.js.php \
-	monitorpreset.js \
-	monitorprobe.js \
-	montage.js \
-	montage.js.php \
-  onvifprobe.js \
-	options.js.php \
-	postlogin.js.php \
-	state.js \
-	state.js.php \
-	timeline.js \
-	timeline.js.php \
-	user.js \
-	version.js \
-	version.js.php \
-	video.js \
-	video.js.php \
-	watch.js \
-	watch.js.php \
-	zone.js \
-	zone.js.php
diff --git a/web/skins/classic/views/js/console.js b/web/skins/classic/views/js/console.js
index 5182a5fd5..99f175c23 100644
--- a/web/skins/classic/views/js/console.js
+++ b/web/skins/classic/views/js/console.js
@@ -1,3 +1,6 @@
+var jsTranslatedAddText;
+var jsTranslatedCloneText;
+
 function setButtonStates( element )
 {
     var form = element.form;
@@ -15,9 +18,36 @@ function setButtonStates( element )
     }
     $(element).getParent( 'tr' ).toggleClass( 'highlight' );
     form.editBtn.disabled = (checked!=1);
+    form.addBtn.value = (checked==1) ? jsTranslatedCloneText:jsTranslatedAddText;
+
     form.deleteBtn.disabled = (checked==0);
 }
 
+function addMonitor( element)
+{
+
+	  var form = element.form;
+		var dupParam;
+	  var monitorId=-1;
+	  if (form.addBtn.value == jsTranslatedCloneText)
+    {
+	  	// get the value of the first checkbox
+		 for ( var i = 0; i < form.elements.length; i++ )
+		 {
+				if ( form.elements[i].type == "checkbox" )
+				{
+					if ( form.elements[i].checked )
+					{
+						monitorId = form.elements[i].value;
+						break;
+					}
+				}
+			}
+	  }
+	  dupParam = (monitorId == -1 ) ? '': '&dupId='+monitorId;
+    createPopup( '?view=monitor'+dupParam, 'zmMonitor0','monitor' );
+}
+
 function editMonitor( element )
 {
     var form = element.form;
@@ -55,6 +85,8 @@ function reloadWindow()
 
 function initPage()
 {
+		jsTranslatedAddText = translatedAddText;
+	  jsTranslatedCloneText = translatedCloneText;
     reloadWindow.periodical( consoleRefreshTimeout );
     if ( showVersionPopup )
         createPopup( '?view=version', 'zmVersion', 'version' );
diff --git a/web/skins/classic/views/js/console.js.php b/web/skins/classic/views/js/console.js.php
index 93cf0cdb7..98417a985 100644
--- a/web/skins/classic/views/js/console.js.php
+++ b/web/skins/classic/views/js/console.js.php
@@ -26,7 +26,7 @@ elseif ( ZM_DYN_SHOW_DONATE_REMINDER )
 ?>
 var showVersionPopup = <?php echo isset($showVersionPopup )?'true':'false' ?>;
 var showDonatePopup = <?php echo isset($showDonatePopup )?'true':'false' ?>;
-
-
+var translatedAddText = "<?php echo translate('AddNewMonitor') ?>";
+var translatedCloneText = "<?php echo translate('CloneMonitor') ?>";
 
 
diff --git a/web/skins/classic/views/js/group.js b/web/skins/classic/views/js/group.js
index 7a5b0318e..c1ab79581 100644
--- a/web/skins/classic/views/js/group.js
+++ b/web/skins/classic/views/js/group.js
@@ -8,4 +8,12 @@ if ( refreshParent )
     opener.location.reload(true);
 }
 
+function configureButtons( element ) {
+
+    if ( canEditGroups ) {
+        var form = element.form;
+        form.saveBtn.disabled = (element.value == 0);
+    }
+}
+
 window.focus();
diff --git a/web/skins/classic/views/js/monitor.js.php b/web/skins/classic/views/js/monitor.js.php
index 1ceba3fff..833b8f441 100644
--- a/web/skins/classic/views/js/monitor.js.php
+++ b/web/skins/classic/views/js/monitor.js.php
@@ -59,7 +59,7 @@ function validateForm( form )
 {
     var errors = new Array();
 
-    if ( form.elements['newMonitor[Name]'].value.search( /[^\w-]/ ) >= 0 )
+    if ( form.elements['newMonitor[Name]'].value.search( /[^\w- ]/ ) >= 0 )
         errors[errors.length] = "<?php echo translate('BadNameChars') ?>";
     else if ( form.elements.mid.value == 0 && monitorNames[form.elements['newMonitor[Name]'].value] )
         errors[errors.length] = "<?php echo translate('DuplicateMonitorName') ?>";
diff --git a/web/skins/classic/views/js/montage.js b/web/skins/classic/views/js/montage.js
index fe4559201..1367bc8b1 100644
--- a/web/skins/classic/views/js/montage.js
+++ b/web/skins/classic/views/js/montage.js
@@ -35,6 +35,7 @@ function Monitor( index, id, connKey )
         if ( this.streamCmdTimer )
             this.streamCmdTimer = clearTimeout( this.streamCmdTimer );
 
+        var stream = document.getElementById( "liveStream"+this.id );
         if ( respObj.result == 'Ok' )
         {
             this.status = respObj.status;
@@ -57,7 +58,6 @@ function Monitor( index, id, connKey )
             this.setStateClass( $('monitor'+this.index), stateClass );
 
             /*Stream could be an applet so can't use moo tools*/ 
-            var stream = document.getElementById( "liveStream"+this.id );
             stream.className = stateClass;
 
             var isAlarmed = ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT );
@@ -90,6 +90,10 @@ function Monitor( index, id, connKey )
         else
         {
             console.error( respObj.message );
+            // Try to reload the image stream.
+            if ( stream )
+                stream.src = stream.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
+
         }
         var streamCmdTimeout = statusRefreshTimeout;
         if ( this.alarmState == STATE_ALARM || this.alarmState == STATE_ALERT )
diff --git a/web/skins/classic/views/js/watch.js b/web/skins/classic/views/js/watch.js
index 9c39c897a..264a4b65f 100644
--- a/web/skins/classic/views/js/watch.js
+++ b/web/skins/classic/views/js/watch.js
@@ -37,9 +37,14 @@ function changeScale()
 
     /*Stream could be an applet so can't use moo tools*/ 
     var streamImg = document.getElementById('liveStream');
-    streamImg.style.width = newWidth + "px";
-    streamImg.style.height = newHeight + "px";
+    if ( streamImg ) {
+        streamImg.style.width = newWidth + "px";
+        streamImg.style.height = newHeight + "px";
 
+        streamImg.src = streamImg.src.replace(/scale=\d+/i,'scale='+scale);
+    } else {
+        console.error("No element found for liveStream.");
+    }
 }
 
 var alarmState = STATE_IDLE;
@@ -205,8 +210,13 @@ function getStreamCmdResponse( respObj, respText )
             $('enableDisableAlarms').removeClass( 'hidden' );
         }
     }
-    else
+    else {
         checkStreamForErrors("getStreamCmdResponse",respObj);//log them
+        // Try to reload the image stream.
+        var streamImg = document.getElementById('liveStream');
+        if ( streamImg )
+            streamImg.src = streamImg.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
+    }
 
     var streamCmdTimeout = statusRefreshTimeout;
     if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
diff --git a/web/skins/classic/views/js/zone.js b/web/skins/classic/views/js/zone.js
index 43d51e3a8..a5d666e69 100644
--- a/web/skins/classic/views/js/zone.js
+++ b/web/skins/classic/views/js/zone.js
@@ -304,19 +304,6 @@ function unsetActivePoint( index )
     $('point'+index).removeClass( 'active' );
 }
 
-function updateZoneImageResponse( respObj, respText )
-{
-    if ( respObj.result == 'Ok' )
-    {
-        document.zoneForm.elements['submitBtn'].disabled = ( selfIntersecting = respObj.selfIntersecting );
-        document.zoneForm.elements['newZone[Area]'].value = zone.Area = respObj.area;
-        if ( document.zoneForm.elements['newZone[Units]'].value == 'Pixels' )
-            document.zoneForm.elements['newZone[TempArea]'].value = document.zoneForm.elements['newZone[Area]'].value;
-        
-        var newImage = new Asset.image( respObj.zoneImage, { 'onload': function() { $('zoneImage').src = newImage.src; } } );
-    }
-}
-
 function getCoordString()
 {
     var coords = new Array();
@@ -327,9 +314,15 @@ function getCoordString()
 
 function updateZoneImage()
 {
-    var parms = "view=request&request=zone&action=zoneImage&mid="+zone.MonitorId+"&zid="+zone.Id+"&coords="+getCoordString();
-    var query = new Request.JSON( { url: thisUrl, method: 'post', timeout: AJAX_TIMEOUT, data: parms, onSuccess: updateZoneImageResponse } );
-    query.send();
+    var SVG = $('zoneSVG');
+    var Poly = $('zonePoly');
+    Poly.points.clear();
+    for ( var i = 0; i < zone['Points'].length; i++ ) {
+        var Point = SVG.createSVGPoint();
+        Point.x = zone['Points'][i].x;
+        Point.y = zone['Points'][i].y;
+       Poly.points.appendItem( Point );
+    }
 }
 
 function fixActivePoint( index )
@@ -360,6 +353,10 @@ function updateActivePoint( index )
     $('newZone[Points]['+index+'][y]').value = y;
     zone['Points'][index].x = x;
     zone['Points'][index].y = y;
+    var Point =  $('zonePoly').points.getItem(index);
+    Point.x =x;
+    Point.y =y;
+
 }
 
 function addPoint( index )
@@ -374,6 +371,7 @@ function addPoint( index )
     else
         zone['Points'].splice( nextIndex, 0, { 'x': newX, 'y': newY } );
     drawZonePoints();
+    updateZoneImage();
     //setActivePoint( nextIndex );
 }
 
@@ -397,8 +395,9 @@ function updateX( index )
 
     point.setStyle( 'left', x+'px' );
     zone['Points'][index].x = x;
-
-    updateZoneImage();
+    var Point =  $('zonePoly').points.getItem(index);
+    Point.x =x;
+    Point.y =y;
 }
 
 function updateY( index )
@@ -410,8 +409,9 @@ function updateY( index )
 
     point.setStyle( 'top', y+'px' );
     zone['Points'][index].y = y;
-
-    updateZoneImage();
+    var Point =  $('zonePoly').points.getItem(index);
+    Point.x =x;
+    Point.y =y;
 }
 
 function saveChanges( element )
@@ -471,10 +471,215 @@ function drawZonePoints()
 
         row.inject( tables[i%tables.length].getElement( 'tbody' ) );
     }
+    // Sets up the SVG polygon
+    updateZoneImage();
 }
 
-function initPage()
+//
+// Imported from watch.js and modified for new zone edit view
+//
+
+var alarmState = STATE_IDLE;
+var lastAlarmState = STATE_IDLE;
+
+function setAlarmState( currentAlarmState ) {
+    alarmState = currentAlarmState;
+
+    var stateString = "Unknown";
+    var stateClass = "";
+    if ( alarmState == STATE_ALARM )
+        stateClass = "alarm";
+    else if ( alarmState == STATE_ALERT )
+        stateClass = "alert";
+    $('stateValue').set( 'text', stateStrings[alarmState] );
+    if ( stateClass )
+        $('stateValue').setProperty( 'class', stateClass );
+    else
+        $('stateValue').removeProperty( 'class' );
+
+    var isAlarmed = ( alarmState == STATE_ALARM || alarmState == STATE_ALERT );
+    var wasAlarmed = ( lastAlarmState == STATE_ALARM || lastAlarmState == STATE_ALERT );
+
+    var newAlarm = ( isAlarmed && !wasAlarmed );
+    var oldAlarm = ( !isAlarmed && wasAlarmed );
+
+    if ( newAlarm )
+    {
+        if ( SOUND_ON_ALARM )
+        {
+            // Enable the alarm sound
+            if ( !canPlayPauseAudio )
+                $('alarmSound').removeClass( 'hidden' );
+            else
+                $('MediaPlayer').Play();
+        }
+    }
+    if ( SOUND_ON_ALARM )
+    {
+        if ( oldAlarm )
+        {
+            // Disable alarm sound
+            if ( !canPlayPauseAudio )
+                $('alarmSound').addClass( 'hidden' );
+            else
+                $('MediaPlayer').Stop();
+        }
+    }
+    lastAlarmState = alarmState;
+}
+
+var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStreamCmdResponse } );
+var streamCmdTimer = null;
+
+var streamStatus;
+
+function getStreamCmdResponse( respObj, respText ) {
+    watchdogOk("stream");
+    if ( streamCmdTimer )
+        streamCmdTimer = clearTimeout( streamCmdTimer );
+
+    if ( respObj.result == 'Ok' ) {
+        streamStatus = respObj.status;
+        $('fpsValue').set( 'text', streamStatus.fps );
+
+        setAlarmState( streamStatus.state );
+
+        var delayString = secsToTime( streamStatus.delay );
+
+        if ( streamStatus.paused == true )
+        {
+            streamCmdPause( false );
+        } else if ( streamStatus.delayed == true && streamStatus.rate == 1 ) {
+                streamCmdPlay( false );
+        }
+    } else {
+        checkStreamForErrors("getStreamCmdResponse",respObj);//log them
+        // Try to reload the image stream.
+        var streamImg = document.getElementById('liveStream');
+        if ( streamImg )
+            streamImg.src = streamImg.src.replace(/rand=\d+/i,'rand='+Math.floor((Math.random() * 1000000) ));
+    }
+
+    var streamCmdTimeout = statusRefreshTimeout;
+    if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
+        streamCmdTimeout = streamCmdTimeout/5;
+    streamCmdTimer = streamCmdQuery.delay( streamCmdTimeout );
+} 
+
+var streamPause = false;
+
+function streamCmdPauseToggle() {
+  if ( streamPause == true ) {
+    streamCmdPlay( true );
+    streamPause = false;
+    document.getElementById("pauseBtn").value = pauseString;
+  } else {
+    streamCmdPause( true );
+    streamPause = true;
+    document.getElementById("pauseBtn").value = playString;
+  }
+}
+
+function streamCmdPause( action ) {
+    if ( action )
+        streamCmdReq.send( streamCmdParms+"&command="+CMD_PAUSE );
+}
+
+function streamCmdPlay( action )
 {
+    if ( action )
+        streamCmdReq.send( streamCmdParms+"&command="+CMD_PLAY );
+}
+
+function streamCmdStop( action ) {
+    if ( action )
+        streamCmdReq.send( streamCmdParms+"&command="+CMD_STOP );
+}
+
+function streamCmdQuery() {
+    streamCmdReq.send( streamCmdParms+"&command="+CMD_QUERY );
+}       
+
+var statusCmdParms = "view=request&request=status&entity=monitor&id="+monitorId+"&element[]=Status&element[]=FrameRate";
+var statusCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', data: statusCmdParms, timeout: AJAX_TIMEOUT, link: 'cancel', onSuccess: getStatusCmdResponse } );
+var statusCmdTimer = null;
+
+function getStatusCmdResponse( respObj, respText ) {
+    watchdogOk("status");
+    if ( statusCmdTimer )
+        statusCmdTimer = clearTimeout( statusCmdTimer );
+
+    if ( respObj.result == 'Ok' )
+    {
+        $('fpsValue').set( 'text', respObj.monitor.FrameRate );
+        setAlarmState( respObj.monitor.Status );
+    }
+    else
+        checkStreamForErrors("getStatusCmdResponse",respObj);
+
+    var statusCmdTimeout = statusRefreshTimeout;
+    if ( alarmState == STATE_ALARM || alarmState == STATE_ALERT )
+        statusCmdTimeout = statusCmdTimeout/5;
+    statusCmdTimer = statusCmdQuery.delay( statusCmdTimeout );
+} 
+
+function statusCmdQuery() {
+    statusCmdReq.send();
+}
+
+var tempImage = null;
+
+function fetchImage( streamImage ) {
+    var now = new Date();
+    if ( !tempImage )
+        tempImage = new Element( 'img' );
+    tempImage.setProperty( 'src', streamSrc+'&'+now.getTime() );
+    $(streamImage).setProperty( 'src', tempImage.getProperty( 'src' ) );
+}
+
+function appletRefresh() {
+    if ( streamStatus && (!streamStatus.paused && !streamStatus.delayed) )
+    {
+        var streamImg = $('liveStream');
+        var parent = streamImg.getParent();
+        streamImg.dispose();
+        streamImg.inject( parent );
+        if ( appletRefreshTime )
+            appletRefresh.delay( appletRefreshTime*1000 );
+    }
+    else
+    {
+        appletRefresh.delay( 15*1000 ); //if we are paused or delayed check every 15 seconds if we are live yet...
+    }
+}
+
+var watchdogInactive = {
+    'stream': false,
+    'status': false
+};
+
+var watchdogFunctions = {
+    'stream': streamCmdQuery,
+    'status': statusCmdQuery
+};
+
+//Make sure the various refreshes are still taking effect
+function watchdogCheck( type ) {
+    if ( watchdogInactive[type] ) {
+        console.log( "Detected streamWatch of type: " + type + " stopped, restarting" );
+        watchdogFunctions[type]();
+        watchdogInactive[type] = false;
+    } else {
+        watchdogInactive[type] = true;
+    }
+}
+
+function watchdogOk( type ) {
+    watchdogInactive[type] = false;
+}
+
+function initPage() {
     var form = document.zoneForm;
 
     //form.elements['newZone[Name]'].disabled = true;
@@ -501,13 +706,37 @@ function initPage()
 
     applyZoneType();
 
-    if ( form.elements['newZone[Units]'].value == 'Percent' )
-    {
+    if ( form.elements['newZone[Units]'].value == 'Percent' ) {
         applyZoneUnits();
     }
 
     applyCheckMethod();
     drawZonePoints();
+
+//
+// Imported from watch.js and modified for new zone edit view
+//
+
+    if ( streamMode == "single" ) {
+        statusCmdTimer = statusCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
+        watchdogCheck.pass('status').periodical(statusRefreshTimeout*2);
+    } else {
+        streamCmdTimer = streamCmdQuery.delay( (Math.random()+0.1)*statusRefreshTimeout );
+        watchdogCheck.pass('stream').periodical(statusRefreshTimeout*2);
+    }
+
+    if ( canStreamNative || streamMode == "single" ) {
+        var streamImg = $('imageFrame').getElement('img');
+        if ( !streamImg )
+            streamImg = $('imageFrame').getElement('object');
+        if ( streamMode == "single" ) {
+            streamImg.addEvent( 'click', fetchImage.pass( streamImg ) );
+            fetchImage.pass( streamImg ).periodical( imageRefreshTimeout );
+        }
+    }
+
+    if ( refreshApplet && appletRefreshTime )
+        appletRefresh.delay( appletRefreshTime*1000 );
 }
 
 window.addEvent( 'domready', initPage );
diff --git a/web/skins/classic/views/js/zone.js.php b/web/skins/classic/views/js/zone.js.php
index 7e3145378..85f606d2a 100644
--- a/web/skins/classic/views/js/zone.js.php
+++ b/web/skins/classic/views/js/zone.js.php
@@ -46,8 +46,8 @@ zone['Points'][<?php echo $i ?>] = { 'x': <?php echo $newZone['Points'][$i]['x']
 }
 ?>
 
-var maxX = <?php echo $monitor['Width']-1 ?>;
-var maxY = <?php echo $monitor['Height']-1 ?>;
+var maxX = <?php echo $monitor->Width()-1 ?>;
+var maxY = <?php echo $monitor->Height()-1 ?>;
 var selfIntersecting = <?php echo $selfIntersecting?'true':'false' ?>;
 
 var selfIntersectingString = '<?php echo addslashes(translate('SelfIntersecting')) ?>';
@@ -65,3 +65,55 @@ var minBlobAreaLtMaxString = '<?php echo addslashes(translate('MinBlobAreaLtMax'
 var minBlobLtMinFilterString = '<?php echo addslashes(translate('MinBlobLtMinFilter')) ?>';
 var minBlobsUnsetString = '<?php echo addslashes(translate('MinBlobsUnset')) ?>';
 var minBlobsLtMaxString = '<?php echo addslashes(translate('MinBlobsLtMax')) ?>';
+
+//
+// Imported from watch.js.php and modified for new zone edit view
+//
+
+var STATE_IDLE = <?php echo STATE_IDLE ?>;
+var STATE_PREALARM = <?php echo STATE_PREALARM ?>;
+var STATE_ALARM = <?php echo STATE_ALARM ?>;
+var STATE_ALERT = <?php echo STATE_ALERT ?>;
+var STATE_TAPE = <?php echo STATE_TAPE ?>;
+
+var stateStrings = new Array();
+stateStrings[STATE_IDLE] = "<?php echo translate('Idle') ?>";
+stateStrings[STATE_PREALARM] = "<?php echo translate('Idle') ?>";
+stateStrings[STATE_ALARM] = "<?php echo translate('Alarm') ?>";
+stateStrings[STATE_ALERT] = "<?php echo translate('Alert') ?>";
+stateStrings[STATE_TAPE] = "<?php echo translate('Record') ?>";
+
+var pauseString = "<?php echo translate('Pause') ?>";
+var playString = "<?php echo translate('Play') ?>";
+
+var deleteString = "<?php echo translate('Delete') ?>";
+
+var CMD_PAUSE = <?php echo CMD_PAUSE ?>;
+var CMD_PLAY = <?php echo CMD_PLAY ?>;
+var CMD_STOP = <?php echo CMD_STOP ?>;
+var CMD_QUERY = <?php echo CMD_QUERY ?>;
+
+var SCALE_BASE = <?php echo SCALE_BASE ?>;
+
+var SOUND_ON_ALARM = <?php echo ZM_WEB_SOUND_ON_ALARM ?>;
+
+var streamMode = "<?php echo $streamMode ?>";
+
+var connKey = '<?php echo $connkey ?>';
+
+var monitorId = <?php echo $monitor->Id() ?>;
+var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
+
+var streamSrc = "<?php echo preg_replace( '/&amp;/', '&', $streamSrc ) ?>";
+
+var statusRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_STATUS ?>;
+var imageRefreshTimeout = <?php echo 1000*ZM_WEB_REFRESH_IMAGE ?>;
+
+var canEditMonitors = <?php echo canEdit( 'Monitors' )?'true':'false' ?>;
+var canStreamNative = <?php echo canStreamNative()?'true':'false' ?>;
+
+var canPlayPauseAudio = Browser.ie;
+
+var refreshApplet = <?php echo (canStreamApplet() && $streamMode == "jpeg")?'true':'false' ?>;
+var appletRefreshTime = <?php echo ZM_RELOAD_CAMBOZOLA ?>;
+
diff --git a/web/skins/classic/views/js/zones.js b/web/skins/classic/views/js/zones.js
new file mode 100644
index 000000000..b453ab4f5
--- /dev/null
+++ b/web/skins/classic/views/js/zones.js
@@ -0,0 +1,8 @@
+var streamCmdParms = "view=request&request=stream&connkey="+connKey;
+var streamCmdReq = new Request.JSON( { url: monitorUrl+thisUrl, method: 'post', timeout: AJAX_TIMEOUT, link: 'cancel' } );
+
+function streamCmdQuit( action ) {
+    if ( action )
+        streamCmdReq.send( streamCmdParms+"&command="+CMD_QUIT );
+}
+
diff --git a/web/skins/classic/views/js/zones.js.php b/web/skins/classic/views/js/zones.js.php
new file mode 100644
index 000000000..ca234085e
--- /dev/null
+++ b/web/skins/classic/views/js/zones.js.php
@@ -0,0 +1,4 @@
+var connKey = '<?php echo $connkey ?>';
+var monitorUrl = '<?php echo ( $monitor->Server()->Url() ) ?>';
+var CMD_QUIT = <?php echo CMD_QUIT ?>;
+
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index bd06aa49a..82c9a595f 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -43,11 +43,11 @@ if ( isset($_REQUEST['tab']) )
 else
     $tab = "general";
 
-	$Server = null;
+  $Server = null;
     if ( defined( 'ZM_SERVER_ID' ) ) {
         $Server = dbFetchOne( 'SELECT * FROM Servers WHERE Id=?', NULL, array( ZM_SERVER_ID ) );
-	}
-	if ( ! $Server ) {
+  }
+  if ( ! $Server ) {
         $Server = array( 'Id' => '' );
     }
 
@@ -57,77 +57,11 @@ if ( ! empty($_REQUEST['mid']) ) {
         $x10Monitor = dbFetchOne( 'SELECT * FROM TriggersX10 WHERE MonitorId = ?', NULL, array($_REQUEST['mid']) );
 } else {
 
-    $nextId = getTableAutoInc( 'Monitors' );
-    $monitor = array(
-        'Id' => 0,
-        'Name' => translate('Monitor').'-'.$nextId,
-        'Function' => "Monitor",
-        'Enabled' => true,
-        'LinkedMonitors' => "",
-        'Type' => "",
-        'Device' => "/dev/video0",
-        'Channel' => "0",
-        'Format' => 0x000000ff,
-        'Protocol' => "",
-        'Method' => "",
-        'Host' => "",
-        'Path' => "",
-        'Options' => "",
-        'Port' => "80",
-        'User' => "",
-        'Pass' => "",
-        'Colours' => 3,
-        'Palette' => 0,
-        'Width' => "320",
-        'Height' => "240",
-        'Orientation' => "0",
-        'Deinterlacing' => 0,
-        'RTSPDescribe' => 0,
-        'SaveJPEGs' => "3",
-        'VideoWriter' => "0",
-        'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
-        'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
-        'LabelX' => 0,
-        'LabelY' => 0,
-        'LabelSize' => 1,
-        'ImageBufferCount' => 50,
-        'WarmupCount' => 25,
-        'PreEventCount' => 25,
-        'PostEventCount' => 25,
-        'StreamReplayBuffer' => 1000,
-        'AlarmFrameCount' => 1,
-        'Controllable' => 0,
-        'ControlId' => "",
-        'ControlType' => 0,
-        'ControlDevice' => "",
-        'ControlAddress' => "",
-        'AutoStopTimeout' => "",
-        'TrackMotion' => 0,
-        'TrackDelay' => "",
-        'ReturnLocation' => -1,
-        'ReturnDelay' => "",
-        'SectionLength' => 600,
-        'FrameSkip' => 0,
-        'MotionFrameSkip' => 0,
-        'EventPrefix' => 'Event-',
-        'AnalysisFPS' => "",
-        'AnalysisUpdateDelay' => 0,
-        'MaxFPS' => "",
-        'AlarmMaxFPS' => "",
-        'FPSReportInterval' => 1000,
-        'RefBlendPerc' => 6,
-        'AlarmRefBlendPerc' => 6,
-        'DefaultView' => 'Events',
-        'DefaultRate' => '100',
-        'DefaultScale' => '100',
-        'SignalCheckColour' => '#0000c0',
-        'WebColour' => 'red',
-        'Exif' => '0',
-        'Triggers' => "",
-		'V4LMultiBuffer'	=>	'',
-		'V4LCapturesPerFrame'	=>	1,
-		'ServerId'	=>	$Server['Id'],
-    );
+  $nextId = getTableAutoInc( 'Monitors' );
+  $monitor = getMonitorObject($_REQUEST['dupId']);
+  $clonedName = $monitor['Name'];
+  $monitor['Name'] = translate('Monitor').'-'.$nextId;
+  $monitor['Id']='0';
 }
 
 if ( ZM_OPT_X10 && empty($x10Monitor) )
@@ -139,6 +73,89 @@ if ( ZM_OPT_X10 && empty($x10Monitor) )
     );
 }
 
+function getMonitorObject( $mid = null) 
+{
+    if ($mid !== null)
+    {
+      $monitor = dbFetchMonitor($mid);
+    }
+    else
+    {
+          $monitor = array(
+                'Id' => 0,
+                'Name' => "willbereplaced",
+                'Function' => "Monitor",
+                'Enabled' => true,
+                'LinkedMonitors' => "",
+                'Type' => "",
+                'Device' => "/dev/video0",
+                'Channel' => "0",
+                'Format' => 0x000000ff,
+                'Protocol' => "",
+                'Method' => "",
+                'Host' => "",
+                'Path' => "",
+                'Options' => "",
+                'Port' => "80",
+                'User' => "",
+                'Pass' => "",
+                'Colours' => 3,
+                'Palette' => 0,
+                'Width' => "320",
+                'Height' => "240",
+                'Orientation' => "0",
+                'Deinterlacing' => 0,
+                'RTSPDescribe' => 0,
+                'SaveJPEGs' => "3",
+                'VideoWriter' => "0",
+                'EncoderParameters' => "# Lines beginning with # are a comment \n# For changing quality, use the crf option\n# 1 is best, 51 is worst quality\n#crf=23\n",
+                'RecordAudio' => "0",
+                'LabelFormat' => '%N - %d/%m/%y %H:%M:%S',
+                'LabelX' => 0,
+                'LabelY' => 0,
+                'LabelSize' => 1,
+                'ImageBufferCount' => 50,
+                'WarmupCount' => 25,
+                'PreEventCount' => 25,
+                'PostEventCount' => 25,
+                'StreamReplayBuffer' => 1000,
+                'AlarmFrameCount' => 1,
+                'Controllable' => 0,
+                'ControlId' => "",
+                'ControlType' => 0,
+                'ControlDevice' => "",
+                'ControlAddress' => "",
+                'AutoStopTimeout' => "",
+                'TrackMotion' => 0,
+                'TrackDelay' => "",
+                'ReturnLocation' => -1,
+                'ReturnDelay' => "",
+                'SectionLength' => 600,
+                'FrameSkip' => 0,
+                'MotionFrameSkip' => 0,
+                'EventPrefix' => 'Event-',
+                'AnalysisFPS' => "",
+                'AnalysisUpdateDelay' => 0,
+                'MaxFPS' => "",
+                'AlarmMaxFPS' => "",
+                'FPSReportInterval' => 1000,
+                'RefBlendPerc' => 6,
+                'AlarmRefBlendPerc' => 6,
+                'DefaultView' => 'Events',
+                'DefaultRate' => '100',
+                'DefaultScale' => '100',
+                'SignalCheckColour' => '#0000c0',
+                'WebColour' => 'red',
+                'Exif' => '0',
+                'Triggers' => "",
+            'V4LMultiBuffer'  =>  '',
+            'V4LCapturesPerFrame' =>  1,
+            'ServerId'  =>  $Server['Id'],
+            );
+      }
+      return ($monitor);
+}
+
 function fourcc( $a, $b, $c, $d )
 {
     return( ord($a) | (ord($b) << 8) | (ord($c) << 16) | (ord($d) << 24) );
@@ -158,6 +175,8 @@ else
         $newX10Monitor = $x10Monitor;
 }
 
+$newMonitor['Name'] = trim($newMonitor['Name']);
+
 if ( $newMonitor['AnalysisFPS'] == '0.00' )
     $newMonitor['AnalysisFPS'] = '';
 if ( $newMonitor['MaxFPS'] == '0.00' )
@@ -466,16 +485,31 @@ xhtmlHeaders(__FILE__, translate('Monitor')." - ".validHtmlStr($monitor['Name'])
 if ( canEdit( 'Monitors' ) )
 {
 ?>
+
+<?php
+if ( isset ($_REQUEST['dupId']))
+{
+  $dupId = $_REQUEST['dupId'];
+?>
+
+<div class="alert alert-info">
+  Configuration cloned from Monitor: <?php echo $clonedName ?>
+</div>
+
+<?php 
+}
+?>
+
       <div id="headerButtons">
         <a href="#" onclick="createPopup( '?view=monitorprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorProbe<?php echo $monitor['Id'] ?>', 'monitorprobe' ); return( false );"><?php echo translate('Probe') ?></a>
-	<?php
-	if ( ZM_HAS_ONVIF )
-	{
-	?>
-	        <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
-	<?php
-	}
-	?>
+  <?php
+  if ( ZM_HAS_ONVIF )
+  {
+  ?>
+          <a href="#" onclick="createPopup( '?view=onvifprobe&amp;mid=<?php echo $monitor['Id'] ?>', 'zmOnvifProbe<?php echo $monitor['Id'] ?>', 'onvifprobe' ); return( false );"><?php echo  translate('OnvifProbe') ?></a>
+  <?php
+  }
+  ?>
         <a href="#" onclick="createPopup( '?view=monitorpreset&amp;mid=<?php echo $monitor['Id'] ?>', 'zmMonitorPreset<?php echo $monitor['Id'] ?>', 'monitorpreset' ); return( false );"><?php echo translate('Presets') ?></a>
       </div>
 <?php
@@ -591,6 +625,7 @@ if ( $tab != 'storage' )
     <input type="hidden" name="newMonitor[SaveJPEGs]" value="<?php echo validHtmlStr($newMonitor['SaveJPEGs']) ?>"/>
     <input type="hidden" name="newMonitor[VideoWriter]" value="<?php echo validHtmlStr($newMonitor['VideoWriter']) ?>"/>
     <input type="hidden" name="newMonitor[EncoderParameters]" value="<?php echo validHtmlStr($newMonitor['EncoderParameters']) ?>"/>
+    <input type="hidden" name="newMonitor[RecordAudio]" value="<?php echo validHtmlStr($newMonitor['RecordAudio']) ?>"/>
 <?php
 }
 if ( $tab != 'source' || ($newMonitor['Type'] != 'Remote' && $newMonitor['Protocol'] != 'RTSP'))
@@ -675,14 +710,14 @@ switch ( $tab )
             <tr><td><?php echo translate('Name') ?></td><td><input type="text" name="newMonitor[Name]" value="<?php echo validHtmlStr($newMonitor['Name']) ?>" size="16"/></td></tr>
             <tr><td><?php echo translate('Server') ?></td><td>
 <?php 
-	$servers = array(''=>'None');
-	$result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
-	$results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
-	foreach ( $results as $row => $server_obj ) {
-		$servers[$server_obj->Id] = $server_obj->Name();
-	}
+  $servers = array(''=>'None');
+  $result = dbQuery( 'SELECT * FROM Servers ORDER BY Name');
+  $results = $result->fetchALL(PDO::FETCH_CLASS | PDO::FETCH_PROPS_LATE, 'Server' );
+  foreach ( $results as $row => $server_obj ) {
+    $servers[$server_obj->Id] = $server_obj->Name();
+  }
 ?>
-	<?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
+  <?php echo buildSelect( "newMonitor[ServerId]", $servers ); ?>
 </td></tr>
             <tr><td><?php echo translate('SourceType') ?></td><td><?php echo buildSelect( "newMonitor[Type]", $sourceTypes ); ?></td></tr>
             <tr><td><?php echo translate('Function') ?></td><td><select name="newMonitor[Function]">
@@ -733,13 +768,13 @@ switch ( $tab )
             <tr><td><?php echo translate('AlarmMaximumFPS') ?></td><td><input type="text" name="newMonitor[AlarmMaxFPS]" value="<?php echo validHtmlStr($newMonitor['AlarmMaxFPS']) ?>" size="5"/></td></tr>
 <?php
     }
-	if ( ZM_FAST_IMAGE_BLENDS )
+  if ( ZM_FAST_IMAGE_BLENDS )
         {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><select name="newMonitor[RefBlendPerc]"><?php foreach ( $fastblendopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['RefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('AlmRefImageBlendPct') ?></td><td><select name="newMonitor[AlarmRefBlendPerc]"><?php foreach ( $fastblendopts_alarm as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['AlarmRefBlendPerc'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
 <?php
-	} else {
+  } else {
 ?>
             <tr><td><?php echo translate('RefImageBlendPct') ?></td><td><input type="text" name="newMonitor[RefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['RefBlendPerc']) ?>" size="4"/></td></tr>
             <tr><td><?php echo translate('AlarmRefImageBlendPct') ?></td><td><input type="text" name="newMonitor[AlarmRefBlendPerc]" value="<?php echo validHtmlStr($newMonitor['AlarmRefBlendPerc']) ?>" size="4"/></td></tr>
@@ -799,15 +834,15 @@ switch ( $tab )
 <?php
             }
 ?>
-			<tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
-				<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
-				<label for="newMonitor[V4LMultiBuffer]1">Yes</label>
-				<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
-				<label for="newMonitor[V4LMultiBuffer]0">No</label>
-				<input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
-				<label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
-			</td></tr>
-			<tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
+      <tr><td><?php echo translate('V4LMultiBuffer') ?></td><td>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]1" value="1" <?php echo ( $newMonitor['V4LMultiBuffer'] == 1 ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]1">Yes</label>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]0" value="0" <?php echo ( $newMonitor['V4LMultiBuffer'] == 0 ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]0">No</label>
+        <input type="radio" name="newMonitor[V4LMultiBuffer]" id="newMonitor[V4LMultiBuffer]" value="" <?php echo ( empty($newMonitor['V4LMultiBuffer']) ? 'checked="checked"' : '' ) ?>/>
+        <label for="newMonitor[V4LMultiBuffer]">Use Config Value</label>
+      </td></tr>
+      <tr><td><?php echo translate('V4LCapturesPerFrame') ?></td><td><input type="number" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo $newMonitor['V4LCapturesPerFrame'] ?>"/></td></tr>
 <?php
         }
         elseif ( $newMonitor['Type'] == "Remote" )
@@ -850,9 +885,9 @@ switch ( $tab )
         elseif ( $newMonitor['Type'] == "Ffmpeg" || $newMonitor['Type'] == "Libvlc")
         {
 ?>
-			<tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
+      <tr><td><?php echo translate('SourcePath') ?></td><td><input type="text" name="newMonitor[Path]" value="<?php echo validHtmlStr($newMonitor['Path']) ?>" size="36"/></td></tr>
             <tr><td><?php echo translate('RemoteMethod') ?></td><td><?php echo buildSelect( "newMonitor[Method]", $rtspMethods ); ?></td></tr>
-			<tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
+      <tr><td><?php echo translate('Options') ?>&nbsp;(<?php echo makePopupLink( '?view=optionhelp&amp;option=OPTIONS_'.strtoupper($newMonitor['Type']), 'zmOptionHelp', 'optionhelp', '?' ) ?>)</td><td><input type="text" name="newMonitor[Options]" value="<?php echo validHtmlStr($newMonitor['Options']) ?>" size="36"/></td></tr>
 <?php
         }
 ?>
@@ -889,6 +924,7 @@ switch ( $tab )
             <tr><td><?php echo translate('SaveJPEGs') ?></td><td><select name="newMonitor[SaveJPEGs]"><?php foreach ( $savejpegopts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['SaveJPEGs'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('VideoWriter') ?></td><td><select name="newMonitor[VideoWriter]"><?php foreach ( $videowriteropts as $name => $value ) { ?><option value="<?php echo $value ?>"<?php if ( $value == $newMonitor['VideoWriter'] ) { ?> selected="selected"<?php } ?>><?php echo $name ?></option><?php } ?></select></td></tr>
             <tr><td><?php echo translate('OptionalEncoderParam') ?></td><td><textarea name="newMonitor[EncoderParameters]" rows="4" cols="36"><?php echo validHtmlStr($newMonitor['EncoderParameters']) ?></textarea></td></tr>
+            <tr><td><?php echo translate('RecordAudio') ?></td><td><input type="checkbox" name="newMonitor[RecordAudio]" value="1"<?php if ( !empty($newMonitor['RecordAudio']) ) { ?> checked="checked"<?php } ?>/></td></tr>
 <?php
         break;
     case 'timestamp' :
@@ -987,8 +1023,9 @@ switch ( $tab )
         <div id="contentButtons">
           <input type="submit" value="<?php echo translate('Save') ?>"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
         </div>
+        
       </form>
     </div>
-  </div>
+    </div>
 </body>
 </html>
diff --git a/web/skins/classic/views/onvifprobe.php b/web/skins/classic/views/onvifprobe.php
index c15568eaf..700246936 100644
--- a/web/skins/classic/views/onvifprobe.php
+++ b/web/skins/classic/views/onvifprobe.php
@@ -242,8 +242,9 @@ else if($_REQUEST['step'] == "2")
        // copy technical details
        $monitor['Width']  = $profile['Width'];
        $monitor['Height'] = $profile['Height'];
-       $monitor['MaxFPS'] = $profile['MaxFPS'];
-       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
+// The maxfps fields do not work for ip streams. Can re-enable if that is fixed.
+//       $monitor['MaxFPS'] = $profile['MaxFPS'];
+//       $monitor['AlarmMaxFPS'] = $profile['AlarmMaxFPS'];
        $monitor['Path'] = $profile['Path'];
 //       $sourceDesc = htmlspecialchars(serialize($monitor));
        $sourceDesc = base64_encode(serialize($monitor));
diff --git a/web/skins/classic/views/options.php b/web/skins/classic/views/options.php
index 9c3b4a418..1140b7bfd 100644
--- a/web/skins/classic/views/options.php
+++ b/web/skins/classic/views/options.php
@@ -42,8 +42,6 @@ $tabs['x10'] = translate('X10');
 $tabs['highband'] = translate('HighBW');
 $tabs['medband'] = translate('MediumBW');
 $tabs['lowband'] = translate('LowBW');
-$tabs['phoneband'] = translate('PhoneBW');
-$tabs['eyeZm'] = "eyeZm";
 $tabs['users'] = translate('Users');
 
 if ( isset($_REQUEST['tab']) )
diff --git a/web/skins/classic/views/zone.php b/web/skins/classic/views/zone.php
index 69c0919e9..498ea5502 100644
--- a/web/skins/classic/views/zone.php
+++ b/web/skins/classic/views/zone.php
@@ -29,7 +29,7 @@ $zid = !empty($_REQUEST['zid'])?validInt($_REQUEST['zid']):0;
 
 $scale = SCALE_BASE;
 
-$hicolor = "0x00ff00"; // Green
+$hicolor = '0x00ff00'; // Green
 
 $presets = array();
 $presetNames = array();
@@ -59,28 +59,28 @@ foreach ( getEnumValues( 'Zones', 'CheckMethod' ) as $optCheckMethod )
     $optCheckMethods[$optCheckMethod] = $optCheckMethod;
 }
 
-$monitor = dbFetchMonitor ( $mid );
+$monitor = new Monitor( $mid );
 
 $minX = 0;
-$maxX = $monitor['Width']-1;
+$maxX = $monitor->Width()-1;
 $minY = 0;
-$maxY = $monitor['Height']-1;
+$maxY = $monitor->Height()-1;
 
 if ( !isset($newZone) )
 {
     if ( $zid > 0 )
     {
-        $zone = dbFetchOne( 'SELECT * FROM Zones WHERE MonitorId = ? AND Id=?', NULL, array( $monitor['Id'], $zid ) );
+        $zone = dbFetchOne( 'SELECT * FROM Zones WHERE MonitorId = ? AND Id=?', NULL, array( $monitor->Id(), $zid ) );
     }
     else
     {
         $zone = array(
             'Name' => translate('New'),
             'Id' => 0,
-            'MonitorId' => $monitor['Id'],
+            'MonitorId' => $monitor->Id(),
             'NumCoords' => 4,
             'Coords' => sprintf( "%d,%d %d,%d, %d,%d %d,%d", $minX, $minY, $maxX, $minY, $maxX, $maxY, $minX, $maxY ),
-            'Area' => $monitor['Width'] * $monitor['Height'],
+            'Area' => $monitor->Width() * $monitor->Height(),
             'AlarmRGB' => 0xff0000,
             'CheckMethod' => 'Blobs',
             'MinPixelThreshold' => '',
@@ -100,6 +100,7 @@ if ( !isset($newZone) )
         );
     }
     $zone['Points'] = coordsToPoints( $zone['Coords'] );
+    $zone['AreaCoords'] = preg_replace( '/\s+/', ',', $zone['Coords'] );
 
     $newZone = $zone;
 }
@@ -115,23 +116,15 @@ $newZone['Coords'] = pointsToCoords( $newZone['Points'] );
 $newZone['Area'] = getPolyArea( $newZone['Points'] );
 $selfIntersecting = isSelfIntersecting( $newZone['Points'] );
 
-$wd = getcwd();
-chdir( ZM_DIR_IMAGES );
-$command = getZmuCommand( " -m ".$mid." -z" );
-$command .= '"'.$zid.' '.$hicolor.' '.$newZone['Coords'].'"';
-$status = exec( escapeshellcmd( $command ) );
-chdir( $wd );
-
-$zoneImage = ZM_DIR_IMAGES.'/Zones'.$monitor['Id'].'.jpg?'.time();
-
 $focusWindow = true;
+$connkey = generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Zone') );
 ?>
 <body>
   <div id="page">
     <div id="header">
-      <h2><?php echo translate('Monitor') ?> <?php echo $monitor['Name'] ?> - <?php echo translate('Zone') ?> <?php echo $newZone['Name'] ?></h2>
+      <h2><?php echo translate('Monitor') ?> <?php echo $monitor->Name() ?> - <?php echo translate('Zone') ?> <?php echo $newZone['Name'] ?></h2>
     </div>
     <div id="content">
       <form name="zoneForm" id="zoneForm" method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
@@ -217,10 +210,15 @@ xhtmlHeaders(__FILE__, translate('Zone') );
         </div>
         <div id="definitionPanel">
           <div id="imagePanel">
-            <div id="imageFrame" style="width: <?php echo reScale( $monitor['Width'], $scale ) ?>px; height: <?php echo reScale( $monitor['Height'], $scale ) ?>px;">
-              <img name="zoneImage" id="zoneImage" src="<?php echo $zoneImage ?>" width="<?php echo reScale( $monitor['Width'], $scale ) ?>" height="<?php echo reScale( $monitor['Height'], $scale ) ?>" alt="Zone Image"/>
+            <div id="imageFrame" style="width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;">
+                <?php echo getStreamHTML( $monitor, $scale ); ?>
+                <svg id="zoneSVG" class="zones" style="width: <?php echo reScale( $monitor->Width(), $scale ) ?>px; height: <?php echo reScale( $monitor->Height(), $scale ) ?>px;margin-top: -<?php echo $monitor->Height ?>px;background: none;">
+                  <polygon id="zonePoly" points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type'] ?>"/>
+                  Sorry, your browser does not support inline SVG
+                </svg>
             </div>
           </div>
+          <div id="monitorState"><?php echo translate('State') ?>:&nbsp;<span id="stateValue"></span>&nbsp;-&nbsp;<span id="fpsValue"></span>&nbsp;fps</div>
           <table id="zonePoints" cellspacing="0">
             <tbody>
               <tr>
@@ -269,7 +267,7 @@ for ( $i = 0; $i < $pointCols; $i++ )
               </tr>
             </tbody>
           </table>
-          <input type="submit" id="submitBtn" name="submitBtn" value="<?php echo translate('Save') ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="closeWindow()"/>
+          <input id="pauseBtn" type="button" value="<?php echo translate('Pause') ?>" onclick="streamCmdPauseToggle()"/><input type="submit" id="submitBtn" name="submitBtn" value="<?php echo translate('Save') ?>" onclick="return saveChanges( this )"<?php if (!canEdit( 'Monitors' ) || (false && $selfIntersecting)) { ?> disabled="disabled"<?php } ?>/><input type="button" value="<?php echo translate('Cancel') ?>" onclick="refreshParentWindow(); closeWindow();"/>
         </div>
       </form>
     </div>
diff --git a/web/skins/classic/views/zones.php b/web/skins/classic/views/zones.php
index 9182dc98f..3aa776c6b 100644
--- a/web/skins/classic/views/zones.php
+++ b/web/skins/classic/views/zones.php
@@ -25,12 +25,7 @@ if ( !canView( 'Monitors' ) )
 }
 
 $mid = validInt($_REQUEST['mid']);
-$wd = getcwd();
-chdir( ZM_DIR_IMAGES );
-$status = exec( escapeshellcmd( getZmuCommand( " -m ".$mid." -z" ) ) );
-chdir( $wd );
-
-$monitor = dbFetchMonitor( $mid );
+$monitor = new Monitor( $mid );
 
 $zones = array();
 foreach( dbFetchAll( 'select * from Zones where MonitorId = ? order by Area desc', NULL, array($mid) ) as $row )
@@ -42,7 +37,7 @@ foreach( dbFetchAll( 'select * from Zones where MonitorId = ? order by Area desc
     }
 }
 
-$image = 'Zones'.$monitor['Id'].'.jpg';
+$connkey = generateConnKey();
 
 xhtmlHeaders(__FILE__, translate('Zones') );
 ?>
@@ -53,18 +48,17 @@ xhtmlHeaders(__FILE__, translate('Zones') );
       <h2><?php echo translate('Zones') ?></h2>
     </div>
     <div id="content">
-      <map name="zoneMap" id="zoneMap">
+      <?php echo getStreamHTML( $monitor ); ?>
+      <svg class="zones" width="<?php echo $monitor->Width ?>" height="<?php echo $monitor->Height ?>" style="margin-top: -<?php echo $monitor->Height ?>px;background: none;">
 <?php
-foreach( array_reverse($zones) as $zone )
-{
+      foreach( array_reverse($zones) as $zone ) {
 ?>
-        <area shape="poly" alt="<?php echo htmlspecialchars($zone['Name']) ?>" coords="<?php echo $zone['AreaCoords'] ?>" href="#" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> ); return( false );"/>
+        <polygon points="<?php echo $zone['AreaCoords'] ?>" class="<?php echo $zone['Type']?>" onclick="streamCmdQuit( true ); createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width ?>, <?php echo $monitor->Height ?> ); return( false );"/>
 <?php
-}
+      } // end foreach zone
 ?>
-        <!--<area shape="default" nohref>-->
-      </map>
-      <img src="<?php echo ZM_DIR_IMAGES.'/'.$image ?>" alt="zones" usemap="#zoneMap" width="<?php echo $monitor['Width'] ?>" height="<?php echo $monitor['Height'] ?>" border="0"/>
+          Sorry, your browser does not support inline SVG
+        </svg>
       <form name="contentForm" id="contentForm" method="get" action="<?php echo $_SERVER['PHP_SELF'] ?>">
         <input type="hidden" name="view" value="<?php echo $view ?>"/>
         <input type="hidden" name="action" value="delete"/>
@@ -84,9 +78,9 @@ foreach( $zones as $zone )
 {
 ?>
             <tr>
-              <td class="colName"><a href="#" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> ); return( false );"><?php echo $zone['Name'] ?></a></td>
+              <td class="colName"><a href="#" onclick="streamCmdQuit( true ); createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=<?php echo $zone['Id'] ?>', 'zmZone', 'zone', <?php echo $monitor->Width() ?>, <?php echo $monitor->Height() ?> ); return( false );"><?php echo $zone['Name'] ?></a></td>
               <td class="colType"><?php echo $zone['Type'] ?></td>
-              <td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf( "%.2f", ($zone['Area']*100)/($monitor['Width']*$monitor['Height']) ) ?></td>
+              <td class="colUnits"><?php echo $zone['Area'] ?>&nbsp;/&nbsp;<?php echo sprintf( "%.2f", ($zone['Area']*100)/($monitor->Width()*$monitor->Height()) ) ?></td>
               <td class="colMark"><input type="checkbox" name="markZids[]" value="<?php echo $zone['Id'] ?>" onclick="configureDeleteButton( this );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/></td>
             </tr>
 <?php
@@ -95,7 +89,7 @@ foreach( $zones as $zone )
           </tbody>
         </table>
         <div id="contentButtons">
-          <input type="button" value="<?php echo translate('AddNewZone') ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor['Width'] ?>, <?php echo $monitor['Height'] ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
+          <input type="button" value="<?php echo translate('AddNewZone') ?>" onclick="createPopup( '?view=zone&amp;mid=<?php echo $mid ?>&amp;zid=0', 'zmZone', 'zone', <?php echo $monitor->Width() ?>, <?php echo $monitor->Height() ?> );"<?php if ( !canEdit( 'Monitors' ) ) { ?> disabled="disabled"<?php } ?>/>
           <input type="submit" name="deleteBtn" value="<?php echo translate('Delete') ?>" disabled="disabled"/>
         </div>
       </form>
diff --git a/web/skins/mobile/Makefile.am b/web/skins/mobile/Makefile.am
deleted file mode 100644
index 35051fade..000000000
--- a/web/skins/mobile/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile
-
-SUBDIRS = \
-	ajax \
-	css \
-	graphics \
-	includes \
-	lang \
-	views
-
-dist_web_DATA = \
-    skin.php
diff --git a/web/skins/mobile/ajax/Makefile.am b/web/skins/mobile/ajax/Makefile.am
deleted file mode 100644
index 0558929c0..000000000
--- a/web/skins/mobile/ajax/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/ajax
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/css/Makefile.am b/web/skins/mobile/css/Makefile.am
deleted file mode 100644
index 6353e163e..000000000
--- a/web/skins/mobile/css/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/css
-
-dist_web_DATA = \
-	skin.css
diff --git a/web/skins/mobile/css/skin.css b/web/skins/mobile/css/skin.css
deleted file mode 100644
index b996392a3..000000000
--- a/web/skins/mobile/css/skin.css
+++ /dev/null
@@ -1,311 +0,0 @@
-/*
- * Primary look and feel styles
- */
-
-body {
-    font-family: Verdana, Arial, Helvetica, sans-serif;
-    font-size: 100%;
-    color: #333333;
-    font-weight: normal;
-    text-align: center;
-}
-
-h1 {
-    font-family: inherit;
-    font-size: 120%;
-    color: #000066;
-    font-weight: bold;
-}
-
-h2 {
-    font-family: inherit;
-    font-size: 110%;
-    color: #000066;
-    font-weight: bold;
-}
-
-h3 {
-    font-family: inherit;
-    font-size: 100%;
-    color: #016A9D;
-    font-weight: bold;
-}
-
-p {
-    font-family: inherit;
-    font-size: 100%;
-    color: #333333;
-    font-weight: normal;
-}
-
-th {
-    font-weight: bold;
-    color: #016A9D;
-}
-
-a:link {
-    color: #7F7FB2;
-    text-decoration: none;
-}
-
-a:visited {
-    color: #7F7FB2;
-    text-decoration: none;
-}
-
-a:hover {
-    color: #666699;
-    text-decoration: underline;
-}
-
-label {
-    margin-right: 4px;
-}
-
-input,textarea,select {
-    border: 1px #7F7FB2 solid;
-    font-family: inherit;
-    font-size: 100%;
-    color: #333333;
-}
-
-input[type=text], input[type=password], textarea {
-    padding: 1px;
-}
-
-input.noborder {
-    border: 0;
-}
-
-input[disabled] {
-    color: #888888;
-}
-
-img.normal {
-    border: white solid 1px;
-}
-
-img.alarm {
-    border: red solid 1px;
-}
-
-hr {
-    height: 1px;
-    width: 100%;
-    border: 0;
-    color: #7f7fb2;
-    background-color: #7f7fb2;
-}
-
-/*
- * Major league table for multiple inputs or presentation
- */
-
-#content table.major {
-    margin: 4px auto;
-    width: 100%;
-    border-collapse: collapse;
-}
-
-#content table.major tr.highlight {
-    background-color: #eeeeee;
-}
-
-#content table.major thead tr th {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
-#content table.major tfoot td {
-    padding-top: 6px;
-    padding-bottom: 6px;
-    vertical-align: middle;
-}
-
-#content table.major th, #content table.major td {
-    border: 1px solid #7f7fb2;
-    padding: 3px;
-    text-align: left;
-}
-
-#content table.major th {
-    vertical-align: bottom;
-}
-
-#content table.major td {
-    vertical-align: middle;
-}
-
-#content table.major th[scope=row] {
-    padding: 4px 3px 3px;
-    vertical-align: top;
-    text-align: right;
-}
-
-#content table.major .colMark, #content table.major .colSelect {
-    text-align: center;
-}
-/*
- * Lesser table for very simple forms
- */
-
-#content table.minor {
-    width: 200px;
-    margin: 0 auto;
-}
-
-#content table.minor td {
-    padding: 4px;
-}
-
-#content table.minor .colLeft {
-    width: 50%;
-    text-align: right;
-}
-
-#content table.minor .colRight {
-    width: 50%;
-    text-align: left;
-}
-
-#content table.minor input[type=submit]
-{
-    margin-top: 4px;
-    padding: 0 2px;
-    font-size: 120%;
-}
-
-/*
- * Behavior classes
- */
-.error {
-    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
-    font-size: 100%;
-    color: #DC143C;
-    font-weight: bold;
-}
-
-.warn {
-    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
-    font-size: 100%;
-    color: #FF8C00;
-    font-weight: bold;
-}
-
-.info {
-    /*font-family: Verdana, Arial, Helvetica, sans-serif;*/
-    font-size: 100%;
-    color: #688E23;
-    font-weight: bold;
-}
-
-.errorText {
-    color: #DC143C;
-}
-
-.warnText {
-    color: #FF8C00;
-}
-
-.infoText {
-    color: #688E23;
-}
-
-.disabledText {
-    font-style: italic;
-}
-
-/*
- * Generic useful classes, especially with mootools
- */
-
-.hidden {
-    display: none;
-}
-
-.invisible {
-    visibility: hidden;
-}
-
-.nowrap {
-    white-space: nowrap;
-}
-
-div.clear {
-    clear: both;
-}
-
-/*
- * Primary layout styles
- */
-
-#page {
-    width: 100%;
-}
-
-#header {
-    width: 98%;
-    line-height: 24px;
-    margin: 4px auto 0;
-    clear: both;
-}
-
-#header h2 {
-    left: 0;
-}
-
-#headerControl {
-}
-
-#headerButtons {
-    float: right;
-}
-
-#headerButtons a {
-    margin-left: 8px;
-}
-
-#content {
-    width: 98%;
-    margin: 4px auto;
-    line-height: 130%;
-    text-align: center;
-    clear: both;
-}
-
-#contentTable {
-    width: 100%;
-}
-
-#content p {
-    margin-top: 4px;
-}
-
-#content p.textblock {
-    text-align: justify;
-    padding: 4px;
-}
-
-#content > input[type=submit], #content > input[type=button] {
-    margin-top: 4px;
-}
-
-#content table input[type=submit], #content table input[type=button] {
-    margin-top: 0;
-}
-
-#contentButtons {
-    margin: 4px auto 0;
-}
-
-#contentButtons input, #contentButtons a {
-    margin: 0 4px;
-}
-
-#footer {
-    width: 98%;
-    margin: 4px auto 0;
-    clear: both;
-}
-
diff --git a/web/skins/mobile/graphics/Makefile.am b/web/skins/mobile/graphics/Makefile.am
deleted file mode 100644
index dfd43bef7..000000000
--- a/web/skins/mobile/graphics/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/graphics
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/includes/Makefile.am b/web/skins/mobile/includes/Makefile.am
deleted file mode 100644
index c88ad435a..000000000
--- a/web/skins/mobile/includes/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php \
-	control_functions.php
diff --git a/web/skins/mobile/includes/config.php b/web/skins/mobile/includes/config.php
deleted file mode 100644
index fc1eba9bb..000000000
--- a/web/skins/mobile/includes/config.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-//
-// ZoneMinder xHTML configuration file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-define( 'DEVICE_WIDTH', 240 );                          // Default device width for phones and handhelds
-define( 'DEVICE_HEIGHT', 320 );                         // Default device height for phones and handhelds
-define( 'DEVICE_LINES', 10 );                           // Default device lines for phones and handhelds
-
-$rates = array(
-    "5000" => "50x",
-    "2000" => "20x",
-    "500" => "5x",
-    "200" => "2x",
-    "100" => translate('Real'),
-    "50" => "1/2x",
-);
-
-$scales = array(
-    "400" => "4x",
-    "300" => "3x",
-    "200" => "2x",
-    "150" => "1.5x",
-    "100" => translate('Actual'),
-    "75" => "3/4x",
-    "50" => "1/2x",
-    "33" => "1/3x",
-    "25" => "1/4x",
-);
-
-switch ( $_COOKIE['zmBandwidth'] )
-{
-    case "phone" : // Very incomplete at present
-    {
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_P_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_P_STREAM_METHOD );       // Which method should be used to send video streams to your brow
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_P_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_P_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_P_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_P_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_P_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_P_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-
-        break;
-    }
-}
-
-?>
diff --git a/web/skins/mobile/includes/control_functions.php b/web/skins/mobile/includes/control_functions.php
deleted file mode 100644
index 3a12cf467..000000000
--- a/web/skins/mobile/includes/control_functions.php
+++ /dev/null
@@ -1,184 +0,0 @@
-<?php
-//
-// ZoneMinder web control function library, $Date: 2008-07-25 10:48:16 +0100 (Fri, 25 Jul 2008) $, $Revision: 2612 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-function getControlCommands( $monitor )
-{
-    $cmds = array();
-
-    $cmds['Wake'] = "wake";
-    $cmds['Sleep'] = "sleep";
-    $cmds['Reset'] = "reset";
-
-    $cmds['PresetSet'] = "presetSet";
-    $cmds['PresetGoto'] = "presetGoto";
-    $cmds['PresetHome'] = "presetHome";
-
-    if ( !empty($monitor['CanZoom']) )
-    {
-        if ( $monitor['CanZoomCon'] )
-            $cmds['ZoomRoot'] = "zoomCon";
-        elseif ( $monitor['CanZoomRel'] )
-            $cmds['ZoomRoot'] = "zoomRel";
-        elseif ( $monitor['CanZoomAbs'] )
-            $cmds['ZoomRoot'] = "zoomAbs";
-        $cmds['ZoomTele'] = $cmds['ZoomRoot']."Tele";
-        $cmds['ZoomWide'] = $cmds['ZoomRoot']."Wide";
-        $cmds['ZoomStop'] = "zoomStop";
-        $cmds['ZoomAuto'] = "zoomAuto";
-        $cmds['ZoomMan'] = "zoomMan";
-    }
-
-    if ( !empty($monitor['CanFocus']) )
-    {
-        if ( $monitor['CanFocusCon'] )
-            $cmds['FocusRoot'] = "focusCon";
-        elseif ( $monitor['CanFocusRel'] )
-            $cmds['FocusRoot'] = "focusRel";
-        elseif ( $monitor['CanFocusAbs'] )
-            $cmds['FocusRoot'] = "focusAbs";
-        $cmds['FocusFar'] = $cmds['FocusRoot']."Far";
-        $cmds['FocusNear'] = $cmds['FocusRoot']."Near";
-        $cmds['FocusStop'] = "focusStop";
-        $cmds['FocusAuto'] = "focusAuto";
-        $cmds['FocusMan'] = "focusMan";
-    }
-
-    if ( !empty($monitor['CanIris']) )
-    {
-        if ( $monitor['CanIrisCon'] )
-            $cmds['IrisRoot'] = "irisCon";
-        elseif ( $monitor['CanIrisRel'] )
-            $cmds['IrisRoot'] = "irisRel";
-        elseif ( $monitor['CanIrisAbs'] )
-            $cmds['IrisRoot'] = "irisAbs";
-        $cmds['IrisOpen'] = $cmds['IrisRoot']."Open";
-        $cmds['IrisClose'] = $cmds['IrisRoot']."Close";
-        $cmds['IrisStop'] = "irisStop";
-        $cmds['IrisAuto'] = "irisAuto";
-        $cmds['IrisMan'] = "irisMan";
-    }
-
-    if ( !empty($monitor['CanWhite']) )
-    {
-        if ( $monitor['CanWhiteCon'] )
-            $cmds['WhiteRoot'] = "whiteCon";
-        elseif ( $monitor['CanWhiteRel'] )
-            $cmds['WhiteRoot'] = "whiteRel";
-        elseif ( $monitor['CanWhiteAbs'] )
-            $cmds['WhiteRoot'] = "whiteAbs";
-        $cmds['WhiteIn'] = $cmds['WhiteRoot']."In";
-        $cmds['WhiteOut'] = $cmds['WhiteRoot']."Out";
-        $cmds['WhiteAuto'] = "whiteAuto";
-        $cmds['WhiteMan'] = "whiteMan";
-    }
-
-    if ( !empty($monitor['CanGain']) )
-    {
-        if ( $monitor['CanGainCon'] )
-            $cmds['GainRoot'] = "gainCon";
-        elseif ( $monitor['CanGainRel'] )
-            $cmds['GainRoot'] = "gainRel";
-        elseif ( $monitor['CanGainAbs'] )
-            $cmds['GainRoot'] = "gainAbs";
-        $cmds['GainUp'] = $cmds['GainRoot']."Up";
-        $cmds['GainDown'] = $cmds['GainRoot']."Down";
-        $cmds['GainAuto'] = "gainAuto";
-        $cmds['GainMan'] = "gainMan";
-    }
-
-    if ( !empty($monitor['CanMove']) )
-    {
-        if ( $monitor['CanMoveCon'] )
-        {
-            $cmds['MoveRoot'] = "moveCon";
-            $cmds['Center'] = "moveStop";
-        }
-        elseif ( $monitor['CanMoveRel'] )
-        {
-            $cmds['MoveRoot'] = "moveRel";
-            $cmds['Center'] = $cmds['PresetHome'];
-        }
-        elseif ( $monitor['CanMoveAbs'] )
-        {
-            $cmds['MoveRoot'] = "moveAbs";
-            $cmds['Center'] = $cmds['PresetHome'];
-        }
-
-        $cmds['MoveUp'] = $cmds['MoveRoot']."Up";
-        $cmds['MoveDown'] = $cmds['MoveRoot']."Down";
-        $cmds['MoveLeft'] = $cmds['MoveRoot']."Left";
-        $cmds['MoveRight'] = $cmds['MoveRoot']."Right";
-        $cmds['MoveUpLeft'] = $cmds['MoveRoot']."UpLeft";
-        $cmds['MoveUpRight'] = $cmds['MoveRoot']."UpRight";
-        $cmds['MoveDownLeft'] = $cmds['MoveRoot']."DownLeft";
-        $cmds['MoveDownRight'] = $cmds['MoveRoot']."DownRight";
-    }
-    return( $cmds );
-}
-
-function controlPresets( $monitor, $cmds )
-{
-    define( "MAX_PRESETS", "10" );
-
-    $sql = "select * from ControlPresets where MonitorId = '".$monitor['Id']."'";
-    $labels = array();
-    foreach( dbFetchAll( $sql ) as $row )
-    {
-        $labels[$row['Preset']] = $row['Label'];
-    }
-
-    ob_start();
-?>
-<div class="presetControls">
-  <div>
-    <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-      <div class="hidden">
-        <fieldset>
-          <input type="hidden" name="view" value="<?php echo $_REQUEST['view'] ?>"/>
-          <input type="hidden" name="action" value="control"/>
-          <input type="hidden" name="mid" value="<?php echo $monitor['Id'] ?>"/>
-          <input type="hidden" name="control" value="<?php echo $cmds['PresetGoto'] ?>"/>
-        </fieldset>
-      </div>
-      <div>
-<?php
-    for ( $i = 1; $i <= min($monitor['NumPresets'],MAX_PRESETS); $i++ )
-    {
-?>
-        <input type="submit" class="ptzNumBtn" title="<?php echo isset($labels[$i])?$labels[$i]:"" ?>" name="preset" value="<?php echo $i ?>"/>
-<?php
-    }
-?>
-      </div>
-    </form>
-  </div>
-</div>
-<?php
-    return( ob_get_clean() );
-}
-
-function ptzControls( $monitor )
-{
-    $cmds = getControlCommands( $monitor );
-    if ( $monitor['HasPresets'] )
-        echo controlPresets( $monitor, $cmds );
-    return( ob_get_clean() );
-}
-?>
diff --git a/web/skins/mobile/includes/functions.php b/web/skins/mobile/includes/functions.php
deleted file mode 100644
index aadbe435f..000000000
--- a/web/skins/mobile/includes/functions.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-function getDeviceScale( $width, $height, $divisor=1 )
-{
-    global $device;
-
-    $deviceWidth = (isset($device)&&!empty($device['width']))?$device['width']:DEVICE_WIDTH;
-    $deviceHeight = (isset($device)&&!empty($device['height']))?$device['height']:DEVICE_HEIGHT;
-
-    // Allow for margins etc
-    //$deviceWidth -= 4;
-    //$deviceHeight -= 4;
-
-    $widthScale = ($deviceWidth*SCALE_BASE)/$width;
-    $heightScale = ($deviceHeight*SCALE_BASE)/$height;
-    $scale = ($widthScale<$heightScale)?$widthScale:$heightScale;
-    if ( $divisor != 1.0 )
-        $scale = $scale/$divisor;
-    return( intval($scale) );
-}
-
-function xhtmlHeaders( $file, $title )
-{
-    $skinCssFile = getSkinFile( 'css/skin.css' );
-    $skinCssPhpFile = getSkinFile( 'css/skin.css.php' );
-
-    $basename = basename( $file, '.php' );
-    $viewCssFile = getSkinFile( 'views/css/'.$basename.'.css' );
-    $viewCssPhpFile = getSkinFile( 'views/css/'.$basename.'.css.php' );
-
-    extract( $GLOBALS, EXTR_OVERWRITE );
-
-    noCacheHeaders();
-    header("Content-type: application/xhtml+xml" );
-    echo( '<?xml version="1.0" encoding="iso-8859-1"?>'."\n" );
-?>
-<!DOCTYPE html PUBLIC "-//WAPFORUM//DTD XHTML Mobile 1.0//EN" "http://www.wapforum.org/DTD/xhtml-mobile10.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-  <title><?php echo ZM_WEB_TITLE_PREFIX ?> - <?php echo $title ?></title>
-  <link rel="icon" type="image/ico" href="graphics/favicon.ico"/>
-  <link rel="shortcut icon" href="graphics/favicon.ico"/>
-  <link rel="stylesheet" href="css/reset.css" type="text/css" media="screen"/>
-  <link rel="stylesheet" href="<?php echo $skinCssFile ?>" type="text/css" media="screen"/>
-<?php
-    if ( $viewCssFile )
-    {
-?>
-  <link rel="stylesheet" href="<?php echo $viewCssFile ?>" type="text/css" media="screen"/>
-<?php
-    }
-    if ( $viewCssPhpFile )
-    {
-?>
-  <style type="text/css">
-<?php
-        require_once( $viewCssPhpFile );
-?>
-  </style>
-<?php
-    }
-?>
-</head>
-<?php
-}
-
-?>
diff --git a/web/skins/mobile/includes/init.php b/web/skins/mobile/includes/init.php
deleted file mode 100644
index ae92bcdee..000000000
--- a/web/skins/mobile/includes/init.php
+++ /dev/null
@@ -1,29 +0,0 @@
-<?php
-
-ini_set( "arg_separator.output", "&amp;" );
-ini_set( "url_rewriter.tags", "a=href,area=href,frame=src,input=src,fieldset=" );
-
-$cookies = false;
-if ( count($_COOKIE) || !empty($_REQUEST['cookies']) )
-    $cookies = true;
-
-if ( $cookies )
-{
-    ini_set( "session.use_cookies", "1" );
-    ini_set( "session.use_trans_sid", "0" );
-    ini_set( "url_rewriter.tags", "" );
-}
-else
-{
-    //ini_set( "session.auto_start", "1" );
-    ini_set( "session.use_cookies", "0" );
-    ini_set( "session.use_trans_sid", "1" );
-}
-
-if ( !isset($_SESSION['cookies']) )
-{
-    $_SESSION['cookies'] = $cookies;
-    if ( $cookies )
-        setcookie( "cookies", $cookies );
-}
-?>
diff --git a/web/skins/mobile/lang/Makefile.am b/web/skins/mobile/lang/Makefile.am
deleted file mode 100644
index 5084203fb..000000000
--- a/web/skins/mobile/lang/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/lang
-
-dist_web_DATA =  # No files here
diff --git a/web/skins/mobile/skin.php b/web/skins/mobile/skin.php
deleted file mode 100644
index 51ea63e01..000000000
--- a/web/skins/mobile/skin.php
+++ /dev/null
@@ -1,97 +0,0 @@
-<?php
-//
-// ZoneMinder HTML interface file, $Date: 2008-07-08 16:06:45 +0100 (Tue, 08 Jul 2008) $, $Revision: 2484 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-$_COOKIE['zmBandwidth'] = "phone";
-
-//ini_set( "magic_quotes_gpc", "Off" );
-
-// Uncomment if there are language overrides
-//if ( $skinLangFile = loadLanguage( ZM_SKIN_PATH ) )
-    //require_once( $skinLangFile );
-
-if ( isset($_GET['devWidth']) )
-{
-    $device['width'] = $_GET['devWidth'];
-}
-if ( isset($_GET['devHeight']) )
-{
-    $device['height'] = $_GET['devHeight'];
-}
-
-if ( isset($device) )
-    $_SESSION['device'] = $device;
-
-$wurflFile = "wurfl/wurfl_class.php";
-if ( file_exists( $wurflFile ) )
-{
-    require_once( $wurflFile );
-    $wurfl = new wurfl_class( $wurfl, $wurfl_agents );
-    // Set the user agent
-    $wurfl->GetDeviceCapabilitiesFromAgent($_SERVER['HTTP_USER_AGENT']);
-
-    //print_r( $wurfl->wurfl_agent );
-    if ( $wurfl->wurfl_agent )
-    {
-        if ( $wurfl->getDeviceCapability( 'html_wi_oma_xhtmlmp_1_0' ) )
-        {
-            $device['width'] = $wurfl->getDeviceCapability( 'resolution_width' );
-            $device['height'] = $wurfl->getDeviceCapability( 'resolution_height' );
-        }
-    }
-}
-else
-{
-    // This is an example of using fixed device strings to just match your phone etc
-    $devices = array(
-        array( 'name'=>"Motorola V600", 'ua_match'=>"MOT-V600", 'skin'=>"mobile", 'cookies'=>false, 'width'=>176, 'height'=>220 ),
-    );
-
-    foreach ( $devices as $tempDevice )
-    {
-        if ( preg_match( '/'.$tempDevice['ua_match'].'/', $_SERVER['HTTP_USER_AGENT'] ) )
-        {
-            $skin = $tempDevice['skin'];
-            $cookies = $tempDevice['cookies'];
-            break;
-        }
-    }
-}
-
-foreach ( getSkinIncludes( 'includes/config.php' ) as $includeFile )
-    require_once $includeFile;
-
-foreach ( getSkinIncludes( 'includes/functions.php' ) as $includeFile )
-    require_once $includeFile;
-
-if ( empty($view) )
-    $view = isset($user)?'console':'login';
-
-if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER']) )
-{
-     $view = "postlogin";
-     $action = "login";
-     $_REQUEST['username'] = $_SERVER['REMOTE_USER'];
-}
-
-// If there are additional actions
-foreach ( getSkinIncludes( 'includes/actions.php' ) as $includeFile )
-    require_once $includeFile; 
-
-?>
diff --git a/web/skins/mobile/views/Makefile.am b/web/skins/mobile/views/Makefile.am
deleted file mode 100644
index c7d175ca3..000000000
--- a/web/skins/mobile/views/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	css
-
-webdir = @WEB_PREFIX@/skins/mobile/views
-
-dist_web_DATA = \
-	console.php \
-	devices.php \
-	error.php \
-	eventdetails.php \
-	event.php \
-	events.php \
-	filter.php \
-	frame.php \
-	function.php \
-	login.php \
-	montage.php \
-	state.php \
-	video.php \
-	watch.php
diff --git a/web/skins/mobile/views/console.php b/web/skins/mobile/views/console.php
deleted file mode 100644
index 50b5f4775..000000000
--- a/web/skins/mobile/views/console.php
+++ /dev/null
@@ -1,178 +0,0 @@
-<?php
-//
-// ZoneMinder web console file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-$eventCounts = array(
-    // Last Hour
-    array(
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
-            )
-        ),
-    ),
-    // Today
-    array(
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "today" ),
-            )
-        ),
-    ),
-);
-
-$running = daemonCheck();
-$status = $running?translate('Running'):translate('Stopped');
-
-if ( $group = dbFetchOne( "select * from Groups where Name = 'Mobile'" ) )
-    $groupIds = array_flip(explode( ',', $group['MonitorIds'] ));
-
-$maxWidth = 0;
-$maxHeight = 0;
-$cycleCount = 0;
-$monitors = dbFetchAll( "select * from Monitors order by Sequence asc" );
-for ( $i = 0; $i < count($monitors); $i++ )
-{
-    if ( !visibleMonitor( $monitors[$i]['Id'] ) )
-    {
-        continue;
-    }
-    if ( $group && !empty($groupIds) && !array_key_exists( $monitors[$i]['Id'], $groupIds ) )
-    {
-        continue;
-    }
-    $monitors[$i]['Show'] = true;
-    $monitors[$i]['zmc'] = zmcStatus( $monitors[$i] );
-    $monitors[$i]['zma'] = zmaStatus( $monitors[$i] );
-    $counts = array();
-    for ( $j = 0; $j < count($eventCounts); $j++ )
-    {
-        $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitors[$i]['Id'] ) );
-        parseFilter( $filter, false, '&amp;' );
-        $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
-        $monitors[$i]['eventCounts'][$j]['filter'] = $filter;
-    }
-    $sql = "select ".join($counts,", ")." from Events as E where MonitorId = '".$monitors[$i]['Id']."'";
-    $counts = dbFetchOne( $sql );
-    if ( $monitors[$i]['Function'] != 'None' )
-    {
-        $cycleCount++;
-        if ( $maxWidth < $monitors[$i]['Width'] ) $maxWidth = $monitors[$i]['Width'];
-        if ( $maxHeight < $monitors[$i]['Height'] ) $maxHeight = $monitors[$i]['Height'];
-    }
-    $monitors[$i] = array_merge( $monitors[$i], $counts );
-}
-
-xhtmlHeaders( __FILE__, translate('Console') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="systemTime"><a href="?view=<?php echo $view ?>"><?php echo preg_match( '/%/', DATE_FMT_CONSOLE_SHORT )?strftime( DATE_FMT_CONSOLE_SHORT ):date( DATE_FMT_CONSOLE_SHORT ) ?></a></div>
-      <div id="systemStats"><?php echo getLoad() ?>/<?php echo getDiskPercent() ?>%</div>
-      <div id="systemState"><?php echo makeLink( "?view=state", $status, canEdit( 'System' ) ) ?></div>
-    </div>
-    <div id="content">
-      <table id="contentTable">
-<?php
-for ( $i = 0; $i < count($eventCounts); $i++ )
-{
-    $eventCounts[$i]['total'] = 0;
-}
-$zoneCount = 0;
-foreach( $monitors as $monitor )
-{
-    if ( empty($monitor['Show']) )
-        continue;
-    for ( $i = 0; $i < count($eventCounts); $i++ )
-    {
-        $eventCounts[$i]['total'] += $monitor['EventCount'.$i];
-    }
-    //$zoneCount += $monitor['ZoneCount'];
-?>
-        <tr>
-<?php
-    if ( !$monitor['zmc'] )
-        $dclass = "errorText";
-    else
-    {
-        if ( !$monitor['zma'] )
-            $dclass = "warnText";
-        else
-            $dclass = "infoText";
-    }
-    if ( $monitor['Function'] == 'None' )
-        $fclass = "errorText";
-    elseif ( $monitor['Function'] == 'Monitor' )
-        $fclass = "warnText";
-    else
-        $fclass = "infoText";
-    if ( !$monitor['Enabled'] )
-        $fclass .= " disabledText";
-?>
-          <td class="colName"><?php echo makeLink( "?view=watch&amp;mid=".$monitor['Id'], substr( $monitor['Name'], 0, 8 ), $running && ($monitor['Function'] != 'None') && canView( 'Stream' ) ) ?></td>
-          <td class="colFunction"><?php echo makeLink( "?view=function&amp;mid=".$monitor['Id'], "<span class=\"$fclass\">".substr( $monitor['Function'], 0, 4 )."</span>", canEdit( 'Monitors' ) ) ?></td>
-<?php
-for ( $i = 0; $i < count($eventCounts); $i++ )
-{
-?>
-          <td class="colEvents"><?php echo makeLink( "?view=events&amp;page=1".$monitor['eventCounts'][$i]['filter']['query'], $monitor['EventCount'.$i], canView( 'Events' ) ) ?></td>
-<?php
-}
-?>
-        </tr>
-<?php
-}
-?>
-        <tr>
-<?php
-if ( ZM_OPT_X10 ) {
-?>
-          <td><?php echo makeLink( "?view=devices", translate('Devices'), canView('Devices' ) ) ?></td>
-<?php
-} else {
-?>
-          <td>&nbsp;</td>
-<?php
-}
-if ( $cycleCount > 1 ) {
-?>
-          <td><?php echo makeLink( "?view=montage", translate('Montage'), $running && canView( 'Stream' ) ) ?></td>
-<?php
-} else {
-?>
-          <td>&nbsp;</td>
-<?php
-}
-for ( $i = 0; $i < count($eventCounts); $i++ )
-{
-    parseFilter( $eventCounts[$i]['filter'], false, '&amp;' );
-?>
-          <td class="colEvents"><?php echo makeLink( "?view=events&amp;page=1".$eventCounts[$i]['filter']['query'], $eventCounts[$i]['total'], canView( 'Events' ) ) ?></td>
-<?php
-}
-?>
-        </tr>
-      </table>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/css/Makefile.am b/web/skins/mobile/views/css/Makefile.am
deleted file mode 100644
index 86e0ff0a3..000000000
--- a/web/skins/mobile/views/css/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/mobile/views/css
-
-dist_web_DATA = \
-	console.css
diff --git a/web/skins/mobile/views/css/console.css b/web/skins/mobile/views/css/console.css
deleted file mode 100644
index 49c711039..000000000
--- a/web/skins/mobile/views/css/console.css
+++ /dev/null
@@ -1,16 +0,0 @@
-#systemTime {
-    float: left;
-}
-
-#systemState {
-    margin: 0 auto;
-    text-align: center;
-}
-
-#systemStats {
-    float: right;
-}
-
-td.colEvents {
-    text-align: right;
-}
diff --git a/web/skins/mobile/views/devices.php b/web/skins/mobile/views/devices.php
deleted file mode 100644
index add0a6bc5..000000000
--- a/web/skins/mobile/views/devices.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-//
-// ZoneMinder web devices file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Devices' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$sql = "select * from Devices where Type = 'X10' order by Name";
-$devices = array();
-foreach ( dbFetchAll( $sql ) as $row )
-{
-    $row['Status'] = getDeviceStatusX10( $row['KeyString'] );
-    $devices[] = $row;
-}
-
-xhtmlHeaders( __FILE__, translate('Devices') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Devices') ?></h2>
-    </div>
-    <div id="content">
-      <table id="contentTable" class="major">
-<?php
-foreach( $devices as $device )
-{
-    if ( $device['Status'] == 'ON' )
-    {
-        $fclass = "infoText";
-    }
-    elseif ( $device['Status'] == 'OFF' )
-    {
-        $fclass = "warnText";
-    }
-    else
-    {
-        $fclass = "errorText";
-    }
-?>
-        <tr>
-          <th scope="row" class="<?php echo $fclass  ?>"><span class="<?php echo $fclass ?>"><?php echo substr( $device['Name'], 0, 16 ) ?></span></th>
-          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=on", translate('On'), canEdit('Devices') ) ?></td>
-          <td><?php echo makeLink( "?view=".$_REQUEST['view']."&amp;action=device&amp;key=".$device['KeyString']."&amp;command=off", translate('Off'), canEdit('Devices') ) ?></td>
-        </tr>
-<?php
-}
-?>
-      </table>
-      <p><a href="?view=console"><?php echo translate('Console') ?></a></p>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/error.php b/web/skins/mobile/views/error.php
deleted file mode 100644
index 33e99f09a..000000000
--- a/web/skins/mobile/views/error.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-//
-// ZoneMinder web error view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-xhtmlHeaders( __FILE__, translate('Error') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h1>ZoneMinder <?php echo translate('Error') ?></h1>
-    </div>
-    <div id="content">
-      <p><strong><?php echo translate('YouNoPerms') ?></p>
-      <p><?php echo translate('ContactAdmin') ?></p>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/event.php b/web/skins/mobile/views/event.php
deleted file mode 100644
index ead6b6eae..000000000
--- a/web/skins/mobile/views/event.php
+++ /dev/null
@@ -1,147 +0,0 @@
-<?php
-//
-// ZoneMinder web event view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$midSql = '';
-if ( $user['MonitorIds'] )
-{
-    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-}
-
-$sql = 'select E.*,M.Name as MonitorName from Events as E inner join Monitors as M on E.MonitorId = M.Id where E.Id = ?'.$midSql;
-$event = dbFetchOne( $sql, NULL, array($_REQUEST['eid']) );
-
-if ( !empty($_REQUEST['fid']) )
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND FrameId = ?', NULL, array($_REQUEST['eid'],$_REQUEST['fid']) );
-}
-elseif ( isset($_REQUEST['fid']) )
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND Score = ?', NULL, array($_REQUEST['eid'],$event['MaxScore']) );
-    $_REQUEST['fid'] = $frame['FrameId'];
-}
-
-parseSort( true, '&amp;' );
-parseFilter( $_REQUEST['filter'], true, '&amp;' );
-$filterQuery = $_REQUEST['filter']['query'];
-
-if ( $sortOrder=='asc' ) {
-	$sql = "select E.* from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn <= ?".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn desc";
-} else {
-	$sql = "select E.* from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn >= ?".$_REQUEST['filter']['sql'].$midSql." order by $sortColumn asc";
-} 
-$result = dbQuery( $sql, array( $event[$_REQUEST['sort_field']] ) );
-while ( $row = dbFetchNext( $result ) )
-{
-    if ( $row['Id'] == $_REQUEST['eid'] )
-    {
-        $prevEvent = dbFetchNext( $result );
-        break;
-    }
-}
-
-$sql = "select E.* from Events as E inner join Monitors as M on E.MonitorId = M.Id where $sortColumn ".($sortOrder=='asc'?'>=':'<=').' ?'.$_REQUEST['filter']['sql'].$midSql." order by $sortColumn $sortOrder";
-$result = dbQuery( $sql, array($event[$_REQUEST['sort_field']]) );
-while ( $row = dbFetchNext( $result ) )
-{
-    if ( $row['Id'] == $_REQUEST['eid'] )
-    {
-        $nextEvent = dbFetchNext( $result );
-        break;
-    }
-}
-
-$framesPerPage = 15;
-$framesPerLine = 3;
-$maxShortcuts = 3;
-
-$paged = $event['Frames'] > $framesPerPage;
-
-if ( $paged && !empty($_REQUEST['page']) )
-{
-    $loFrameId = (($_REQUEST['page']-1)*$framesPerPage)+1;
-    $hiFrameId = min( $_REQUEST['page']*$framesPerPage, $event['Frames'] );
-}
-else
-{
-    $loFrameId = 1;
-    $hiFrameId = $event['Frames'];
-}
-
-$sql = 'SELECT * FROM Frames WHERE EventID = ?';
-if ( $paged && !empty($_REQUEST['page']) )
-    $sql .= " and FrameId between $loFrameId and $hiFrameId";
-$sql .= " order by FrameId";
-$frames = dbFetchAll( $sql, NULL, array( $_REQUEST['eid'] ) );
-
-$scale = getDeviceScale( $event['Width'], $event['Height'], $framesPerLine+0.3 );
-
-$pages = (int)ceil($event['Frames']/$framesPerPage);
-if ( !empty($_REQUEST['fid']) )
-    $_REQUEST['page'] = ($_REQUEST['fid']/$framesPerPage)+1;
-
-$pagination = getPagination( $pages, $_REQUEST['page'], $maxShortcuts, '&amp;eid='.$_REQUEST['eid'].$filterQuery.$sortQuery, '&amp;' );
-
-xhtmlHeaders( __FILE__, translate('Event').' - '.$event['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-<?php
-if ( canEdit( 'Events' ) )
-{
-?>
-      <div id="headerButtons">
-        <a href="?view=events&amp;action=delete&amp;mark_eid=<?php echo $_REQUEST['eid'] ?><?php echo $filterQuery ?><?php echo $sortQuery ?>&amp;limit=<?php echo $_REQUEST['limit'] ?>&amp;page=<?php echo $_REQUEST['page'] ?>"><?php echo translate('Delete') ?></a>
-      </div>
-<?php
-}
-?>
-      <h2><?php echo makeLink( '?view=eventdetails&amp;eid='.$_REQUEST['eid'], $event['Name'].($event['Archived']?'*':''), canEdit( 'Events' ) ) ?></h2>
-    </div>
-    <div id="content">
-<?php
-if ( $pagination )
-{
-?>
-      <h3 class="pagination"><?php echo $pagination ?></h3>
-<?php
-}
-?>
-      <div id="eventFrames">
-<?php
-foreach ( $frames as $frame )
-{
-    $imageData = getImageSrc( $event, $frame, $scale );
-?>
-       <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>" alt="<?php echo $frame['Type'] ?>/<?php echo $frame['Type']=='Alarm'?$frame['Score']:0 ?>"/></a>
-<?php
-}
-?>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/eventdetails.php b/web/skins/mobile/views/eventdetails.php
deleted file mode 100644
index deee5eef2..000000000
--- a/web/skins/mobile/views/eventdetails.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-//
-// ZoneMinder web event details view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$event = dbFetchOne( 'select E.*,M.Name as MonitorName from Events as E, Monitors as M where E.Id = ? and E.MonitorId = M.Id', NULL, array($_REQUEST['eid']) );
-$frame = dbFetchOne( 'select * from Frames where EventID = ? and Score = ?', NULL, array($_REQUEST['eid'],$event['MaxScore']) );
-
-$scale = getDeviceScale( $event['Width'], $event['Height'], 2.2 );
-
-$image1 = getImageSrc( $event, 1, $scale );
-if ( $frame['Type'] == 'Alarm' )
-    $image2 = getImageSrc( $event, $frame['FrameId'], $scale );
-else
-    $image2 = getImageSrc( $event, intval($event['Frames']/2), $scale );
-
-xhtmlHeaders( __FILE__, translate('Event').' - '.$_REQUEST['eid'] );
-?>
-<body>
-  <div id="page">
-    <div id="content">
-      <table id="contentTable" class="major">
-        <tr>
-          <th scope="row"><?php echo translate('Name') ?></th>
-          <td><?php echo htmlentities($event['Name']) ?><?php echo $event['Archived']?("(".translate('Archived').")"):"" ?></td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Time') ?></th>
-          <td><?php echo htmlentities(strftime("%b %d, %H:%M",strtotime($event['StartTime']))) ?></td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Duration') ?></th>
-          <td><?php echo htmlentities($event['Length']) ?>s</td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Cause') ?></th>
-          <td><?php echo htmlentities($event['Cause']) ?></td>
-        </tr>
-        <?php if ( !empty($event['Notes']) ) { ?>
-        <tr>
-          <th scope="row"><?php echo translate('Notes') ?></th>
-          <td><?php echo htmlentities($event['Notes']) ?></td>
-        </tr>
-        <?php } ?>
-        <tr>
-          <th scope="row"><?php echo translate('Frames') ?></th>
-          <td><?php echo $event['Frames'] ?> (<?php echo $event['AlarmFrames'] ?>)</td>
-        </tr>
-        <tr>
-          <th scope="row"><?php echo translate('Score') ?></th>
-          <td><?php echo $event['TotScore'] ?>/<?php echo $event['AvgScore'] ?>/<?php echo $event['MaxScore'] ?></td>
-        </tr>
-      </table>
-      <div id="eventImages">
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=1"><img src="<?php echo viewImagePath( $image1['thumbPath'] ) ?>" alt="1"/></a>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>"><img src="<?php echo viewImagePath( $image2['thumbPath'] ) ?>" alt="<?php echo $frame['FrameId'] ?>"/></a>
-      </div>
-      <div id="contenButtons">
-        <a href="?view=event&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;page=1"><?php echo translate('Frames') ?></a>
-        <a href="?view=video&amp;eid=<?php echo $_REQUEST['eid'] ?>"><?php echo translate('Video') ?></a>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/events.php b/web/skins/mobile/views/events.php
deleted file mode 100644
index 40dd6eff8..000000000
--- a/web/skins/mobile/views/events.php
+++ /dev/null
@@ -1,157 +0,0 @@
-<?php
-//
-// ZoneMinder web events view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $view = "error";
-    return;
-}
-
-$sql = "select * from Monitors";
-foreach ( dbFetchAll( $sql ) as $row )
-{
-    $monitors[$row['Id']] = $row;
-}
-
-if ( isset($_REQUEST['filterName']) )
-{
-    $dbFilter = dbFetchOne( 'SELECT * FROM Filters WHERE Name = ?', NULL, array($_REQUEST['filterName']) );
-    $_REQUEST['filter'] = jsonDecode( $dbFilter['Query'] );
-    $_REQUEST['sort_field'] = isset($_REQUEST['filter']['sort_field'])?$_REQUEST['filter']['sort_field']:"DateTime";
-    $_REQUEST['sort_asc'] = isset($_REQUEST['filter']['sort_asc'])?$_REQUEST['filter']['sort_asc']:"1";
-    $_REQUEST['limit'] = isset($_REQUEST['filter']['limit'])?$_REQUEST['filter']['limit']:"";
-    unset( $_REQUEST['filter']['sort_field'] );
-    unset( $_REQUEST['filter']['sort_asc'] );
-    unset( $_REQUEST['filter']['limit'] );
-}
-
-if ( empty($_REQUEST['sort_field']) )
-    $_REQUEST['sort_field'] = "DateTime";
-if ( empty($_REQUEST['sort_asc']) )
-    $_REQUEST['sort_asc'] = "1";
-
-$countSql = "select count(E.Id) as EventCount from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
-$eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived from Monitors as M inner join Events as E on (M.Id = E.MonitorId) where";
-if ( $user['MonitorIds'] )
-{
-    $countSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-    $eventsSql .= " M.Id in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-}
-else
-{
-    $countSql .= " 1";
-    $eventsSql .= " 1";
-}
-
-parseSort( true, '&amp;' );
-parseFilter( $_REQUEST['filter'], true, '&amp;' );
-$filterQuery = $_REQUEST['filter']['query'];
-
-if ( $_REQUEST['filter']['sql'] )
-{
-    $countSql .= $_REQUEST['filter']['sql'];
-    $eventsSql .= $_REQUEST['filter']['sql'];
-}
-$eventsSql .= " order by $sortColumn $sortOrder";
-
-$deviceLines = (isset($device)&&!empty($device['lines']))?$device['lines']:DEVICE_LINES;
-// Allow for headers etc
-$deviceLines -= 2;
-
-if ( !empty($_REQUEST['page']) )
-{
-    $limitStart = (($_REQUEST['page']-1)*$deviceLines);
-    if ( empty($_REQUEST['limit']) )
-    {
-        $limitAmount = $deviceLines;
-    }
-    else
-    {
-        $limitLeft = $_REQUEST['limit'] - $limitStart;
-        $limitAmount = ($limitLeft>$deviceLines)?$deviceLines:$limitLeft;
-    }
-    $eventsSql .= " limit $limitStart, $limitAmount";
-}
-elseif ( !empty( $_REQUEST['limit'] ) )
-{
-    $eventsSql .= " limit 0, ".$_REQUEST['limit'];
-}
-
-$nEvents = dbFetchOne( $countSql, 'EventCount' );
-if ( !empty($limit) && $nEvents > $_REQUEST['limit'] )
-{
-    $nEvents = $_REQUEST['limit'];
-}
-$pages = (int)ceil($nEvents/$deviceLines);
-
-$maxShortcuts = 3;
-$pagination = getPagination( $pages, $_REQUEST['page'], $maxShortcuts, $filterQuery.$sortQuery.'&amp;limit='.$_REQUEST['limit'], '&amp;' );
-
-xhtmlHeaders( __FILE__, translate('Events') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="headerButtons"><?php echo makeLink( "?view=filter", empty($_REQUEST['filterName'])?translate('ChooseFilter'):$_REQUEST['filterName'], canView( 'Events' ) ) ?></div>
-      <h2><?php echo sprintf( $CLANG['EventCount'], $nEvents, zmVlang( $VLANG['Event'], $nEvents ) ) ?></h2>
-    </div>
-    <div id="content">
-<?php
-if ( $pagination )
-{
-?>
-      <h3 class="pagination"><?php echo $pagination ?></h3>
-<?php
-}
-?>
-      <table id="contentTable" class="major">
-<?php
-    $count = 0;
-    foreach ( dbFetchAll( $eventsSql ) as $event )
-    {
-        if ( ($count++%$deviceLines) == 0 )
-        {
-?>
-        <tr>
-          <th class="colId"><a href="<?php echo sortHeader( 'Id', '&amp;' ) ?>"><?php echo substr( translate('Id'), 0, 3 ) ?><?php echo sortTag( 'Id' ) ?></a></th>
-          <th class="colTime"><a href="<?php echo sortHeader( 'StartTime', '&amp;' ) ?>"><?php echo substr( translate('Time'), 0, 3 ) ?><?php echo sortTag( 'StartTime' ) ?></a></th>
-          <th class="colDuration"><a href="<?php echo sortHeader( 'Length', '&amp;' ) ?>"><?php echo substr( translate('Duration'), 0, 3 ) ?><?php echo sortTag( 'Length' ) ?></a></th>
-          <th class="colFrames"><a href="<?php echo sortHeader( 'Frames', '&amp;' ) ?>"><?php echo substr( translate('Frames'), 0, 3 ) ?><?php echo sortTag( 'Frames' ) ?></a></th>
-          <th class="colScore"><a href="<?php echo sortHeader( 'TotScore', '&amp;' ) ?>"><?php echo substr( translate('Score'), 0, 3 ) ?><?php echo sortTag( 'TotScore' ) ?></a></th>
-        </tr>
-<?php
-        }
-?>
-        <tr>
-          <td class="colId"><a href="?view=eventdetails&amp;eid=<?php echo $event['Id'] ?>&amp;page=1"><?php echo $event['Id'] ?><?php if ( $event['Archived'] ) echo "*" ?></a></td>
-          <td class="colTime"><?php echo strftime( "%d/%H:%M", strtotime($event['StartTime']) ) ?></td>
-          <td class="colDuration"><?php echo sprintf( "%d", $event['Length'] ) ?></td>
-          <td class="colFrames"><a href="?view=event&amp;eid=<?php echo $event['Id'] ?>&amp;page=1"><?php echo $event['AlarmFrames'] ?></a></td>
-          <td class="colScore"><a href="?view=frame&amp;eid=<?php echo $event['Id'] ?>&amp;fid=0"><?php echo $event['MaxScore'] ?></a></td>
-        </tr>
-<?php
-    }
-?>
-      </table>
-      <p><a href="?view=console"><?php echo translate('Console') ?></a></p>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/filter.php b/web/skins/mobile/views/filter.php
deleted file mode 100644
index 4613f3c3c..000000000
--- a/web/skins/mobile/views/filter.php
+++ /dev/null
@@ -1,71 +0,0 @@
-<?php
-//
-// ZoneMinder web filter view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$filterNames = array();
-$sql = "select * from Filters order by Name";
-foreach( dbFetchAll( $sql ) as $row )
-{
-    $filterNames[$row['Name']] = $row['Name'];
-}
-
-xhtmlHeaders( __FILE__, translate('EventFilter') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="events"/>
-            <input type="hidden" name="page" value="1"/>
-          </fieldset>
-        </div>
-<?php
-if ( count($filterNames) > 0 )
-{
-?>
-        <div>
-          <label for="filterName"><?php echo translate('UseFilter') ?></label><?php echo buildSelect( "filterName", $filterNames ); ?>
-        </div>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Submit') ?>"/>
-        </div>
-<?php
-}
-else
-{
-?>
-        <p><?php echo translate('NoSavedFilters') ?></p>
-<?php
-}
-?>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/frame.php b/web/skins/mobile/views/frame.php
deleted file mode 100644
index f9bb41633..000000000
--- a/web/skins/mobile/views/frame.php
+++ /dev/null
@@ -1,73 +0,0 @@
-<?php
-//
-// ZoneMinder web frame view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultScale FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?';
-$event = dbFetchOne( $sql, NULL, array( $_REQUEST['eid'] ) );
-
-if ( !empty($_REQUEST['fid']) )
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND FrameId = ?', NULL, array( $_REQUEST['eid'], $_REQUEST['fid'] ) );
-}
-else
-{
-    $frame = dbFetchOne( 'SELECT * FROM Frames WHERE EventID = ? AND Score = ?', NULL, array( $_REQUEST['eid'], $event['MaxScore'] ) );
-}
-
-$maxFid = $event['Frames'];
-
-$firstFid = 1;
-$prevFid = $frame['FrameId']-1;
-$nextFid = $frame['FrameId']+1;
-$lastFid = $maxFid;
-
-$scale = getDeviceScale( $event['Width'], $event['Height'], 1.1 );
-
-$imageData = getImageSrc( $event, $frame, $scale, (isset($_REQUEST['show'])&&$_REQUEST['show']=="capt") );
-
-xhtmlHeaders( __FILE__, translate('Frame').' - '.$_REQUEST['eid'].'-'.$frame['FrameId'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('Frame') ?> <?php echo $_REQUEST['eid']."-".$frame['FrameId']." (".$frame['Score'].")" ?></h2>
-    </div>
-    <div id="content">
-      <?php if ( $imageData['hasAnalImage'] ) { ?><a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $frame['FrameId'] ?>&amp;show=<?php echo $imageData['isAnalImage']?"capt":"anal" ?>"><?php } ?><img src="<?php echo viewImagePath( $imageData['thumbPath'] ) ?>" class="<?php echo $imageData['imageClass'] ?>"/><?php if ( $imageData['hasAnalImage'] ) { ?></a><?php } ?>
-      <div id="contentButtons">
-<?php if ( $frame['FrameId'] > 1 ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $firstFid ?>">&lt;&lt;</a>
-<?php } if ( $frame['FrameId'] > 1 ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $prevFid ?>">&lt;</a>
-<?php } if ( $frame['FrameId'] < $maxFid ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $nextFid ?>">&gt;</a>
-<?php } if ( $frame['FrameId'] < $maxFid ) { ?>
-        <a href="?view=frame&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;fid=<?php echo $lastFid ?>">&gt;&gt;</a>
-<?php } ?>
-      </div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/function.php b/web/skins/mobile/views/function.php
deleted file mode 100644
index 421d91063..000000000
--- a/web/skins/mobile/views/function.php
+++ /dev/null
@@ -1,66 +0,0 @@
-<?php
-//
-// ZoneMinder web function view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canEdit( 'Monitors' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-$monitor = dbFetchMonitor( $_REQUEST['mid'] );
-
-xhtmlHeaders( __FILE__, translate('Function').' - '.$monitor['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo sprintf( $CLANG['MonitorFunction'], $monitor['Name'] ) ?></h2>
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="console"/>
-            <input type="hidden" name="action" value="function"/>
-            <input type="hidden" name="mid" value="<?php echo $_REQUEST['mid'] ?>"/>
-          </fieldset>
-        </div>
-        <div>
-          <select name="newFunction">
-<?php
-foreach ( getEnumValues( 'Monitors', 'Function' ) as $optFunction )
-{
-?>
-            <option value="<?php echo $optFunction ?>"<?php if ( $optFunction == $monitor['Function'] ) { ?> selected="selected"<?php } ?>><?php echo $optFunction ?></option>
-<?php
-}
-?>
-          </select>
-        </div>
-        <div>
-          <label for="newEnabled"><?php echo translate('Enabled') ?></label><input type="checkbox" name="newEnabled" id="newEnabled" value="1"<?php if ( !empty($monitor['Enabled']) ) { ?> checked="checked"<?php } ?>/>
-        </div>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Save') ?>"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/login.php b/web/skins/mobile/views/login.php
deleted file mode 100644
index 6eb0b7db9..000000000
--- a/web/skins/mobile/views/login.php
+++ /dev/null
@@ -1,54 +0,0 @@
-<?php
-//
-// ZoneMinder web login view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-
-xhtmlHeaders( __FILE__, translate('Login') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h1>ZoneMinder <?php echo translate('Login') ?></h1>
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="action" value="login"/>
-            <input type="hidden" name="view" value="console"/>
-          </fieldset>
-        </div>
-        <table id="contentTable" class="minor">
-          <tr>
-            <th scope="row" class="colLeft"><?php echo translate('Username') ?></th>
-            <td class="colRight"><input type="text" name="username" value="<?php echo isset($username)?$username:"" ?>" size="12"/></td>
-          </tr>
-          <tr>
-            <th scope="row" class="colLeft"><?php echo translate('Password') ?></th>
-            <td class="colRight"><input type="password" name="password" value="" size="12"/></td>
-          </tr>
-        </table>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Login') ?>"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/montage.php b/web/skins/mobile/views/montage.php
deleted file mode 100644
index 8311fe6f4..000000000
--- a/web/skins/mobile/views/montage.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-//
-// ZoneMinder web montage view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Stream' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$imagesPerLine = 2;
-
-$sql = "select * from Groups where Name = 'Mobile'";
-$group = dbFetchOne( $sql );
-
-$sql = "select * from Monitors where Function != 'None' order by Sequence";
-$monitors = array();
-$maxWidth = 0;
-$maxHeight = 0;
-foreach( dbFetchAll( $sql ) as $row )
-{
-    if ( !visibleMonitor( $row['Id'] ) )
-        continue;
-
-    if ( $group && $group['MonitorIds'] && !in_array( $row['Id'], explode( ',', $group['MonitorIds'] ) ) )
-        continue;
-
-    if ( $maxWidth < $row['Width'] ) $maxWidth = $row['Width'];
-    if ( $maxHeight < $row['Height'] ) $maxHeight = $row['Height'];
-    $monitors[] = $row;
-}
-
-xhtmlHeaders( __FILE__, translate('Montage') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <div id="headerButtons">
-        <a href="?view=<?php echo $_REQUEST['view'] ?>"><?php echo translate('Refresh') ?></a>
-      </div>
-    </div>
-    <div id="content">
-      <div id="monitorImages">
-<?php
-foreach( $monitors as $monitor )
-{
-    $scale = getDeviceScale( $monitor['Width'], $monitor['Height'], $imagesPerLine*1.1 );
-    $imagePath = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ), '&amp;' );
-?>
-        <a href="?view=watch&amp;mid=<?php echo $monitor['Id'] ?>"><img src="<?php echo $imagePath ?>" alt="<?php echo $monitor['Name'] ?>"/></a>
-<?php
-}
-?>
-      </div>
-      <div id="contentButtons"><a href="?view=console"><?php echo translate('Console') ?></a></div>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/state.php b/web/skins/mobile/views/state.php
deleted file mode 100644
index 51cf71624..000000000
--- a/web/skins/mobile/views/state.php
+++ /dev/null
@@ -1,77 +0,0 @@
-<?php
-//
-// ZoneMinder web run state view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canEdit( 'System' ) )
-{
-    $view = "error";
-    return;
-}
-$running = daemonCheck();
-
-$states = dbFetchAll( "select * from States" );
-
-xhtmlHeaders( __FILE__, translate('State') );
-?>
-<body>
-  <div id="page">
-    <div id="header">
-      <h2><?php echo translate('RunState') ?></h2>
-    </div>
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="console"/>
-            <input type="hidden" name="action" value="state"/>
-          </fieldset>
-        </div>
-        <select name="runState">
-<?php
-if ( $running )
-{
-?>
-          <option value="stop" selected="selected"><?php echo translate('Stop') ?></option>
-          <option value="restart"><?php echo translate('Restart') ?></option>
-<?php
-}
-else
-{
-?>
-          <option value="start" selected="selected"><?php echo translate('Start') ?></option>
-<?php
-}
-?>
-<?php
-foreach ( $states as $state )
-{
-?>
-          <option value="<?php echo $state['Name'] ?>"><?php echo $state['Name'] ?></option>
-<?php
-}
-?>
-        </select>
-        <div id="contentButtons">
-          <input type="submit" value="<?php echo translate('Apply') ?>"/>
-        </div>
-      </form>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/video.php b/web/skins/mobile/views/video.php
deleted file mode 100644
index 8f7ac8654..000000000
--- a/web/skins/mobile/views/video.php
+++ /dev/null
@@ -1,226 +0,0 @@
-<?php
-//
-// ZoneMinder web video view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Events' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-if ( $user['MonitorIds'] )
-    $midSql = " and MonitorId in (".join( ",", preg_split( '/["\'\s]*,["\'\s]*/', $user['MonitorIds'] ) ).")";
-else
-    $midSql = '';
-
-$sql = 'SELECT E.*,M.Name AS MonitorName,M.DefaultRate FROM Events AS E INNER JOIN Monitors AS M ON E.MonitorId = M.Id WHERE E.Id = ?'.$midSql;
-$event = dbFetchOne( $sql, NULL, array($_REQUEST['eid']) );
-
-$deviceWidth = (isset($device)&&!empty($device['width']))?$device['width']:DEVICE_WIDTH;
-$deviceHeight = (isset($device)&&!empty($device['height']))?$device['height']:DEVICE_HEIGHT;
-
-if ( $deviceWidth >= 352 && $deviceHeight >= 288 )
-    $videoSize = "352x288";
-elseif ( $deviceWidth >= 176 && $deviceHeight >= 144 )
-    $videoSize = "176x144";
-else
-    $videoSize = "128x96";
-
-$eventWidth = $event['Width'];
-$eventHeight = $event['Height'];
-
-if ( !isset( $rate ) )
-    $_REQUEST['rate'] = reScale( RATE_BASE, $event['DefaultRate'], ZM_WEB_DEFAULT_RATE );
-
-$eventPath = ZM_DIR_EVENTS.'/'.getEventPath( $event );
-
-$videoFormats = array();
-$ffmpegFormats = preg_split( '/\s+/', ZM_FFMPEG_FORMATS );
-foreach ( $ffmpegFormats as $ffmpegFormat )
-{
-    preg_match( '/^([^*]+)(\**)$/', $ffmpegFormat, $matches );
-    $videoFormats[$matches[1]] = $matches[1];
-    if ( $matches[2] == '*' )
-        $defaultVideoFormat = $matches[1];
-    elseif ( $matches[2] == '**' )
-        $defaultPhoneFormat = $matches[1];
-}
-if ( !isset($_REQUEST['videoFormat']) )
-{
-    if ( isset($defaultPhoneFormat) )
-        $_REQUEST['videoFormat'] = $defaultPhoneFormat;
-    elseif ( isset($defaultVideoFormat) )
-        $_REQUEST['videoFormat'] = $defaultVideoFormat;
-    else
-        $videoFormat = $ffmpegFormats[0];
-}
-
-if ( !empty($_REQUEST['generate']) )
-{
-    $videoFile = createVideo( $event, $_REQUEST['videoFormat'], $_REQUEST['rate'], $videoSize, !empty($_REQUEST['overwrite']) );
-}
-
-$videoFiles = array();
-if ( $dir = opendir( $eventPath ) )
-{
-    while ( ($file = readdir( $dir )) !== false )
-    {
-        $file = $eventPath.'/'.$file;
-        if ( is_file( $file ) )
-        {
-            if ( preg_match( '/-S([\da-z]+)\.(?:'.join( '|', $videoFormats ).')$/', $file, $matches ) )
-            {
-                if ( $matches[1] == $videoSize )
-                {
-                    $videoFiles[] = $file;
-                }
-            }
-        }
-    }
-    closedir( $dir );
-}
-
-if ( isset($_REQUEST['download']) )
-{
-    header( "Content-type: ".getMimeType($videoFiles[$_REQUEST['download']]));
-    header( "Content-length: ".filesize($videoFiles[$_REQUEST['download']]));
-    header( "Content-disposition: attachment; filename=".preg_replace( "/^.*\//", "", $videoFiles[$_REQUEST['download']] )."; size=".filesize($videoFiles[$_REQUEST['download']]) );
-    readfile( $videoFiles[$_REQUEST['download']] );
-    exit;
-}
-
-xhtmlHeaders( __FILE__, translate('Video').' - '.$event['Name'] );
-?>
-<body>
-  <div id="page">
-    <div id="content">
-      <form method="post" action="<?php echo $_SERVER['PHP_SELF'] ?>">
-        <div class="hidden">
-          <fieldset>
-            <input type="hidden" name="view" value="<?php echo $_REQUEST['view'] ?>"/>
-            <input type="hidden" name="eid" value="<?php echo $_REQUEST['eid'] ?>"/>
-            <input type="hidden" name="generate" value="1"/>
-          </fieldset>
-        </div>
-        <table id="contentTable" class="minor">
-          <tr>
-            <th scope="row"><?php echo translate('VideoFormat') ?></th>
-            <td><?php echo buildSelect( "videoFormat", $videoFormats ) ?></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('FrameRate') ?></th>
-            <td><?php echo buildSelect( "rate", $rates ) ?></td>
-          </tr>
-          <tr>
-            <th scope="row"><?php echo translate('OverwriteExisting') ?></th>
-            <td><input type="checkbox" name="overwrite" value="1"<?php if ( isset($overwrite) ) { ?> checked="checked"<?php } ?>/></td>
-          </tr>
-        </table>
-        <div id="contentButtons"><input type="submit" value="<?php echo translate('GenerateVideo') ?>"/></div>
-      </form>
-<?php
-    if ( isset($videoFile) )
-    {
-        if ( $videoFile )
-        {
-?>
-      <p class="infoText"><?php echo translate('VideoGenSucceeded') ?></p>
-<?php
-        }
-        else
-        {
-?>
-      <p class="errorText"><?php echo translate('VideoGenFailed') ?></p>
-<?php
-        }
-    }
-?>
-<?php
-    if ( count($videoFiles) )
-    {
-        if ( isset($_REQUEST['delete']) )
-        {
-            unlink( $videoFiles[$_REQUEST['delete']] );
-            unset( $videoFiles[$_REQUEST['delete']] );
-        }
-    }
-    if ( count($videoFiles) )
-    {
-?>
-      <h3><?php echo translate('VideoGenFiles') ?></h3>
-      <table class="major">
-        <tr>
-          <th><?php echo translate('Format') ?></th>
-          <th><?php echo translate('Size') ?></th>
-          <th><?php echo translate('Rate') ?></th>
-          <th><?php echo translate('Scale') ?></th>
-          <th><?php echo translate('Action') ?></th>
-        </tr>
-<?php
-        if ( count($videoFiles) > 0 )
-        {
-            $index = 0;
-            foreach ( $videoFiles as $file )
-            {
-                preg_match( '/^(.+)-((?:r[_\d]+)|(?:F[_\d]+))-((?:s[_\d]+)|(?:S[0-9a-z]+))\.([^.]+)$/', $file, $matches );
-                if ( preg_match( '/^r(.+)$/', $matches[2], $temp_matches ) )
-                {
-                    $rate = (int)(100 * preg_replace( '/_/', '.', $temp_matches[1] ) );
-                    $rateText = isset($rates[$rate])?$rates[$rate]:($rate."x");
-                }
-                elseif ( preg_match( '/^F(.+)$/', $matches[2], $temp_matches ) )
-                {
-                    $rateText = $temp_matches[1]."fps";
-                }
-                if ( preg_match( '/^s(.+)$/', $matches[3], $temp_matches ) )
-                {
-                    $scale = (int)(100 * preg_replace( '/_/', '.', $temp_matches[1] ) );
-                    $scaleText = isset($scales[$scale])?$scales[$scale]:($scale."x");
-                }
-                elseif ( preg_match( '/^S(.+)$/', $matches[3], $temp_matches ) )
-                {
-                    $scaleText = $temp_matches[1];
-                }
-?>
-        <tr>
-          <td><?php echo $matches[4] ?></td>
-          <td><?php echo filesize( $file ) ?></td>
-          <td><?php echo $rateText ?></td>
-          <td><?php echo $scaleText ?></td>
-          <td><a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;download=<?php echo $index ?>"><?php echo translate('View') ?></a>&nbsp;/&nbsp;<a href="?view=<?php echo $_REQUEST['view'] ?>&amp;eid=<?php echo $_REQUEST['eid'] ?>&amp;delete=<?php echo $index ?>"><?php echo translate('Delete') ?></a></td>
-        </tr>
-<?php
-                $index++;
-            }
-        }
-?>
-      </table>
-<?php
-    }
-    else
-    {
-?>
-      <p class="warnText"><?php echo translate('VideoGenNoFiles') ?></p>
-<?php
-    }
-?>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/mobile/views/watch.php b/web/skins/mobile/views/watch.php
deleted file mode 100644
index b61001db9..000000000
--- a/web/skins/mobile/views/watch.php
+++ /dev/null
@@ -1,154 +0,0 @@
-<?php
-//
-// ZoneMinder web watch view file, $Date$, $Revision$
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-if ( !canView( 'Stream' ) )
-{
-    $_REQUEST['view'] = "error";
-    return;
-}
-
-$sql = 'select C.*, M.* from Monitors as M left join Controls as C on (M.ControlId = C.Id ) where M.Id = ?';
-$monitor = dbFetchOne( $sql, NULL, array($_REQUEST['mid']) );
-
-$showPtzControls = ( ZM_OPT_CONTROL && $monitor['Controllable'] && canView( 'Control' ) );
-
-$zmuCommand = getZmuCommand( " -m ".$_REQUEST['mid']." -s -f" );
-$zmuOutput = exec( escapeshellcmd( $zmuCommand ) );
-list( $status, $fps ) = explode( ' ', $zmuOutput );
-$statusString = translate('Unknown');
-$fpsString = "--.--";
-$class = "infoText";
-if ( $status <= STATE_PREALARM )
-{
-    $statusString = translate('Idle');
-}
-elseif ( $status == STATE_ALARM )
-{
-    $statusString = translate('Alarm');
-    $class = "errorText";
-}
-elseif ( $status == STATE_ALERT )
-{
-    $statusString = translate('Alert');
-    $class = "warnText";
-}
-elseif ( $status == STATE_TAPE )
-{
-    $statusString = translate('Record');
-}
-$fpsString = sprintf( "%.2f", $fps );
-
-$sql = "select * from Monitors where Function != 'None' order by Sequence";
-$monitors = array();
-$monIdx = 0;
-$maxWidth = 0;
-$maxHeight = 0;
-foreach( dbFetchAll( $sql ) as $row )
-{
-    if ( !visibleMonitor( $row['Id'] ) )
-    {
-        continue;
-    }
-    if ( isset($monitor['Id']) && $row['Id'] == $monitor['Id'] )
-        $monIdx = count($monitors);
-    if ( $maxWidth < $row['Width'] ) $maxWidth = $row['Width'];
-    if ( $maxHeight < $row['Height'] ) $maxHeight = $row['Height'];
-    $monitors[] = $row;
-}
-
-//$monitor = $monitors[$monIdx];
-$nextMid = $monIdx==(count($monitors)-1)?$monitors[0]['Id']:$monitors[$monIdx+1]['Id'];
-$prevMid = $monIdx==0?$monitors[(count($monitors)-1)]['Id']:$monitors[$monIdx-1]['Id'];
-
-if ( isset( $_REQUEST['scale'] ) )
-    $scale = validInt($_REQUEST['scale']);
-else
-    $scale = getDeviceScale( $monitor['Width'], $monitor['Height'] );
-$imageSrc = getStreamSrc( array( "mode=single", "monitor=".$monitor['Id'], "scale=".$scale ), '&amp;' );
-
-if ( ZM_WEB_STREAM_METHOD == 'mpeg' && ZM_MPEG_LIVE_FORMAT )
-{
-    $streamMode = "mpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "bitrate=".ZM_WEB_VIDEO_BITRATE, "maxfps=".ZM_WEB_VIDEO_MAXFPS, "format=".ZM_MPEG_LIVE_FORMAT ) );
-}
-elseif ( canStream() )
-{
-    $streamMode = "jpeg";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale, "maxfps=".ZM_WEB_VIDEO_MAXFPS ) );
-}
-else
-{
-    $streamMode = "single";
-    $streamSrc = getStreamSrc( array( "mode=".$streamMode, "monitor=".$monitor['Id'], "scale=".$scale ) );
-}
-
-xhtmlHeaders( __FILE__, $monitor['Name'].' - '.translate('Watch') );
-?>
-<body>
-  <div id="page">
-    <div id="content">
-      <p class="<?php echo $class ?>"><?php echo makeLink( "?view=events&amp;page=1&amp;view=events&amp;page=1&amp;filter%5Bterms%5D%5B0%5D%5Battr%5D%3DMonitorId&amp;filter%5Bterms%5D%5B0%5D%5Bop%5D%3D%3D&amp;filter%5Bterms%5D%5B0%5D%5Bval%5D%3D".$monitor['Id']."&amp;sort_field=Id&amp;sort_desc=1", $monitor['Name'], canView( 'Events' ) ) ?>:&nbsp;<?php echo $statusString ?>&nbsp;-&nbsp;<?php echo $fpsString ?>&nbsp;fps</p>
-      <p>
-<?php
-if ( $streamMode == "mpeg" )
-{
-    outputVideoStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), ZM_MPEG_LIVE_FORMAT, $monitor['Name'] );
-}
-elseif ( $streamMode == "jpeg" )
-{
-    if ( canStreamNative() )
-        outputImageStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
-    elseif ( canStreamApplet() )
-        outputHelperStream( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] );
-}
-else
-{
-?>
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $monitor['Id'] ?>"><?php echo outputImageStill( "liveStream", $streamSrc, reScale( $monitor['Width'], $scale ), reScale( $monitor['Height'], $scale ), $monitor['Name'] ); ?></a>
-<?php
-}
-?>
-      </p>
-<?php
-if ( $showPtzControls )
-{
-    foreach ( getSkinIncludes( 'includes/control_functions.php' ) as $includeFile )
-        require_once $includeFile;
-?>
-      <div id="ptzControls">
-        <?php echo ptzControls( $monitor ) ?>
-      </div>
-<?php
-}
-if ( $nextMid != $monitor['Id'] || $prevMid != $monitor['Id'] )
-{
-?>
-      <div id="contentButtons">
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $prevMid ?>"><?php echo translate('Prev') ?></a>
-        <a href="?view=console"><?php echo translate('Console') ?></a>
-        <a href="?view=<?php echo $_REQUEST['view'] ?>&amp;mid=<?php echo $nextMid ?>"><?php echo translate('Next') ?></a>
-      </div>
-<?php
-}
-?>
-    </div>
-  </div>
-</body>
-</html>
diff --git a/web/skins/xml/Makefile.am b/web/skins/xml/Makefile.am
deleted file mode 100644
index 2c30d19a3..000000000
--- a/web/skins/xml/Makefile.am
+++ /dev/null
@@ -1,10 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/xml
-
-SUBDIRS = \
-	includes \
-	views
-
-dist_web_DATA = \
-	skin.php
diff --git a/web/skins/xml/includes/Makefile.am b/web/skins/xml/includes/Makefile.am
deleted file mode 100644
index c6128f8a2..000000000
--- a/web/skins/xml/includes/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/skins/xml/includes
-
-dist_web_DATA = \
-	init.php \
-	config.php \
-	functions.php
diff --git a/web/skins/xml/includes/config.php b/web/skins/xml/includes/config.php
deleted file mode 100644
index 66d3af5ee..000000000
--- a/web/skins/xml/includes/config.php
+++ /dev/null
@@ -1,155 +0,0 @@
-<?php
-/* 
- * config.php is created by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email jdhar@eyezm.com (http://www.eyezm.com)
- *
- */
-
-/* Static defines, these shouldn't change */
-define ( "ZM_EYEZM_PROTOCOL_VERSION", "2");
-define ( "ZM_EYEZM_FEATURE_SET", "3");
-
-/* Dynamic defines, check if they are already defined.
- * To change a particular parameter default value, without using the
- * Options Console, change the 2nd parameter of the define() block. */
-
-/* Parm: ZM_EYEZM_EVENT_FPS: Sets the default FPS of the output videos for events */
-if (!defined("ZM_EYEZM_EVENT_FPS")) define ( "ZM_EYEZM_EVENT_FPS", "10");
-/* Parm: ZM_EYEZM_EVENT_VCODEC: Default video codec for generating event video. Can be mpeg4 or h264 */
-if (!defined("ZM_EYEZM_EVENT_VCODEC")) define ( "ZM_EYEZM_EVENT_VCODEC", "mpeg4");
-/* Parm: ZM_EYEZM_FEED_VCODEC: Default video codec of live feeds. Can be mjpeg or h264 */
-if (!defined("ZM_EYEZM_FEED_VCODEC")) define ( "ZM_EYEZM_FEED_VCODEC", "mjpeg");
-/* Parm: ZM_EYEZM_SEG_DURATION: H264 Live-streaming segment duration in seconds.
- * Increase to improve feed smooth-ness, but will increase feed latency */
-if (!defined("ZM_EYEZM_SEG_DURATION")) define ( "ZM_EYEZM_SEG_DURATION", "3");
-/* Parm: ZM_EYEZM_DEBUG: Set to 1 to enable XML Debugging */
-if (!defined("ZM_EYEZM_DEBUG")) define ( "ZM_EYEZM_DEBUG", "0" );
-/* Parm: ZM_EYEZM_H264_MAX_DURATION: Maximum duration in seconds allowed for viewing H264 Streams.
- * This is useful for systems that crash or stall when viewing H264 streams. After the timeout
- * expires, the H264 stream will be killed if it has not by the user already */
-if (!defined("ZM_EYEZM_H264_MAX_DURATION")) define ( "ZM_EYEZM_H264_MAX_DURATION", "120" );
-/* Parm: ZM_EYEZM_DEFAULT_BR: Default bitrate of H264 live-feed (when selected).
- * This parameter can be changed to anything FFMPEG supports. 64k is a good lower bound, and 392k
- * a good upper */
-if (!defined("ZM_EYEZM_H264_DEFAULT_BR")) define ( "ZM_EYEZM_H264_DEFAULT_BR", "96k" );
-/* Parm: ZM_EYEZM_H264_TIMEOUT: How long to wait for H264 stream to be created. Increase
- * this value for streams that take a while to create, or for slow systems that time-out frequently */
-if (!defined("ZM_EYEZM_H264_TIMEOUT")) define ( "ZM_EYEZM_H264_TIMEOUT", "20" );
-/* Parm: ZM_EYEZM_H264_DEFAULT_EVBR: Default bit-rate when creasing H264 Event videos */
-if (!defined("ZM_EYEZM_H264_DEFAULT_EVBR")) define ( "ZM_EYEZM_H264_DEFAULT_EVBR", "128k" );
-/* Logging defines */
-/* Parm: ZM_EYEZM_LOG_TO_FILE: Set to 1 to log XML Debug output to a separate file, when
- * ZM_EYEZM_DEBUG is set to 1. If set to 0, XML Logging will be directed to Apache error log */
-if (!defined("ZM_EYEZM_LOG_TO_FILE")) define ( "ZM_EYEZM_LOG_TO_FILE", "1" );
-/* Parm: ZM_EYEZM_LOG_FILE: Path to filename when LOG_TO_FILE is enabled */
-if (!defined("ZM_EYEZM_LOG_FILE")) define ( "ZM_EYEZM_LOG_FILE", "/tmp/zm_xml.log" );
-/* Parm: How many lines to display when viewing log from eyeZm */
-if (!defined("ZM_EYEZM_LOG_LINES")) define ( "ZM_EYEZM_LOG_LINES", "50" );
-
-$rates = array(
-    "10000" => "100x",
-    "5000" => "50x",
-    "2500" => "25x",
-    "1000" => "10x",
-    "400" => "4x",
-    "200" => "2x",
-    "100" => translate('Real'),
-    "50" => "1/2x",
-    "25" => "1/4x",
-);
-
-$scales = array(
-    "400" => "4x",
-    "300" => "3x",
-    "200" => "2x",
-    "150" => "1.5x",
-    "100" => translate('Actual'),
-    "75" => "3/4x",
-    "50" => "1/2x",
-    "33" => "1/3x",
-    "25" => "1/4x",
-);
-
-$bwArray = array(
-    "high" => translate('High'),
-    "medium" => translate('Medium'),
-    "low" => translate('Low')
-);
-
-/* Check if ZM_WEB_L_CAN_STREAM and ZM_WEB_L_STREAM_METHOD are defined */
-if (!defined("ZM_WEB_L_CAN_STREAM")) {
-	define ("ZM_WEB_L_CAN_STREAM", 1);
-	define ("ZM_WEB_M_CAN_STREAM", 1);
-	define ("ZM_WEB_H_CAN_STREAM", 1);
-}
-if (!defined("ZM_WEB_L_STREAM_METHOD")) {
-	define ("ZM_WEB_L_STREAM_METHOD", "jpeg");
-	define ("ZM_WEB_M_STREAM_METHOD", "jpeg");
-	define ("ZM_WEB_H_STREAM_METHOD", "jpeg");
-}
-
-switch ( $_COOKIE['zmBandwidth'] )
-{
-    case "high" :
-    {
-        define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_H_REFRESH_MAIN );         // How often (in seconds) the main console window refreshes
-        define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_H_REFRESH_CYCLE );       // How often the cycle watch windows swaps to the next monitor
-        define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_H_REFRESH_IMAGE );       // How often the watched image is refreshed (if not streaming)
-        define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_H_REFRESH_STATUS );     // How often the little status frame refreshes itself in the watch window
-        define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_H_REFRESH_EVENTS );     // How often the event listing is refreshed in the watch window, only for recent events
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_H_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_H_STREAM_METHOD );       // Which method should be used to send video streams to your browser
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_H_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_H_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_H_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_H_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_H_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_H_EVENTS_VIEW );           // What the default view of multiple events should be.
-        define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_H_SHOW_PROGRESS );       // Whether to show the progress of replay in event view.
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_H_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-        break;
-    }
-    case "medium" : 
-    {
-        define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_M_REFRESH_MAIN );         // How often (in seconds) the main console window refreshes
-        define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_M_REFRESH_CYCLE );       // How often the cycle watch windows swaps to the next monitor
-        define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_M_REFRESH_IMAGE );       // How often the watched image is refreshed (if not streaming)
-        define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_M_REFRESH_STATUS );     // How often the little status frame refreshes itself in the watch window
-        define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_M_REFRESH_EVENTS );     // How often the event listing is refreshed in the watch window, only for recent events
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_M_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_M_STREAM_METHOD );       // Which method should be used to send video streams to your browser
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_M_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_M_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_M_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_M_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_M_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_M_EVENTS_VIEW );           // What the default view of multiple events should be.
-        define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_M_SHOW_PROGRESS );       // Whether to show the progress of replay in event view.
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_M_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-        break;
-    }
-    case "low" :
-    {
-        define( "ZM_WEB_REFRESH_MAIN", ZM_WEB_L_REFRESH_MAIN );         // How often (in seconds) the main console window refreshes
-        define( "ZM_WEB_REFRESH_CYCLE", ZM_WEB_L_REFRESH_CYCLE );       // How often the cycle watch windows swaps to the next monitor
-        define( "ZM_WEB_REFRESH_IMAGE", ZM_WEB_L_REFRESH_IMAGE );       // How often the watched image is refreshed (if not streaming)
-        define( "ZM_WEB_REFRESH_STATUS", ZM_WEB_L_REFRESH_STATUS );     // How often the little status frame refreshes itself in the watch window
-	define( "ZM_WEB_REFRESH_EVENTS", ZM_WEB_L_REFRESH_EVENTS );     // How often the event listing is refreshed in the watch window, only for recent events
-        define( "ZM_WEB_CAN_STREAM", ZM_WEB_L_CAN_STREAM );             // Override the automatic detection of browser streaming capability
-        define( "ZM_WEB_STREAM_METHOD", ZM_WEB_L_STREAM_METHOD );       // Which method should be used to send video streams to your browser
-        define( "ZM_WEB_DEFAULT_SCALE", ZM_WEB_L_DEFAULT_SCALE );       // What the default scaling factor applied to 'live' or 'event' views is (%)
-        define( "ZM_WEB_DEFAULT_RATE", ZM_WEB_L_DEFAULT_RATE );         // What the default replay rate factor applied to 'event' views is (%)
-        define( "ZM_WEB_VIDEO_BITRATE", ZM_WEB_L_VIDEO_BITRATE );       // What the bitrate of any streamed video should be
-        define( "ZM_WEB_VIDEO_MAXFPS", ZM_WEB_L_VIDEO_MAXFPS );         // What the maximum frame rate of any streamed video should be
-        define( "ZM_WEB_SCALE_THUMBS", ZM_WEB_L_SCALE_THUMBS );         // Image scaling for thumbnails, bandwidth versus cpu in rescaling
-        define( "ZM_WEB_EVENTS_VIEW", ZM_WEB_L_EVENTS_VIEW );           // What the default view of multiple events should be.
-        define( "ZM_WEB_SHOW_PROGRESS", ZM_WEB_L_SHOW_PROGRESS );       // Whether to show the progress of replay in event view.
-        define( "ZM_WEB_AJAX_TIMEOUT", ZM_WEB_L_AJAX_TIMEOUT );         // Timeout to use for Ajax requests, no timeout used if unset
-        break;
-    }
-}
-
-?>
diff --git a/web/skins/xml/includes/functions.php b/web/skins/xml/includes/functions.php
deleted file mode 100644
index b84e65464..000000000
--- a/web/skins/xml/includes/functions.php
+++ /dev/null
@@ -1,447 +0,0 @@
-<?php
-/* 
- * functions.php is created by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email support@eyezm.com (http://www.eyezm.com)
- *
- */
-/* These functions are taken from functions.php */
-function validInteger( $input )
-{
-    return( preg_replace( '/\D/', '', $input ) );
-}
-
-function validString( $input )
-{
-    return( strip_tags( $input ) );
-}
-/* There appears to be some discrepancy btw. 1.24.1/2 and .3 for EventPaths, to escape them here */
-function getEventPathSafe($event)
-{
-	if (ZM_USE_DEEP_STORAGE) {
-		$ret = ZM_DIR_EVENTS."/".$event['MonitorId'].'/'.strftime( "%y/%m/%d/%H/%M/%S", strtotime($event['StartTime']) );
-	} else {
-		$ret = ZM_DIR_EVENTS."/".$event['MonitorId']."/".$event['Id'];
-	}
-	return $ret;
-}
-function updateClientVer()
-{
-	$str = $_SERVER['HTTP_USER_AGENT'];
-	/* Check if it starts with eyeZm */
-	if (!strcmp(substr($str, 0, 5),"eyeZm")) {
-		/* Found eyeZm */
-		$ver = substr($str, 6);
-		$verarray = explode(".", $ver);
-		$_SESSION['vermaj']=$verarray[0];
-		$_SESSION['vermin']=$verarray[1];
-		$_SESSION['verbuild']=$verarray[2];
-	}
-	logXml("(".$_SERVER['REMOTE_ADDR'].") GET: ".$_SERVER['REQUEST_URI']." - eyeZm ".getClientVerMaj().".".getClientVerMin());
-}
-function getClientVerMaj()
-{
-	if (isset($_SESSION['vermaj'])) return $_SESSION['vermaj'];
-	return "0";
-}
-function getClientVerMin()
-{
-	if (isset($_SESSION['vermin'])) return $_SESSION['vermin'];
-	return "0";
-}
-function requireVer($maj, $min)
-{
-	if (getClientVerMaj() > $maj) return 1;
-	if ((getClientVerMaj() == $maj) && (getClientVerMin() >= $min)) return 1;
-	return 0;
-}
-function logXmlErr($str)
-{
-	logXml($str, 1);
-}
-function logXml($str, $err = 0)
-{
-	if (!defined("ZM_EYEZM_DEBUG")) {
-		/* Check session variable */
-		if (isset($_SESSION['xml_debug'])) define("ZM_EYEZM_DEBUG", $_SESSION['xml_debug']);
-		else define ("ZM_EYEZM_DEBUG", "0");
-	}
-	if (!defined("ZM_EYEZM_LOG_TO_FILE")) {
-		/* Check session variable */
-		if (isset($_SESSION['xml_log_to_file'])) define("ZM_EYEZM_LOG_TO_FILE", $_SESSION['xml_log_to_file']);
-		else define ("ZM_EYEZM_LOG_TO_FILE", "1");
-	}
-	if (!defined("ZM_EYEZM_LOG_FILE")) {
-		/* Check session variable */
-		if (isset($_SESSION['xml_log_file'])) define("ZM_EYEZM_LOG_FILE", $_SESSION['xml_log_file']);
-		else define ("ZM_EYEZM_LOG_FILE", "/tmp/zm_xml.log");
-	}
-	/* Only log if debug is enabled */
-	if (ZM_EYEZM_DEBUG == 0) return;
-	/* Logging is enabled, set log string */
-	$logstr = "XML_LOG (".($err?"ERROR":"NOTICE")."): ".$str.(ZM_EYEZM_LOG_TO_FILE?"\n":"");
-	if (ZM_EYEZM_LOG_TO_FILE) {
-		error_log("[".date("r")."] ".$logstr, 3, ZM_EYEZM_LOG_FILE);
-	} else {
-		error_log($logstr);
-	}
-}
-/* Returns defval if varname is not set, otherwise return varname */
-function getset($varname, $defval)
-{
-	if (isset($_GET[$varname])) return $_GET[$varname];
-	return $defval;
-}
-function xml_header()
-{
-	header ("content-type: text/xml");
-	echo "<?xml version=\"1.0\" encoding=\"UTF-8\"?>";
-}
-function xml_tag_val($tag, $val)
-{
-	echo "<".$tag.">".$val."</".$tag.">";
-}
-function xml_tag_sec($tag, $open)
-{
-	if ($open) $tok = "<";
-	else $tok = "</";
-	echo $tok.$tag.">";
-}
-function xhtmlHeaders( $file, $title )
-{
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-<head>
-<style type="text/css">
-body {
-	border: 0px solid;
-	margin: 0px;
-	padding: 0px;
-}
-</style>
-	<script type="text/javascript">
-	</script>
-</head>
-<?php
-}
-/** Returns whether necessary components for H264 streaming
- * are present */
-function canStream264($sup = 0) {
-	if (!ffmpegSupportsCodec("libx264")) {
-		if (!$sup) logXmlErr("FFMPEG not installed, accessible in path/ZM_PATH_FFMPEG, or doesn't support libx264");
-		return FALSE;
-	}
-	/* Make sure segmenter exists */
-	if (!exeExists(shell_exec("which segmenter"))) {
-		if (!$sup) logXmlErr("HTTP segmenter not installed or not accessible in path");
-		return FALSE;
-	}
-	/* Check for zmstreamer */
-	if (!exeExists(shell_exec("which zmstreamer"))) {
-		if (!$sup) logXmlErr("ZMSTREAMER not installed or not accessible in path");
-		return FALSE;
-	}
-	return TRUE;
-}
-/* Returns the path of ffmpeg by using define */
-function getFfmpegPath()
-{
-	if (defined("ZM_PATH_FFMPEG")) {
-		return ZM_PATH_FFMPEG;
-	} else {
-		/* Not defined, get it from using 'which' */
-		return shell_exec("which ffmpeg");
-	}
-}
-/* Returns whether ffmpeg supports a given codec. Takes into account
- * whether FFMPEG exists or not */
-function ffmpegSupportsCodec($codec)
-{
-	if (!ffmpegExists()) return FALSE;
-	/* FFMPEG exists */
-	if (preg_match("/\b".$codec."\b/", shell_exec(getFfmpegPath()." -codecs 2> /dev/null")) > 0) {
-		/* More than one match */
-		return TRUE;
-	} else {
-		/* Check -formats tag also if we fail -codecs */
-		if (preg_match("/\b".$codec."\b/", shell_exec(getFfmpegPath()." -formats 2> /dev/null")) > 0) return TRUE;
-		return FALSE;
-	}
-}
-function exeExists($exepath)
-{
-	$path = trim($exepath);
-	return (file_exists($path) && is_readable($path) && ($path != ""));
-}
-/* Returns whether ffmpeg exists or not */
-function ffmpegExists()
-{
-	return exeExists(getFfmpegPath());
-}
-/* Returns with PHP-GD exists */
-function gdExists()
-{
-	if (extension_loaded('gd') && function_exists('gd_info')) {
-		return TRUE;
-	}
-	return FALSE;
-}
-	
-function getFfmpeg264FoutParms($br, $fout)
-{
-	$ffparms = "-analyzeduration 0 -acodec copy";
-	$ffparms .= " -vcodec libx264 -b ".$br;
-	$ffparms .= " -flags +loop -cmp +chroma -partitions +parti4x4+partp8x8+partb8x8";
-        $ffparms .= " -subq 5 -trellis 1 -refs 1 -coder 0 -me_range 16 -keyint_min 25";
-        $ffparms .= " -sc_threshold 40 -i_qfactor 0.71 -bt 16k";
-	$ffparms .= " -rc_eq 'blurCplx^(1-qComp)' -qcomp 0.6";
-	$ffparms .= " -qmin 10 -qmax 51 -qdiff 4 -level 30";
-	$ffparms .= " -g 30 -analyzeduration 0 -async 2 ".$fout." 2> /dev/null";
-	return $ffparms;
-}
-/** Return FFMPEG parameters for H264 streaming */
-function getFfmpeg264Str($width, $height, $br, $fin, $fout)
-{
-	$ffparms = getFfmpeg264FoutParms($br, $fout);
-	$ffstr = getFfmpegPath()." -t ".ZM_EYEZM_H264_MAX_DURATION." -analyzeduration 0 -i ";
-	$ffstr .= $fin." -f mpegts ".$ffparms;
-	return $ffstr;
-}
-/** Returns true when monitor exists */
-function isMonitor($monitor)
-{
-	$query = "select Id from Monitors where Id = ?";
-	$res = dbFetchOne($query, NULL, array($monitor));
-	if ($res) return TRUE;
-	logXml("Monitor ID ".$monitor." does not exist");	
-	return FALSE;
-}
-/** Returns the width and height of a monitor */
-function getMonitorDims($monitor)
-{
-	$query = "select Width,Height from Monitors where Id = ?";
-	$res = dbFetchOne($query, NULL, array( $monitor ) );
-	return $res;
-}
-/** Returns the temp directory for H264 encoding */
-function getTempDir()
-{
-	/* Assume that the directory structure is <base>/skins/xml/views */
-	return dirname(__FILE__)."/../../../temp";
-}
-/** Returns the name of the m3u8 playlist based on monitor */
-function m3u8fname($monitor) {
-	return "stream_".$monitor.".m3u8";
-}
-
-/** Erases the M3u8 and TS file names for a given monitor */
-function eraseH264Files($monitor) {
-	/** NOTE: This command executes an 'rm' command, so $monitor parameter
-	 * should be properly validated before executing */
-	/* Remove wdir/.m3u8 and wdir/sample_<mon>*.ts */
-	shell_exec("rm -f ".getTempDir()."/".m3u8fname($monitor)." ".getTempDir()."/sample_".$monitor."*.ts");
-}
-function kill264proc($monitor) {
-	/** NOTE: This command executes an 'kill' command, so $monitor parameter
-	 * should be properly validated before executing */
-	$pid = trim(shell_exec("pgrep -f -x \"zmstreamer -m ".$monitor."\""));
-	if ($pid == "") {
-		logXml("No PID found for ZMStreamer to kill");
-	} else {
-		shell_exec("kill -9 ".$pid);
-		logXml("Killed process ".$pid." for Monitor ".$monitor);
-	}
-}
-/** Return the command-line shell function to setup H264 stream */
-function stream264fn ($mid, $width, $height, $br) {
-	$cdir = "./temp";
-	$zmstrm = "zmstreamer -m ".$mid." 2> /dev/null";
-	$ffstr = getFfmpeg264Str($width, $height, $br, "-", "-");
-	$seg = "segmenter - ".ZM_EYEZM_SEG_DURATION." ".$cdir."/sample_".$mid." ".$cdir."/".m3u8fname($mid)." ../ 2> /dev/null";
-	$url = $zmstrm . " | ".$ffstr." | " . $seg;
-	return "nohup ".$url." & echo $!";
-}
-
-/** Generate the web-page presented to the viewer when using H264 */
-function h264vidHtml($width, $height, $monitor, $br, $thumbsrc) {
-	function printTermLink() {
-		$str = "H264 Streaming Launching...<br>Tap to re-load if stream fails";
-		$str2 = "document.getElementById(\"loaddiv\").innerHTML = \"".$str."\";";
-		echo $str2;
-
-	}
-	$ajaxUrl = "?view=actions&action=spawn264&&monitor=".$monitor."&br=".$br;
-	/* Call these two directly to bypass server blocking issues */
-	$ajax2Url = "./skins/xml/views/actions.php?action=chk264&monitor=".$monitor;
-	$ajax2Url .= "&timeout=".ZM_EYEZM_H264_TIMEOUT;
-	$ajax3Url = "./skins/xml/views/actions.php?action=kill264&monitor=".$monitor;
-?>
-<html>
-<head>
-	<script type="text/javascript">
-	/* Called when paused or done is pressed */
-	function vidAbort() {
-		document.getElementById('viddiv').style.display = 'none';
-		var pElement = document.getElementsByTagName('video')[0];
-		var ajaxKill = new AjaxConnection("<?php echo $ajax3Url;?>");
-		ajaxKill.connect("cbKilled");
-		pElement.stop();
-		pElement.src="";
-		
-	}
-	function reloadStreamImage() {
-		var obj = document.getElementById('liveStream');
-		var src = obj.src;
-		var date = new Date();
-		obj.src = src + '&vrand=' + date.getTime();
-		return false;
-	}
-	/* Callback when spawn264 process is ended */
-	function cbVidLoad()
-	{
-		reloadStreamImage();
-<?php 
-		printTermLink(); 
-?>
-	}
-	function vidLoaded() {
-		window.setTimeout("startVid()", 500);
-	}
-	function bindListeners()
-	{
-		var pElement = document.getElementsByTagName('video')[0];
-		/* Bind abort */
-		pElement.addEventListener('abort', vidAbort, false);
-		pElement.addEventListener('done', vidAbort, false);
-		pElement.addEventListener('ended', vidAbort, false);
-		pElement.addEventListener('pause', vidAbort, false);
-		pElement.addEventListener('loadstart', vidLoaded, false);
-	}
-	/* Callback when kill264 process is ended */
-	function cbKilled()
-	{
-		<?php printTermLink(); ?>
-	}
-	/* Called after an interval from cbFileExists() */
-	function loadVid()
-	{
-		var pElement = document.getElementById("vidcontainer");
-<?php
-		echo "pElement.src=\"./temp/".m3u8fname($monitor)."\"\n";
-?>
-		pElement.load();
-	}
-	function startVid()
-	{
-		document.getElementById('viddiv').style.display = 'block';
-		var pElement = document.getElementById("vidcontainer");
-		pElement.play();
-	}
-	/* Callback when stream is active and ready to be played */
-	function cbFileExists()
-	{
-		window.setTimeout("loadVid()", 500);
-	}
-	/* On-load triggers two requests immediately: spawn264 and chk264 */
-	window.onload = function() {
-		bindListeners();
-		var ajax1 = new AjaxConnection("<?php echo "$ajaxUrl";?>");
-		var ajax2 = new AjaxConnection("<?php echo "$ajax2Url";?>");
-		ajax1.connect("cbVidLoad");
-		/* Don't initiate file-exists since eyeZm will */
-		/*ajax2.connect("cbFileExists");*/
-	}
-	function AjaxConnection(url) {
-		this.connect = connect;
-		this.url = url;
-	}
-	function connect(return_func) {
-		this.x = new XMLHttpRequest();
-		this.x.open("GET", this.url, true);
-		var self = this;
-		this.x.onreadystatechange = function() {
-			if (self.x.readyState != 4)
-				return;
-			eval(return_func + '()');
-			delete self.x;
-		}
-		this.x.send(null);
-	}
-	</script>
-<style type="text/css">
-body {
-	border: 0px solid;
-	margin: 0px;
-	padding: 0px;
-	background-color: black;
-	width: <?php echo $width ?>px;
-	height: <?php echo $height ?>px;
-}
-.textcl {
-	text-align: center;
-	font-family: Arial;
-	font-size: larger;
-	width: 100%;
-<?php echo "padding-top: ".(($height/2)-100)."px;"; ?>
-<?php echo "padding-bottom: ".(($height/2)-100)."px;"; ?>
-	z-index: 2;
-	position: absolute;
-	top: 0px;
-	left: 0px;
-	height: 100%;
-}
-.textcl2 {
-	width: auto;
-	height: auto;
-	background-color: black;
-	padding: 5px 5px;
-	margin-left: 10px;
-	margin-right: 10px;
-	opacity: 0.7;
-}
-.textcl3 {
-	width: auto;
-	height: auto;
-	padding: 2px 2px;
-	margin: auto;
-	color: white;
-}
-.imgdiv {
-	position: absolute;
-	padding: 0px;
-	background-color: black;
-	top: 0px;
-	left: 0px;
-	margin: 0px;
-	width: <?php echo $width ?>px;
-	height: <?php echo $height ?>px;
-	z-index: 1;
-	opacity: 0.7;
-}
-
-</style>
-</head>
-<body>
-<div id="viddiv" style="display: none;">
-<?php
-		echo "<video id=\"vidcontainer\" width='".$width."' height='".$height."' />\n";
-?>
-</div>
-<div id="loaddiv2" class="textcl"><div id="loaddiv3" class="textcl2">
-<div id="loaddiv" class="textcl3">
-Initializing H264 Stream (<?php echo($br); ?>)...<br>
-<span style="font-size: small;"><i>This may take a few seconds</i></span>
-</div>
-</div></div>
-
-<div class="imgdiv" id="imagediv">
-<?php outputImageStream("liveStream", $thumbsrc, $width, $height, "stream"); ?>
-</div>
-</body>
-</html>
-<?php
-}
-?>
diff --git a/web/skins/xml/includes/init.php b/web/skins/xml/includes/init.php
deleted file mode 100644
index acb6c3546..000000000
--- a/web/skins/xml/includes/init.php
+++ /dev/null
@@ -1,2 +0,0 @@
-<?php
-?>
diff --git a/web/skins/xml/skin.php b/web/skins/xml/skin.php
deleted file mode 100644
index c88718c4e..000000000
--- a/web/skins/xml/skin.php
+++ /dev/null
@@ -1,47 +0,0 @@
-<?php
-//
-// ZoneMinder HTML interface file, $Date: 2008-09-26 02:47:20 -0700 (Fri, 26 Sep 2008) $, $Revision: 2632 $
-// Copyright (C) 2001-2008 Philip Coombes
-// 
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-// 
-
-if ( empty($_COOKIE['zmBandwidth']) )
-	    $_COOKIE['zmBandwidth'] = "low";
-
-foreach ( getSkinIncludes( 'includes/config.php' ) as $includeFile )
-    require_once $includeFile;
-
-foreach ( getSkinIncludes( 'includes/functions.php' ) as $includeFile )
-    require_once $includeFile;
-
-if ( empty($view) )
-     $view = 'console';
-
-if ( !isset($user) && ZM_OPT_USE_AUTH && ZM_AUTH_TYPE == "remote" && !empty( $_SERVER['REMOTE_USER']) )
-{
-     $view = "postlogin";
-     $action = "login";
-     $_REQUEST['username'] = $_SERVER['REMOTE_USER'];
-}
-/* Get version info from client */
-updateClientVer();
-/* Store some logging information in session variables
- * so other processes can access them */
-if (defined("ZM_EYEZM_LOG_TO_FILE")) $_SESSION['xml_log_to_file'] = ZM_EYEZM_LOG_TO_FILE;
-if (defined("ZM_EYEZM_LOG_FILE")) $_SESSION['xml_log_file'] = ZM_EYEZM_LOG_FILE;
-if (defined("ZM_EYEZM_DEBUG")) $_SESSION['xml_debug'] = ZM_EYEZM_DEBUG;
-
-?>
diff --git a/web/skins/xml/views/Makefile.am b/web/skins/xml/views/Makefile.am
deleted file mode 100644
index ab9147ae4..000000000
--- a/web/skins/xml/views/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = 
-
-webdir = @WEB_PREFIX@/skins/xml/views
-
-dist_web_DATA = \
-	console.php \
-	actions.php \
-	none.php \
-	notfound.png
diff --git a/web/skins/xml/views/actions.php b/web/skins/xml/views/actions.php
deleted file mode 100644
index 73e206af6..000000000
--- a/web/skins/xml/views/actions.php
+++ /dev/null
@@ -1,392 +0,0 @@
-<?php
-/* 
- * actions.php is created by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email jdhar@eyezm.com (http://www.eyezm.com)
- *
- */
-/* Parse any specific actions here */
-if (isset($_GET['action'])) {
-	$action = $_GET['action'];
-	if (!strcmp($action, "devent")) {
-		/* ACTION: Delete an Event. Parms: <eid> */
-		if (!canEdit('Events')) {
-			logXmlErr("User ".$user['Username']. " doesn't have edit Events perms");
-			exit;
-		}
-		if (!isset($_REQUEST['eid'])) {
-			logXmlErr("EID not set for action delete-event");
-			exit;
-		}
-		$eid = validInteger($_REQUEST['eid']);
-		$url = "./index.php?view=request&request=event&id=".$eid."&action=delete";
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "spawn264")) {
-		/* ACTION: Spawn 264 streaming process.
-		 * Parms: <monitor>[br|width|height] */
-		if (!canView('Stream')) {
-			logXmlErr("User ".$user['Username']. " doesn't have view Stream perms");
-			exit;
-		}
-		if (!isset($_GET['monitor'])) {
-			logXmlErr("Not all parameters specified for spawn264");
-			exit;
-		}
-		$monitor = validInteger($_REQUEST['monitor']);
-		if (!isMonitor($monitor)) exit;
-		$dims = getMonitorDims($monitor);
-		$width = validInteger(getset('width', $dims['Width']));
-		$height = validInteger(getset('height', $dims['Height']));
-		$br = validString(getset('br', ZM_EYEZM_H264_DEFAULT_BR));
-		/* Check that we can stream first */
-		if (!canStream264()) {
-			/* canStream264 will print out error */
-			exit;
-		}
-		$streamUrl = stream264fn($monitor, $width, $height, $br);
-		logXml("Using H264 Pipe Function: ".$streamUrl);
-		$pid = shell_exec($streamUrl);
-		logXml("Streaming Process for monitor ".$monitor." ended, cleaning up files");
-		eraseH264Files($monitor);
-		exit;
-
-	} else if (!strcmp($action, "kill264")) {
-		/* ACTION: Kill existing H264 stream process and cleanup files.
-		 * Parms: <monitor>.
-		 * NOTE: This will be called directly by path, so include files
-		 * may not be available */
-		session_start();
-		require_once(dirname(__FILE__)."/../includes/functions.php");
-		if (!isset($_GET['monitor'])) {
-			logXmlErr("Not all parameters specified for kill264");
-			exit;
-		}
-		$monitor = validInteger($_GET['monitor']);
-		kill264proc($monitor);
-		logXml("Killed Segmenter process for monitor ".$monitor);
-		exit;
-
-	} else if (!strcmp($action, "chk264")) {
-		/* ACTION: Simply stalls while checking for 264 file.
-		 * Parms: <monitor><timeout> 
-		 * NOTE: This will be called directly by path, so include files
-		 * may not be available */
-		session_start();
-		require_once(dirname(__FILE__)."/../includes/functions.php");
-		if (!isset($_GET['monitor']) || !isset($_GET['timeout'])) {
-			logXmlErr("Monitor not specified for chk264");
-			exit;
-		}
-		$monitor = validInteger($_GET['monitor']);
-		$path = getTempDir()."/".m3u8fname($monitor);
-		/* Wait for the second sample to become available */
-		$tsfile = getTempDir()."/sample_".$monitor."-2.ts";
-		/* Setup timeout */
-		$startTime = time();
-		$timeout = validInteger($_GET['timeout']);
-		while (!file_exists($path) || !file_exists($tsfile)) {
-			if (time() > $startTime + $timeout) {
-				logXmlErr("Timed out waiting for stream to start, exiting...");
-				kill264proc($monitor);
-				exit;
-			}
-			usleep(10000);
-		}
-		logXml("File exists, stream created after ".(time()-$startTime)." sec");
-		exit;
-
-	} else if (!strcmp($action, "feed")) {
-		/* ACTION: View a feed. Parms: <monitor> [height|width|fps|scale|vcodec|br] */
-		if (!canView('Stream')) {
-			logXmlErr("User ".$user['Username']. " doesn't have view Stream perms");
-			exit;
-		}
-		/* Check that required variables are set */
-		if (!isset($_REQUEST['monitor'])) {
-			logXmlErr("Not all parameters set for action view-feed");
-			exit;
-		}
-		$monitor = validInteger($_REQUEST['monitor']);
-		if (!isMonitor($monitor)) exit;
-		$dims = getMonitorDims($monitor);
-		$width = validInteger(getset('width', $dims['Width']));
-		$height = validInteger(getset('height', $dims['Height']));
-		$fps = validInteger(getset('fps', ZM_WEB_VIDEO_MAXFPS));
-		$scale = validInteger(getset('scale', 100));
-		$vcodec = validString(getset('vcodec', ZM_EYEZM_FEED_VCODEC));
-		/* Select which codec we want */
-		if (!strcmp($vcodec, "h264")) {
-			/* Validate that we can in fact stream H264 */
-			if (!canStream264()) {
-				/* canStream264 will print out error if
-				 * there is one */
-				echo "Server cannot stream H264. Check eyeZm log for details";
-				exit;
-			}
-			if (!requireVer("1", "2")) {
-				echo "H264 Streaming requires eyeZm v1.2 or above";
-				logXmlErr("H264 Streaming requires eyeZm v1.2 or above");
-				exit;
-			}
-			$br = validString(getset('br', ZM_EYEZM_H264_DEFAULT_BR));
-			/* H264 processing */
-			noCacheHeaders();
-			/* Kill any existing processes and files */
-			kill264proc($monitor);
-			eraseH264Files($monitor);
-			logXml("Streaming H264 on Monitor ".$monitor.", ".$width."x".$height." @".$br);
-			/* Get thumbnail source */
-			$thumbsrc = 
-				getStreamSrc( array( 
-					"mode=single", 
-					"monitor=".$monitor, 
-					"scale=".$scale,	
-					"maxfps=".$fps,
-					"buffer=1000" 
-				) );
-			logXml("Using thumbnail image from ".$thumbsrc);
-			/* Generate H264 Web-page */
-			echo "<meta name=\"viewport\" content=\"width=".$width."\" />\n";
-			h264vidHtml($width, $height, $monitor, $br, $thumbsrc);
-		} else if (!strcmp($vcodec, "mjpeg")) {
-			/* MJPEG streaming */
-			/* If $fps=0, get a single-shot */
-			if (!$fps) {
-				/* single-shot */
-				$streamSrc = 
-					getStreamSrc( array( 
-						"mode=single", 
-						"monitor=".$monitor, 
-						"scale=".$scale,	
-						"maxfps=0",
-						"buffer=1000" 
-					) );
-			} else {
-				$streamSrc = 
-					getStreamSrc( array( 
-						"mode=jpeg", 
-						"monitor=".$monitor, 
-						"scale=".$scale,	
-						"maxfps=".$fps,
-						"buffer=1000" 
-					) );
-			}
-			noCacheHeaders();
-			xhtmlHeaders( __FILE__, "Stream" );
-			logXml("Streaming MJPEG on Monitor ".$monitor.", ".$width."x".$height." @".$fps."fps");
-			echo "<meta name=\"viewport\" content=\"width=".$width."\" />\n";
-			echo "<body>\n";
-			echo "<div style=\"border: 0px solid; padding: 0px; background-color: black; position: absolute; top: 0px; left; 0px; margin: 0px; width: ".$width."px; height: ".$height."px;\">\n";
-			logXml("Using stream source: ".$streamSrc);
-			outputImageStream("liveStream", $streamSrc, $width, $height, "stream");
-			echo "</div></body></html>";
-		} else {
-			logXmlErr("Unsupported codec ".$vcodec." selected for streaming");
-			echo("Unsupported codec ".$vcodec." selected for streaming");
-		}
-		exit;
-
-	} else if (!strcmp($action, "vevent")) {
-		/* ACTION: View an event. Parms: <eid> [fps|vcodec|br] */
-		if (!canView('Events')) {
-			logXmlErr("User ".$user['Username']. " doesn't have view Events perms");
-			exit;
-		}
-		if (!isset($_GET['eid'])) {
-			logXmlErr("Not all parameters set for Action View-event");
-			exit;
-		}
-		/* Grab event from the database */
-		$eid = validInteger($_GET['eid']);
-		$eventsSql = "select E.Id, E.MonitorId, E.Name, E.StartTime, E.Length, E.Frames from Events as E where E.Id = ?";
-		$event = dbFetchOne($eventsSql, NULL, array( $eid ) );
-		/* Check if exists */
-		if (!$event) {
-			logxmlErr("Requested event ID ".$eid." does not exist");
-			exit;
-		}
-		/* Calculate FPS */
-		$fps = validInteger(getset('fps',ceil($event['Frames'] / $event['Length'])));
-		$vcodec = validString(getset('vcodec', ZM_EYEZM_EVENT_VCODEC));
-		$baseURL = ZM_PATH_WEB."/".getEventPathSafe($event);
-		/* Here we validate the codec.
-		 * Check that FFMPEG exists and supports codecs */
-		if (!strcmp($vcodec, "mpeg4")) {
-			if (!ffmpegSupportsCodec("mpeg4")) {
-				logXmlErr("FFMPEG not installed, accessible in path/ZM_PATH_FFMPEG, or doesn't support mpeg4");
-				exit;
-			}
-			/* Can generate, we are good to go */
-			$fname = "capture.mov";
-			$ffparms = "-vcodec mpeg4 -r ".ZM_EYEZM_EVENT_FPS." ".$baseURL."/".$fname." 2> /dev/null";
-
-		} else if (!strcmp($vcodec, "h264")) {
-			if (!ffmpegSupportsCodec("libx264")) {
-				logXmlErr("FFMPEG not installed, accessible in path/ZM_PATH_FFMPEG, or doesn't support H264");
-				exit;
-			}
-			if (!requireVer("1","2")) {
-				logXmlErr("H264 Event viewing requires eyeZm v1.2 or greater");
-				exit;
-			}
-			/* Good to go */
-			$fname = "capture.mp4";
-			$ffparms = getFfmpeg264FoutParms(
-				validString(getset('br',ZM_EYEZM_H264_DEFAULT_EVBR)),
-				$baseURL."/".$fname);
-
-		} else {
-			logXmlErr("Unknown codec ".$vcodec." selected for event viewing");
-			exit;
-		}
-		logXml("Selected ".$vcodec." for viewing event ".$event['Id']);
-		$fnameOut = $baseURL."/".$fname;
-		$shellCmd = getFfmpegPath()." -y -r ".$fps." -i ".$baseURL."/%0".ZM_EVENT_IMAGE_DIGITS."d-capture.jpg";
-		$shellCmd .= " ".$ffparms;
-		logXml("Encoding event with command: ".$shellCmd);
-		$shellOutput = shell_exec($shellCmd);
-		/* Check that file exists */
-		if (!file_exists(trim($fnameOut))) {
-			logXmlErr("Generate Event ".$event['Id']." file ".$fnameOut." does not exist");
-			exit;
-		}
-		$url = "./".getEventPathSafe($event)."/".$fname;
-		logXml("Loading Event URL ".$url);
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "vframe")) {
-		/* ACTION: View a frame given by an event and frame-id. Parms: <eid> <frame> [alarm | analyze | qty | scale]
-		 * If 'alarm' is set, the returned frame will be the <frame>-th alarm frame. If 'analyze' is set,
-		 * the returned frame will be the %03d-analyse frame instead of %03d-capture, if ZM_CREATE_ANALYSIS_IMAGES
-		 * is set. Otherwise it just returns the captured frame.
-		 * If qty is set, it will apply a quality factor from 0-100, and if width is set, it will scale the jpeg accordingly
-		 */
-		if (!isset($_GET['eid']) || !isset($_GET['frame'])) {
-			logXmlErr("Not all parameters set for action view-frame");
-			exit;
-		}
-		$eid = validInteger($_GET['eid']);
-		$frame = validInteger($_GET['frame']);
-		$eventsSql = "select E.Id, E.MonitorId, E.Name, E.StartTime, E.Length, E.Frames from Events as E where E.Id = ?";
-		$event = dbFetchOne($eventsSql, NULL, array( $eid ) );
-		$qty = validInteger(getset('qty', 100));
-		if ($qty > 100) $qty = 100;
-		$scale = validInteger(getset('scale', 100));
-		if (!$event) {
-			logxmlErr("Requested event ID ".$eid." does not exist");
-			exit;
-		}
-		/* Figure out the frame number. If 'alarm' is not set, this is just equal to the <frame> parameter.
-		 * If 'alarm' is set, need to query DB and grab the <frame>-th item */
-		if (isset($_GET['alarm'])) {
-			$frameSql = "select * from Frames as F where F.EventId=? and (F.Type = 'Alarm') order by F.FrameId";
-			$i=0;
-			foreach (dbFetchAll($frameSql, NULL, array($eid) ) as $dbframe) {
-				if ($i == $frame) {
-					$frame = $dbframe['FrameId'];
-					break;
-				}
-				$i++;
-			}
-		}
-		if (isset($_GET['analyze']) && ZM_CREATE_ANALYSIS_IMAGES) {
-			$suffix = "analyse";
-		} else {
-			$suffix = "capture";
-		}
-		/* A frame index of 0 is invalid, so if we see this, just use frame 1 */
-		if (!$frame) $frame = 1;
-		/* Suffix based on 'analyze' */
-		$fname = sprintf("%0".ZM_EVENT_IMAGE_DIGITS."d-%s.jpg", $frame, $suffix);
-		$url = "./".getEventPathSafe($event)."/".$fname;
-		if (!file_exists($url)) {
-			logXmlErr("Invalid frame image requested: ".$url);
-			$url = "./skins/xml/views/notfound.png";
-		}
-		/* Check if the image needs any processing - check for GD if requested */
-		if (($scale != 100) || ($qty < 100)) {
-			if (!gdExists()) {
-				logXmlErr("Lib GD is not loaded, but required for image scaling functions");
-				$url = "./skins/xml/views/notfound.png";
-			} else if (!$img = imagecreatefromjpeg($url)) {
-				logXmlErr("Could not load JPEG from ".$url);
-				$url = "./skins/xml/views/notfound.png";
-			} else {
-				/* GD exists and we read the file ok */
-				header('Content-type: image/jpeg');
-				/* Check if resizing is needed */
-				if ($scale != 100) {
-					list($width_orig, $height_orig) = getimagesize($url);
-					$width_new = $width_orig * ($scale/100);
-					$height_new = $height_orig * ($scale/100);
-					$img_new = imagecreatetruecolor($width_new, $height_new);
-					imagecopyresampled($img_new, $img, 0, 0, 0, 0, $width_new, $height_new, $width_orig, $height_orig);
-					imagejpeg($img_new, NULL, $qty);
-				} else {
-					imagejpeg($img, NULL, $qty);
-				}
-				exit;
-			}
-		} 
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "state")) {
-		/* ACTION: Change the state of the system. Parms: <state> */
-		if (!canEdit('System')) {
-			logXmlErr("User ".$user['Username']. " doesn't have edit System perms");
-			exit;
-		}
-		if (!isset($_GET['state'])) {
-			logXmlErr("Server state not specified for action");
-			exit;
-		}
-		$url = "./index.php?view=none&action=state&runState=".validString($_GET['state']);
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "func")) {
-		/* ACTION: Change state of the monitor. Parms: <mid><func><en> */
-		if (!canEdit('Monitors')) {
-			logXmlErr("User ".$user['Username']. " doesn't have monitors Edit perms");
-			exit;
-		}
-		if (!isset($_GET['mid']) || !isset($_GET['func']) || !isset($_GET['en'])) {
-			logXmlErr("Not all parameters specified for action Monitor state");
-			exit;
-		}
-		$mid = validInteger($_GET['mid']);
-		if (!isMonitor($mid)) exit;
-		$url = "./index.php?view=none&action=function&mid=".$mid."&newFunction=".validString($_GET['func'])."&newEnabled=".validString($_GET['en']);
-		header("Location: ".$url);
-		exit;
-
-	} else if (!strcmp($action, "vlog")) {
-		/* ACTION: View log file. Must have debug and log to file enabled, and sufficient perms 
-		 * Parms: [lines] */
-		if (!canEdit('System')) {
-			logXmlErr("Insufficient permissions to view log file");
-			echo "Insufficient permissions to view log file";
-			exit;
-		}
-		if (!ZM_EYEZM_DEBUG || !ZM_EYEZM_LOG_TO_FILE) {
-			echo "eyeZm Debug (EYEZM_DEBUG) or log-to-file (EYEZM_LOG_TO_FILE) not enabled. Please enable first";
-			exit;
-		}
-		if (!file_exists(ZM_EYEZM_LOG_FILE)) {
-			echo "Log file ".ZM_EYEZM_LOG_FILE." doesn't exist";
-			exit;
-		}
-		$lines = validInteger(getset('lines',ZM_EYEZM_LOG_LINES));
-		logXml("Returning last ".$lines." lines of eyeZm Log from ".ZM_EYEZM_LOG_FILE);
-		echo shell_exec("tail -n ".$lines." ".ZM_EYEZM_LOG_FILE);
-		echo "\n\n--- Showing last ".$lines." lines ---\n";
-		echo "--- End of Log ---\n\n";
-	}
-}
-?>
diff --git a/web/skins/xml/views/console.php b/web/skins/xml/views/console.php
deleted file mode 100644
index b512bc13a..000000000
--- a/web/skins/xml/views/console.php
+++ /dev/null
@@ -1,259 +0,0 @@
-<?php
-//
-// ZoneMinder web console file, $Date: 2009-02-19 10:05:31 +0000 (Thu, 19 Feb 2009) $, $Revision: 2780 $
-// Copyright (C) 2001-2008 Philip Coombes
-//
-// This program is free software; you can redistribute it and/or
-// modify it under the terms of the GNU General Public License
-// as published by the Free Software Foundation; either version 2
-// of the License, or (at your option) any later version.
-//
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the Free Software
-// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
-//
-
-/* 
- * console.php is updated by Jai Dhar, FPS-Tech, for use with eyeZm
- * iPhone application. This is not intended for use with any other applications,
- * although source-code is provided under GPL.
- *
- * For questions, please email support@eyezm.com (http://www.eyezm.com)
- *
- */
-$eventCounts = array(
-    array(
-        "title" => translate('Events'),
-        "filter" => array(
-            "terms" => array(
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Hour'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 hour" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Day'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 day" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Week'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-7 day" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Month'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "0" ),
-                array( "cnj" => "and", "attr" => "DateTime", "op" => ">=", "val" => "-1 month" ),
-            )
-        ),
-    ),
-    array(
-        "title" => translate('Archived'),
-        "filter" => array(
-            "terms" => array(
-                array( "attr" => "Archived", "op" => "=", "val" => "1" ),
-            )
-        ),
-    ),
-);
-
-$running = daemonCheck();
-$status = $running?translate('Running'):translate('Stopped');
-
-if ( $group = dbFetchOne( 'SELECT * FROM Groups WHERE Id = ?', NULL, array(empty($_COOKIE['zmGroup'])?0:$_COOKIE['zmGroup']) ) ) 
-    $groupIds = array_flip(split( ',', $group['MonitorIds'] ));
-
-$maxWidth = 0;
-$maxHeight = 0;
-$cycleCount = 0;
-$minSequence = 0;
-$maxSequence = 1;
-$seqIdList = array();
-$monitors = dbFetchAll( "select * from Monitors order by Sequence asc" );
-$displayMonitors = array();
-for ( $i = 0; $i < count($monitors); $i++ )
-{
-    if ( !visibleMonitor( $monitors[$i]['Id'] ) )
-    {
-        continue;
-    }
-    if ( $group && !empty($groupIds) && !array_key_exists( $monitors[$i]['Id'], $groupIds ) )
-    {
-        continue;
-    }
-    $monitors[$i]['Show'] = true;
-    if ( empty($minSequence) || ($monitors[$i]['Sequence'] < $minSequence) )
-    {
-        $minSequence = $monitors[$i]['Sequence'];
-    }
-    if ( $monitors[$i]['Sequence'] > $maxSequence )
-    {
-        $maxSequence = $monitors[$i]['Sequence'];
-    }
-    if (isset($_GET['nostatus'])) {
-	    $monitors[$i]['zmc'] = 1;
-	    $monitors[$i]['zma'] = 1;
-    } else {
-	    $monitors[$i]['zmc'] = zmcStatus( $monitors[$i] );
-	    $monitors[$i]['zma'] = zmaStatus( $monitors[$i] );
-    }
-    $monitors[$i]['ZoneCount'] = dbFetchOne( 'select count(Id) as ZoneCount from Zones where MonitorId = ?', 'ZoneCount', array($monitors[$i]['Id']) );
-    $counts = array();
-    for ( $j = 0; $j < count($eventCounts); $j++ )
-    {
-        $filter = addFilterTerm( $eventCounts[$j]['filter'], count($eventCounts[$j]['filter']['terms']), array( "cnj" => "and", "attr" => "MonitorId", "op" => "=", "val" => $monitors[$i]['Id'] ) );
-        parseFilter( $filter );
-        $counts[] = "count(if(1".$filter['sql'].",1,NULL)) as EventCount$j";
-        $monitors[$i]['eventCounts'][$j]['filter'] = $filter;
-    }
-    $sql = 'SELECT '.join($counts,", ").' from Events as E where MonitorId = ?';
-    $counts = dbFetchOne( $sql, NULL, array( $monitors[$i]['Id'] ) );
-    if ( $monitors[$i]['Function'] != 'None' )
-    {
-        $cycleCount++;
-        $scaleWidth = reScale( $monitors[$i]['Width'], $monitors[$i]['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-        $scaleHeight = reScale( $monitors[$i]['Height'], $monitors[$i]['DefaultScale'], ZM_WEB_DEFAULT_SCALE );
-        if ( $maxWidth < $scaleWidth ) $maxWidth = $scaleWidth;
-        if ( $maxHeight < $scaleHeight ) $maxHeight = $scaleHeight;
-    }
-    $monitors[$i] = array_merge( $monitors[$i], $counts );
-    $seqIdList[] = $monitors[$i]['Id'];
-    $displayMonitors[] = $monitors[$i];
-}
-$states = dbFetchAll("select * from States");
-/* XML Dump Starts here */
-xml_header();
-/* Print out the general section */
-xml_tag_sec("ZM_XML", 1);
-xml_tag_sec("GENERAL", 1);
-xml_tag_val("RUNNING", $running);
-xml_tag_val("PROTOVER", ZM_EYEZM_PROTOCOL_VERSION);
-xml_tag_val("FEATURESET", ZM_EYEZM_FEATURE_SET);
-xml_tag_val("VERSION", ZM_VERSION);
-xml_tag_val("CANSTR264", canStream264(1));
-xml_tag_val("GD", gdExists());
-xml_tag_val("FVCODEC", ZM_EYEZM_FEED_VCODEC);
-xml_tag_val("FVTMT", ZM_EYEZM_H264_TIMEOUT);
-xml_tag_val("USER", $user['Username']);
-xml_tag_val("UID", $user['Id']);
-/* Permissions block */
-xml_tag_sec("PERMS", 1);
-xml_tag_val("STREAM", $user['Stream']);
-xml_tag_val("EVENTS", $user['Events']);
-xml_tag_val("CONTROL", $user['Control']);
-xml_tag_val("MONITORS", $user['Monitors']);
-xml_tag_val("DEVICES", $user['Devices']);
-xml_tag_val("SYSTEM", $user['System']);
-xml_tag_sec("PERMS", 0);
-/* End permissions block */
-if (canEdit('System')) {
-	if ($running) {
-		xml_tag_val("STATE", "stop");
-		xml_tag_val("STATE", "restart");
-	} else {
-		xml_tag_val("STATE", "start");
-	}
-	foreach ($states as $state) {
-		xml_tag_val("STATE", $state['Name']);
-	}
-}
-/* End general section */
-xml_tag_sec("GENERAL", 0);
-/* Print out the monitors section */
-xml_tag_sec("MONITOR_LIST", 1);
-foreach( $displayMonitors as $monitor )
-{
-	if (!canView('Monitors')) continue;
-	xml_tag_sec("MONITOR", 1);
-	xml_tag_val("ID", $monitor['Id']);
-	xml_tag_val("NAME", $monitor['Name']);
-	xml_tag_val("FUNCTION", $monitor['Function']);
-	xml_tag_val("NUMEVENTS", $monitor['EventCount0']);
-	xml_tag_val("ENABLED", $monitor['Enabled']);
-	xml_tag_val("ZMC", $monitor['zmc']);
-	xml_tag_val("ZMA", $monitor['zma']);
-	xml_tag_val("STATE", ($monitor['zmc']!=1)?"ERROR":(
-		($monitor['zma']==1)?"OK":"WARN"));
-	xml_tag_val("WIDTH", $monitor['Width']);
-	xml_tag_val("HEIGHT", $monitor['Height']);
-
-	/* Form the data-base query for this monitor */
-	$pageOffset = 0;
-	$offset = 0;
-	if (isset($_GET['numEvents'])) {
-		$numEvents = validInteger($_GET['numEvents']);
-		$eventsSql = "select E.Id,E.MonitorId,M.Name As MonitorName,E.Cause,E.Name,E.StartTime,E.Length,E.Frames,E.AlarmFrames,E.TotScore,E.AvgScore,E.MaxScore,E.Archived from Monitors as M inner join Events as E on (M.Id = E.MonitorId) and ( E.MonitorId = ? ) order by E.StartTime desc";
-		$eventsSql .= " limit ".$numEvents;
-		/* If there is an pageOff<x> tag for this monitor, then retrieve the offset. Otherwise, don't specify offset */
-		if (isset($_GET['pageOff'.$monitor['Id']])) {
-			/* If pageOffset is greater than we actually have,
-			 * we need to adjust it */
-			$pageOffset = validInteger($_GET['pageOff'.$monitor['Id']]); 
-			if ($pageOffset >= ceil($monitor['EventCount0']/$numEvents)) {
-				$pageOffset = 0;
-			}
-			$offset = $pageOffset * $numEvents;
-		}
-		$eventsSql .= " offset ".$offset;
-	} else {
-		unset($eventsSql);
-	}
-	xml_tag_val("PAGEOFF", $pageOffset);
-	xml_tag_sec("EVENTS",1);
-	if (canView('Events') && isset($eventsSql)) {
-		foreach ( dbFetchAll( $eventsSql, NULL, array($monitor['Id']) ) as $event )
-		{
-			xml_tag_sec("EVENT",1);
-			xml_tag_val("ID",$event['Id']);
-			xml_tag_val("NAME",$event['Name']);
-			xml_tag_val("TIME", strftime( STRF_FMT_DATETIME_SHORTER, strtotime($event['StartTime'])));
-			xml_tag_val("DURATION", $event['Length']);
-			xml_tag_val("FRAMES", $event['Frames']);
-			xml_tag_val("FPS", ($event['Length'] > 0)?ceil($event['Frames']/$event['Length']):0);
-			xml_tag_val("TOTSCORE", $event['TotScore']);
-			xml_tag_val("AVGSCORE", $event['AvgScore']);
-			xml_tag_val("MAXSCORE", $event['MaxScore']);
-			/* Grab the max frame-id from Frames table. If AlarmFrames = 0, don't try
-			 * to grab any frames, and just signal the max frame index as index 0 */
-			$fridx = 1;
-			$alarmFrames = 1;
-			if ($event['AlarmFrames']) {
-				$framesSql = "SELECT FrameId FROM Frames WHERE (Type = 'Alarm') and (EventId = ?) ORDER BY Score DESC LIMIT 1";
-				$fr = dbFetchOne($framesSql, NULL, array( $event['Id'] ) );
-				$fridx = $fr['FrameId'];
-				$alarmFrames = $event['AlarmFrames'];
-			}
-			xml_tag_val("ALARMFRAMES", $alarmFrames);
-			xml_tag_val("MAXFRAMEID", $fridx);
-			xml_tag_sec("EVENT",0);
-		}
-	}
-	xml_tag_sec("EVENTS",0);
-	xml_tag_sec("MONITOR", 0);
-}
-xml_tag_sec("MONITOR_LIST", 0);
-xml_tag_sec("ZM_XML", 0);
-?>
diff --git a/web/skins/xml/views/none.php b/web/skins/xml/views/none.php
deleted file mode 100644
index e69de29bb..000000000
diff --git a/web/skins/xml/views/notfound.png b/web/skins/xml/views/notfound.png
deleted file mode 100644
index 219706897..000000000
Binary files a/web/skins/xml/views/notfound.png and /dev/null differ
diff --git a/web/tools/Makefile.am b/web/tools/Makefile.am
deleted file mode 100644
index 29c91bc02..000000000
--- a/web/tools/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-SUBDIRS = \
-	mootools
diff --git a/web/tools/mootools/Makefile.am b/web/tools/mootools/Makefile.am
deleted file mode 100644
index 89b17ab8d..000000000
--- a/web/tools/mootools/Makefile.am
+++ /dev/null
@@ -1,16 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/tools/mootools
-
-dist_web_DATA = \
-	mootools-core-1.4.5-compat.js \
-	mootools-more-1.5.1.js
-
-# Yes, you are correct. This is a HACK!
-install-data-hook:
-	( cd $(DESTDIR)$(webdir); rm -f mootools-core.js mootools-more.js )
-	( cd $(DESTDIR)$(webdir); ln -sf mootools-core-1.4.5-compat.js mootools-core.js )
-	( cd $(DESTDIR)$(webdir); ln -sf mootools-more-1.5.1.js mootools-more.js )
-
-uninstall-hook:
-	@-( cd $(DESTDIR)$(webdir); rm -f mootools-* )
diff --git a/web/views/Makefile.am b/web/views/Makefile.am
deleted file mode 100644
index 6ecec9d8b..000000000
--- a/web/views/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-AUTOMAKE_OPTIONS = gnu
-
-webdir = @WEB_PREFIX@/views
-
-dist_web_DATA = file.php \
-	image.php
diff --git a/web/views/view_video.php b/web/views/view_video.php
new file mode 100644
index 000000000..5bf01ca6b
--- /dev/null
+++ b/web/views/view_video.php
@@ -0,0 +1,60 @@
+<?php
+//
+// ZoneMinder web video view file, $Date: 2008-09-29 14:15:13 +0100 (Mon, 29 Sep 2008) $, $Revision: 2640 $
+// Copyright (C) 2001-2008 Philip Coombes
+//
+// This program is free software; you can redistribute it and/or
+// modify it under the terms of the GNU General Public License
+// as published by the Free Software Foundation; either version 2
+// of the License, or (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+//
+
+// Calling sequence:   ... /zm/index.php?view=video&event_id=123
+//
+//     event_id is the id of the event to view
+//
+//      Does not support scaling at this time.
+//
+
+if ( !canView( 'Events' ) )
+{
+    $view = "error";
+    return;
+}
+
+require_once('includes/Storage.php');
+require_once('includes/Event.php');
+
+
+$Storage = NULL;
+$errorText = false;
+if ( ! empty($_REQUEST['eid'] ) ) {
+    $Event = new Event( $_REQUEST['eid'] );
+    $Storage = $Event->Storage();
+    $path = $Event->Relative_Path().'/'.$Event->DefaultVideo();
+	Error("Path: $path");
+} else {
+    $errorText = "No video path";
+}
+
+if ( $errorText )
+    Error( $errorText );
+else{
+# FIXME guess it from the video file
+	header( 'Content-type: video/mp4' );
+    if ( ! readfile( $Storage->Path().'/'.$path ) ) {
+		Error("No bytes read from ". $Storage->Path() . '/'.$path );
+	} else {
+		Error("Success sending " . $Storage->Path().'/'.$path );
+    }
+}
+?>