Simplify time representation; better in-tree DCP subtitle parser.

5 files changed, 806 insertions, 0 deletions

diff --git a/asdcplib/win32/Makefile.am b/asdcplib/win32/Makefile.am
new file mode 100755
index 0000000..f2f07d6
--- /dev/null
+++ b/asdcplib/win32/Makefile.am
@@ -0,0 +1,29 @@
+## Makefile.am -- Process this file with automake to produce Makefile.in
+#
+# $Id: Makefile.am,v 1.5 2009/04/12 20:34:38 msheby Exp $
+# Copyright (c) 2007-2008 John Hurst. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+
+EXTRA_DIST = Makefile.mak README.txt
+
diff --git a/asdcplib/win32/Makefile.in b/asdcplib/win32/Makefile.in
new file mode 100644
index 0000000..9f1d64d
--- /dev/null
+++ b/asdcplib/win32/Makefile.in
@@ -0,0 +1,414 @@
+# Makefile.in generated by automake 1.11.3 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+#
+# $Id: Makefile.am,v 1.5 2009/04/12 20:34:38 msheby Exp $
+# Copyright (c) 2007-2008 John Hurst. All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. 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.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.
+VPATH = @srcdir@
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = win32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
+	$(srcdir)/Makefile.wmk
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/ax_lib_expat.m4 \
+	$(top_srcdir)/m4/ax_lib_openssl.m4 \
+	$(top_srcdir)/m4/ax_lib_xerces.m4 \
+	$(top_srcdir)/m4/az_python.m4 $(top_srcdir)/m4/libtool.m4 \
+	$(top_srcdir)/m4/ltoptions.m4 $(top_srcdir)/m4/ltsugar.m4 \
+	$(top_srcdir)/m4/ltversion.m4 $(top_srcdir)/m4/lt~obsolete.m4 \
+	$(top_srcdir)/configure.ac
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_CLEAN_FILES = Makefile.mak
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+EXPAT_CFLAGS = @EXPAT_CFLAGS@
+EXPAT_LDFLAGS = @EXPAT_LDFLAGS@
+EXPAT_VERSION = @EXPAT_VERSION@
+FGREP = @FGREP@
+GREP = @GREP@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OPENSSL_CPPFLAGS = @OPENSSL_CPPFLAGS@
+OPENSSL_LDFLAGS = @OPENSSL_LDFLAGS@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+OPENSSL_VERSION = @OPENSSL_VERSION@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PYTHON = @PYTHON@
+PYTHON_CPPFLAGS = @PYTHON_CPPFLAGS@
+PYTHON_CSPEC = @PYTHON_CSPEC@
+PYTHON_EXECDIR = @PYTHON_EXECDIR@
+PYTHON_EXECPREFIX = @PYTHON_EXECPREFIX@
+PYTHON_LDFLAGS = @PYTHON_LDFLAGS@
+PYTHON_LSPEC = @PYTHON_LSPEC@
+PYTHON_PREFIX = @PYTHON_PREFIX@
+PYTHON_SHORTVERSION = @PYTHON_SHORTVERSION@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+VERSION = @VERSION@
+XERCES_CPPFLAGS = @XERCES_CPPFLAGS@
+XERCES_LDFLAGS = @XERCES_LDFLAGS@
+XERCES_LIBS = @XERCES_LIBS@
+XERCES_VERSION = @XERCES_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+EXTRA_DIST = Makefile.mak README.txt
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign win32/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --foreign win32/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+Makefile.mak: $(top_builddir)/config.status $(srcdir)/Makefile.wmk
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile
+installdirs:
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am:
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am:
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am
+
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff --git a/asdcplib/win32/Makefile.mak b/asdcplib/win32/Makefile.mak
new file mode 100644
index 0000000..96be7f9
--- /dev/null
+++ b/asdcplib/win32/Makefile.mak
@@ -0,0 +1,151 @@
+# $Id: Makefile.wmk,v 1.4 2012/03/07 18:16:52 mikey Exp $

+# Copyright (c) 2007-2012 John Hurst. All rights reserved.

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions

+# are met:

+# 1. Redistributions of source code must retain the above copyright

+#    notice, this list of conditions and the following disclaimer.

+# 2. 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.

+# 3. The name of the author may not be used to endorse or promote products

+#    derived from this software without specific prior written permission.

+#

+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.

+

+

+SRCDIR = ..\src

+OBJDIR = .

+

+!ifndef WITH_OPENSSL

+!error "OpenSSL is needed! Specify it with WITH_OPENSSL=<OpenSSL directory>"

+!endif

+

+!ifdef ENABLE_RANDOM_UUID

+CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \

+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.9.45\" \

+	/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1

+!else

+CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \

+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"1.9.45\" \

+	/I"$(WITH_OPENSSL)"\inc32

+!endif

+LIB_EXE = lib.exe

+LIBFLAGS1 = /NOLOGO /LIBPATH:"$(WITH_OPENSSL)"\out32dll

+

+LINK = link.exe

+LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG

+

+

+!ifdef DEBUG

+CXXFLAGS2 = $(CXXFLAGS1) /MTd /DDEBUG /D_DEBUG /Od /RTC1 /ZI

+LINKFLAGS = $(LINKFLAGS1) /DEBUG

+!else

+CXXFLAGS2 = $(CXXFLAGS1) /MT /DNDEBUG /D_NDEBUG /O2

+LINKFLAGS = $(LINKFLAGS1)

+!endif

+

+!IFDEF WITH_XERCES

+!ifdef WITH_XML_PARSER

+!ERROR "Cannot include both Expat and Xerces-C++!"

+!endif

+

+CXXFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(WITH_XERCES)"\include

+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XERCES)"\lib

+!ELSEIFDEF WITH_XML_PARSER

+CXXFLAGS = $(CXXFLAGS2) /DASDCP_USE_EXPAT /I"$(WITH_XML_PARSER)"\Source\lib

+!IFDEF DEBUG

+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\debug

+!ELSE

+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\release

+!ENDIF

+!ELSE

+CXXFLAGS = $(CXXFLAGS2)

+LIBFLAGS = $(LIBFLAGS1)

+!ENDIF

+

+CPPFLAGS = $(CXXFLAGS)

+

+KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj KM_tai.obj

+ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \

+	JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \

+	TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \

+	Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \

+	h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \

+	AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \

+	MDD.obj

+

+{$(SRCDIR)\}.cpp{}.obj:

+	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<

+

+all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \

+     asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \

+     blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe 

+

+clean:

+	erase *.exe *.lib *.obj *.ilk *.pdb *.idb

+

+libkumu.lib : $(KUMU_OBJS)

+!IFDEF WITH_XERCES

+!IFDEF DEBUG

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2D.lib

+!ELSE

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2.lib

+!ENDIF

+!ELSEIFDEF WITH_XML_PARSER

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib libexpatMT.lib

+!ELSE

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib

+!ENDIF 

+

+libasdcp.lib: libkumu.lib $(ASDCP_OBJS)

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**

+

+blackwave.exe: libasdcp.lib blackwave.obj

+	$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib

+

+wavesplit.exe: libasdcp.lib wavesplit.obj

+	$(LINK) $(LINKFLAGS) /OUT:wavesplit.exe $** Advapi32.lib

+

+kmuuidgen.exe: libkumu.lib kmuuidgen.obj

+	$(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe $** Advapi32.lib

+

+kmrandgen.exe: libkumu.lib kmrandgen.obj

+	$(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe $** Advapi32.lib

+

+kmfilegen.exe: libkumu.lib kmfilegen.obj

+	$(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe $** Advapi32.lib

+

+klvwalk.exe: libasdcp.lib klvwalk.obj

+	$(LINK) $(LINKFLAGS) /OUT:klvwalk.exe $** Advapi32.lib

+

+asdcp-test.exe: libasdcp.lib asdcp-test.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib

+

+asdcp-wrap.exe: libasdcp.lib asdcp-wrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-wrap.exe $** Advapi32.lib

+

+asdcp-unwrap.exe: libasdcp.lib asdcp-unwrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-unwrap.exe $** Advapi32.lib

+

+asdcp-info.exe: libasdcp.lib asdcp-info.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-info.exe $** Advapi32.lib

+

+asdcp-util.exe: libasdcp.lib asdcp-util.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-util.exe $** Advapi32.lib

+

+j2c-test.exe: libasdcp.lib j2c-test.obj

+	$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib

+

+

+# END Makefile

diff --git a/asdcplib/win32/Makefile.wmk b/asdcplib/win32/Makefile.wmk
new file mode 100755
index 0000000..0539026
--- /dev/null
+++ b/asdcplib/win32/Makefile.wmk
@@ -0,0 +1,151 @@
+# $Id: Makefile.wmk,v 1.4 2012/03/07 18:16:52 mikey Exp $

+# Copyright (c) 2007-2012 John Hurst. All rights reserved.

+#

+# Redistribution and use in source and binary forms, with or without

+# modification, are permitted provided that the following conditions

+# are met:

+# 1. Redistributions of source code must retain the above copyright

+#    notice, this list of conditions and the following disclaimer.

+# 2. 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.

+# 3. The name of the author may not be used to endorse or promote products

+#    derived from this software without specific prior written permission.

+#

+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``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 AUTHOR 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.

+

+

+SRCDIR = ..\src

+OBJDIR = .

+

+!ifndef WITH_OPENSSL

+!error "OpenSSL is needed! Specify it with WITH_OPENSSL=<OpenSSL directory>"

+!endif

+

+!ifdef ENABLE_RANDOM_UUID

+CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \

+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"@PACKAGE_VERSION@\" \

+	/I"$(WITH_OPENSSL)"\inc32 /DCONFIG_RANDOM_UUID=1

+!else

+CXXFLAGS1 = /nologo /W3 /GR /EHsc /DWIN32 /DKM_WIN32 /D_CONSOLE /I. /I$(SRCDIR) /DASDCP_PLATFORM=\"win32\" \

+	/D_CRT_SECURE_NO_WARNINGS /D_CRT_NONSTDC_NO_WARNINGS /DPACKAGE_VERSION=\"@PACKAGE_VERSION@\" \

+	/I"$(WITH_OPENSSL)"\inc32

+!endif

+LIB_EXE = lib.exe

+LIBFLAGS1 = /NOLOGO /LIBPATH:"$(WITH_OPENSSL)"\out32dll

+

+LINK = link.exe

+LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG

+

+

+!ifdef DEBUG

+CXXFLAGS2 = $(CXXFLAGS1) /MTd /DDEBUG /D_DEBUG /Od /RTC1 /ZI

+LINKFLAGS = $(LINKFLAGS1) /DEBUG

+!else

+CXXFLAGS2 = $(CXXFLAGS1) /MT /DNDEBUG /D_NDEBUG /O2

+LINKFLAGS = $(LINKFLAGS1)

+!endif

+

+!IFDEF WITH_XERCES

+!ifdef WITH_XML_PARSER

+!ERROR "Cannot include both Expat and Xerces-C++!"

+!endif

+

+CXXFLAGS = $(CXXFLAGS2) /DHAVE_XERCES_C=1 /I"$(WITH_XERCES)"\include

+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XERCES)"\lib

+!ELSEIFDEF WITH_XML_PARSER

+CXXFLAGS = $(CXXFLAGS2) /DASDCP_USE_EXPAT /I"$(WITH_XML_PARSER)"\Source\lib

+!IFDEF DEBUG

+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\debug

+!ELSE

+LIBFLAGS = $(LIBFLAGS1) /LIBPATH:"$(WITH_XML_PARSER)"\Source\win32\bin\release

+!ENDIF

+!ELSE

+CXXFLAGS = $(CXXFLAGS2)

+LIBFLAGS = $(LIBFLAGS1)

+!ENDIF

+

+CPPFLAGS = $(CXXFLAGS)

+

+KUMU_OBJS = KM_fileio.obj KM_log.obj KM_prng.obj KM_util.obj KM_xml.obj KM_tai.obj

+ASDCP_OBJS = MPEG2_Parser.obj MPEG.obj JP2K_Codestream_Parser.obj \

+	JP2K_Sequence_Parser.obj JP2K.obj PCM_Parser.obj Wav.obj \

+	TimedText_Parser.obj KLV.obj Dict.obj MXFTypes.obj MXF.obj \

+	Index.obj Metadata.obj AS_DCP.obj AS_DCP_MXF.obj AS_DCP_AES.obj \

+	h__Reader.obj h__Writer.obj AS_DCP_MPEG2.obj AS_DCP_JP2K.obj \

+	AS_DCP_PCM.obj AS_DCP_TimedText.obj PCMParserList.obj \

+	MDD.obj

+

+{$(SRCDIR)\}.cpp{}.obj:

+	$(CXX) $(CXXFLAGS) -Fd$(OBJDIR)\ /c $<

+

+all: kmfilegen.exe kmrandgen.exe kmuuidgen.exe asdcp-test.exe \

+     asdcp-wrap.exe asdcp-unwrap.exe asdcp-info.exe \

+     blackwave.exe klvwalk.exe j2c-test.exe wavesplit.exe 

+

+clean:

+	erase *.exe *.lib *.obj *.ilk *.pdb *.idb

+

+libkumu.lib : $(KUMU_OBJS)

+!IFDEF WITH_XERCES

+!IFDEF DEBUG

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2D.lib

+!ELSE

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib xerces-c_2.lib

+!ENDIF

+!ELSEIFDEF WITH_XML_PARSER

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib libexpatMT.lib

+!ELSE

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libkumu.lib $** libeay32.lib

+!ENDIF 

+

+libasdcp.lib: libkumu.lib $(ASDCP_OBJS)

+	$(LIB_EXE) $(LIBFLAGS) /OUT:libasdcp.lib $**

+

+blackwave.exe: libasdcp.lib blackwave.obj

+	$(LINK) $(LINKFLAGS) /OUT:blackwave.exe $** Advapi32.lib

+

+wavesplit.exe: libasdcp.lib wavesplit.obj

+	$(LINK) $(LINKFLAGS) /OUT:wavesplit.exe $** Advapi32.lib

+

+kmuuidgen.exe: libkumu.lib kmuuidgen.obj

+	$(LINK) $(LINKFLAGS) /OUT:kmuuidgen.exe $** Advapi32.lib

+

+kmrandgen.exe: libkumu.lib kmrandgen.obj

+	$(LINK) $(LINKFLAGS) /OUT:kmrandgen.exe $** Advapi32.lib

+

+kmfilegen.exe: libkumu.lib kmfilegen.obj

+	$(LINK) $(LINKFLAGS) /OUT:kmfilegen.exe $** Advapi32.lib

+

+klvwalk.exe: libasdcp.lib klvwalk.obj

+	$(LINK) $(LINKFLAGS) /OUT:klvwalk.exe $** Advapi32.lib

+

+asdcp-test.exe: libasdcp.lib asdcp-test.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-test.exe $** Advapi32.lib

+

+asdcp-wrap.exe: libasdcp.lib asdcp-wrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-wrap.exe $** Advapi32.lib

+

+asdcp-unwrap.exe: libasdcp.lib asdcp-unwrap.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-unwrap.exe $** Advapi32.lib

+

+asdcp-info.exe: libasdcp.lib asdcp-info.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-info.exe $** Advapi32.lib

+

+asdcp-util.exe: libasdcp.lib asdcp-util.obj

+	$(LINK) $(LINKFLAGS) /OUT:asdcp-util.exe $** Advapi32.lib

+

+j2c-test.exe: libasdcp.lib j2c-test.obj

+	$(LINK) $(LINKFLAGS) /OUT:j2c-test.exe $** Advapi32.lib

+

+

+# END Makefile

diff --git a/asdcplib/win32/README.txt b/asdcplib/win32/README.txt
new file mode 100755
index 0000000..ca3d9fd
--- /dev/null
+++ b/asdcplib/win32/README.txt
@@ -0,0 +1,61 @@
+I. INTRODUCTION

+===============

+

+Hello, and welcome to the Windows build instructions for asdcplib.

+

+

+II. DEPENDENCIES

+================

+

+First, you'll need Microsoft's Visual Studio 2005 or later. A heavyweight edition isn't needed;

+the freely downloadable Express edition works fine.

+

+Next, you'll need an OpenSSL distribution. The absolute, bare minimum needed is 0.9.7. However,

+if this will be used in conjunction with CineCert's other software, the later 0.9.8b

+is needed. That said, the latest revision of OpenSSL as of this writing (0.9.8j) works great.

+Extract and build in the directory of your choice.

+

+For optional XML parsing support, you'll need to use Xerces-C++ 2.7 or 3.x, or Expat 2.0.1

+(supported in previous versions of asdcplib). If you'll be using this software in conjuction with

+CineCert's other software, the use of Xerces-C++ is required. As with OpenSSL above, if you

+need/desire XML parsing, extract the source package and build in a directory of your choice.

+

+Header files and libraries from the OpenSSL and XML packages must be available to the compiler

+and linker. You may need to modify the makefile to make include files (/I...) and library files

+(/LIBPATH...) available.

+

+

+III. BUILDING

+=============

+

+There's a build option that changes the behavior of UUID generation. If ENABLE_RANDOM_UUID is

+set at build, then mixed-case UUID generation will be enabled if (and only if) the environment

+variable KM_USE_RANDOM_UUID is set during runtime.

+

+Open a command prompt in which the VS build tools are available on the command line (e.g., the

+"Visual Studio command prompt"). The nmake invocation follows this form:

+C:\>nmake WITH_OPENSSL=<OpenSSL directory> [WITH_XERCES=<Xerces directory>|

+	WITH_XML_PARSER=<Expat directory>] [ENABLE_RANDOM_UUID=1] /f Makefile.mak

+

+On our Windows development machine, the invocation with XML parsing by Xerces-C++ is as such:

+C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

+	WITH_XERCES="C:\Program Files\xerces-c_2_8_0-x86-windows-vc_8_0" /f Makefile.mak

+

+With XML parsing by Expat and random UUID generation enabled:

+C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

+	WITH_XML_PARSER="C:\Program Files\Expat 2.0.1" ENABLE_RANDOM_UUID=1 /f Makefile.mak

+

+Without XML parsing:

+C:\Program Files\asdcplib\win32>nmake WITH_OPENSSL="c:\Program Files\openssl-0.9.8j"

+	/f Makefile.mak

+

+Want a 64-bit build? Change the following line in Makefile.mak:

+    LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:I386 /LIBPATH:. /DEBUG

+to

+    LINKFLAGS1 = /NOLOGO /SUBSYSTEM:console /MACHINE:X64 /LIBPATH:. /DEBUG

+

+

+IV. CONCLUSION

+==============

+

+For answers to questions, please send a message to <asdcplib@cinecert.com>.