use older macos-12 runner

latest/14 fails and builds for arm64
also GA skipped 13 for macos-latest for some reason

.github/workflows/ci.yml

@@ -0,0 +1,234 @@
+name: Meson CI
+
+on:
+  push:
+    branches:
+      - master
+      - feature
+      - cibuilds
+  pull_request:
+    branches:
+      - master
+      - feature
+  workflow_dispatch:
+
+jobs:
+  build:
+    name: ${{ matrix.config.name }}
+    runs-on: ${{ matrix.config.os }}
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - name: Windows MSVC Release
+            os: windows-latest
+            msvc: true
+            buildtype: release
+            args: >-
+              -Ddefault_library=static 
+              --force-fallback-for=zlib,harfbuzz,freetype2,fribidi,libpng 
+              -Dfreetype2:harfbuzz=disabled 
+              -Dharfbuzz:freetype=disabled 
+              -Dharfbuzz:cairo=disabled 
+              -Dharfbuzz:glib=disabled 
+              -Dharfbuzz:gobject=disabled
+              -Dharfbuzz:tests=disabled
+              -Dharfbuzz:docs=disabled
+              -Dharfbuzz:icu=disabled
+              -Dfribidi:tests=false
+              -Dfribidi:docs=false
+              -Dlibass:fontconfig=disabled
+              -Davisynth=enabled
+              -Dbestsource=enabled
+              -Dvapoursynth=enabled
+          - name: Windows MSVC Release (wx master)
+            os: windows-latest
+            msvc: true
+            buildtype: release
+            args: >-
+              -Ddefault_library=static 
+              --force-fallback-for=zlib,harfbuzz,freetype2,fribidi,libpng 
+              -Dfreetype2:harfbuzz=disabled 
+              -Dharfbuzz:freetype=disabled 
+              -Dharfbuzz:cairo=disabled 
+              -Dharfbuzz:glib=disabled 
+              -Dharfbuzz:gobject=disabled
+              -Dharfbuzz:tests=disabled
+              -Dharfbuzz:docs=disabled
+              -Dharfbuzz:icu=disabled
+              -Dfribidi:tests=false
+              -Dfribidi:docs=false
+              -Dlibass:fontconfig=disabled
+              -Davisynth=enabled
+              -Dbestsource=enabled
+              -Dvapoursynth=enabled
+              -Dwx_version='3.3.0'
+          #- {
+          #  name: Windows MinGW,
+          #  os: windows-latest,
+          #  msvc: false
+          #}
+          - {
+            name: Ubuntu Debug,
+            os: ubuntu-latest,
+            buildtype: debugoptimized,
+            args: ''
+          }
+          - {
+            name: Ubuntu Release,
+            os: ubuntu-latest,
+            buildtype: release,
+            args: ''
+          }
+          - name: Ubuntu AppImage
+            os: ubuntu-22.04
+            buildtype: release
+            appimage: true
+            # distro ffms is currently broken
+            args: >-
+              --prefix=/usr
+              -Dbuild_appimage=true
+              -Ddefault_library=static
+              --force-fallback-for=ffms2
+              -Davisynth=enabled
+              -Dbestsource=enabled
+              -Dvapoursynth=enabled
+          - {
+            name: macOS Release,
+            os: macos-12,
+            buildtype: release,
+            args: -Ddefault_library=static -Dbuild_osx_bundle=true -Dlocal_boost=true -Dvapoursynth=enabled --force-fallback-for=ffms2
+          }
+
+    steps:
+      - uses: actions/checkout@v3
+        with:
+          fetch-depth: '0'
+
+      - uses: actions/setup-python@v4
+        with:
+          python-version: '3.x'
+
+      - name: Setup Meson
+        run: |
+          python -m pip install --upgrade pip setuptools
+          pip install meson
+
+      - name: Setup MSVC
+        if: matrix.config.os == 'windows-latest' && matrix.config.msvc == true
+        uses: ilammy/msvc-dev-cmd@v1
+
+      - name: Install dependencies (Windows)
+        if: matrix.config.os == 'windows-latest'
+        run: |
+          choco install ninja innosetup
+
+          $moonscripturl = "https://github.com/leafo/moonscript/releases/download/win32-v0.5.0/moonscript-187bac54ee5a7450013e9c38e005a0e671b76f45.zip"
+          mkdir moonscript
+          Invoke-WebRequest -Uri $moonscripturl -OutFile ".\moonscript\moonscript.zip"
+          pushd moonscript
+          7z e moonscript.zip
+          Get-Location | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          popd
+
+          $gettexturl = "https://github.com/mlocati/gettext-iconv-windows/releases/download/v0.21-v1.16/gettext0.21-iconv1.16-static-64.zip"
+          Invoke-WebRequest -Uri $gettexturl -OutFile ".\gettext.zip"
+          Expand-Archive ".\gettext.zip" -DestinationPath gettext
+          pushd gettext/bin
+          Get-Location | Out-File -FilePath $env:GITHUB_PATH -Encoding utf8 -Append
+          popd
+
+      - name: Install dependencies (MacOS)
+        if: matrix.config.os == 'macos-12'
+        run: |
+          export HOMEBREW_NO_INSTALL_CLEANUP=1
+          export HOMEBREW_NO_INSTALLED_DEPENDENTS_CHECK=1
+          # Skip brew update for now, see https://github.com/actions/setup-python/issues/577
+          # brew update
+          brew install luarocks ninja
+          luarocks install luafilesystem 1.8.0
+          luarocks install moonscript --dev
+          brew install libass zlib ffms2 fftw hunspell
+          brew install pulseaudio  # NO OpenAL in github CI
+
+      - name: Install dependencies (Linux)
+        if: startsWith(matrix.config.os, 'ubuntu-')
+        run: |
+          sudo apt-get update
+          sudo apt-get install ninja-build build-essential libx11-dev libwxgtk3.0-gtk3-dev libfreetype6-dev pkg-config libfontconfig1-dev libass-dev libasound2-dev libffms2-dev intltool libboost-all-dev libhunspell-dev libuchardet-dev libpulse-dev libopenal-dev libjansson-dev nasm
+
+      - name: Configure
+        run: meson setup build ${{ matrix.config.args }} -Dbuildtype=${{ matrix.config.buildtype }}
+
+      - name: Build
+        run: meson compile -C build
+      
+      - name: Run test
+        run: meson test -C build --verbose "gtest main"
+
+      # Windows artifacts
+      - name: Generate Windows installer
+        if: matrix.config.os == 'windows-latest'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+        run:
+          meson compile win-installer -C build
+
+      - name: Generate Windows portable installer
+        if: matrix.config.os == 'windows-latest'
+        run: cd build && ninja win-portable
+
+      - name: Upload artifacts - win_installer
+        uses: actions/upload-artifact@v3
+        if: matrix.config.os == 'windows-latest'
+        with:
+          name: ${{ matrix.config.name }} - installer
+          path: build/Aegisub-*.exe
+          if-no-files-found: error
+      
+      - name: Upload artifacts - portable.zip
+        uses: actions/upload-artifact@v3
+        if: matrix.config.os == 'windows-latest'
+        with:
+          name: ${{ matrix.config.name }} - portable
+          path: build/aegisub-portable-64.zip
+      
+      # macOS artifacts
+      - name: Generate macOS installer
+        if: matrix.config.os == 'macos-12'
+        run: |
+          meson compile osx-bundle -C build
+          meson compile osx-build-dmg -C build
+
+      - name: Upload artifacts - macOS dmg
+        uses: actions/upload-artifact@v3
+        if: matrix.config.os == 'macos-12'
+        with:
+          name: ${{ matrix.config.name }} - installer
+          path: build/Aegisub-*.dmg
+          if-no-files-found: error
+
+      # Linux artifacts (AppImage)
+      - name: Generate AppImage
+        if: matrix.config.appimage
+        run: |
+          mkdir -p appimage/appdir
+          meson install -C build --destdir=../appimage/appdir
+
+          cd appimage
+          sudo apt-get install libfuse2
+          curl -L "https://github.com/linuxdeploy/linuxdeploy/releases/download/1-alpha-20220822-1/linuxdeploy-x86_64.AppImage" -o linuxdeploy
+          curl -L "https://github.com/AppImage/AppImageKit/releases/download/13/appimagetool-x86_64.AppImage" -o appimagetool
+          chmod +x linuxdeploy appimagetool
+
+          ./linuxdeploy --appdir appdir --desktop-file=appdir/aegisub.desktop
+          ./appimagetool appdir
+
+      - name: Upload artifacts - Linux AppImage
+        uses: actions/upload-artifact@v3
+        if: matrix.config.appimage
+        with:
+          name: ${{ matrix.config.name }}
+          path: appimage/*.AppImage
+          if-no-files-found: error

.gitignore

@@ -0,0 +1,49 @@
+/tests/data
+
+automation/vapoursynth/__pycache__
+packages/desktop/aegisub.desktop
+packages/desktop/aegisub.desktop.template
+src/libresrc/bitmap.cpp
+src/libresrc/bitmap.h
+src/libresrc/default_config.cpp
+src/libresrc/default_config.h
+src/libresrc/default_config_platform.json
+tests/*.json
+tests/run
+tools/osx-bundle-restart-helper
+tools/repack-thes-dict
+tools/repack-thes-dict.dSYM
+
+# Platform-specific
+.DS_Store
+
+# Meson
+build*/
+subprojects/avisynth
+subprojects/bestsource/
+subprojects/boost*/
+subprojects/cairo*
+subprojects/dav1d
+subprojects/ffmpeg
+subprojects/ffms2
+subprojects/fontconfig*
+subprojects/freetype2
+subprojects/fribidi
+subprojects/glib*
+subprojects/googletest-*
+subprojects/harfbuzz
+subprojects/icu
+subprojects/jansson
+subprojects/libass
+subprojects/libffi*
+subprojects/libpng-*
+subprojects/luajit
+subprojects/nasm-*
+subprojects/packagecache
+subprojects/proxy-libintl*
+subprojects/wxWidgets
+subprojects/zlib-*
+subprojects/dirent-*
+subprojects/hunspell-*
+subprojects/uchardet-*
+subprojects/vapoursynth

FFmpegSource2/Makefile.am

@@ -1,32 +0,0 @@
-noinst_LIBRARIES = libffmpegsource2_aegisub.a
-
-AM_CPPFLAGS = -I../aegisub -D__UNIX__ -DHAVE_STRLCPY @LIBAVFORMAT_CFLAGS@ @LIBAVCODEC_CFLAGS@ @LIBSWSCALE_CFLAGS@ @LIBAVUTIL_CFLAGS@ @LIBPOSTPROC_CFLAGS@
-
-
-libffmpegsource2_aegisub_a_SOURCES = \
-	ffaudiosource.cpp \
-	ffms.cpp \
-	ffvideosource.cpp \
-	indexing.cpp \
-	MatroskaParser.c \
-	stdiostream.c \
-	utils.cpp \
-	wave64writer.cpp
-
-
-libffmpegsource2_aegisub_a_SOURCES += \
-	MatroskaParser.h \
-	avisynth.h \
-	ffaudiosource.h \
-	ffavisynth.h \
-	ffms.h \
-	ffpp.h \
-	ffswscale.h \
-	ffvideosource.h \
-	indexing.h \
-	stdiostream.h \
-	utils.h \
-	wave64writer.h
-
-EXTRA_DIST = \
-	ffms2.html

FFmpegSource2/MatroskaParser.h

@@ -1,401 +0,0 @@
-/*
- * Copyright (c) 2004-2006 Mike Matsnev.  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 immediately at the beginning of the file, without modification,
- *    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. Absolutely no warranty of function or purpose is made by the author
- *    Mike Matsnev.
- *
- * 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.
- * 
- * $Id: MatroskaParser.h,v 1.19 2006/03/11 10:57:13 mike Exp $
- * 
- */
-
-#ifndef MATROSKA_PARSER_H
-#define	MATROSKA_PARSER_H
-
-/* Random notes:
- *
- * The parser does not process frame data in any way and does not read it into
- * the queue. The app should read it via mkv_ReadData if it is interested.
- *
- * The code here is 64-bit clean and was tested on FreeBSD/sparc 64-bit big endian
- * system
- */
-
-#include <stddef.h>
-
-#ifdef MPDLLBUILD
-#define	X __declspec(dllexport)
-#else
-#ifdef MPDLL
-#define X __declspec(dllimport)
-#pragma comment(lib,"MatroskaParser")
-#else
-#define X
-#endif
-#endif
-
-#define MATROSKA_COMPRESSION_SUPPORT
-#define	MATROSKA_INTEGER_ONLY
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-/* 64-bit integers */
-#ifdef _WIN32_WCE
-typedef signed __int64	    longlong;
-typedef unsigned __int64    ulonglong;
-#else
-typedef signed long long    longlong;
-typedef unsigned long long  ulonglong;
-#endif
-
-/* MKFLOATing point */
-#ifdef MATROSKA_INTEGER_ONLY
-typedef struct {
-  longlong	v;
-} MKFLOAT;
-#else
-typedef	double	MKFLOAT;
-#endif
-
-/* generic I/O */
-struct InputStream {
-  /* read bytes from stream */
-  int	      (*read)(struct InputStream *cc,ulonglong pos,void *buffer,int count);
-  /* scan for a four byte signature, bytes must be nonzero */
-  longlong    (*scan)(struct InputStream *cc,ulonglong start,unsigned signature);
-  /* get cache size, this is used to cap readahead */
-  unsigned    (*getcachesize)(struct InputStream *cc);
-  /* fetch last error message */
-  const char *(*geterror)(struct InputStream *cc);
-  /* memory allocation */
-  void	      *(*memalloc)(struct InputStream *cc,size_t size);
-  void	      *(*memrealloc)(struct InputStream *cc,void *mem,size_t newsize);
-  void	      (*memfree)(struct InputStream *cc,void *mem);
-  /* zero return causes parser to abort open */
-  int	      (*progress)(struct InputStream *cc,ulonglong cur,ulonglong max);
-  /* get file size, optional, can be NULL or return -1 if filesize is unknown */
-  longlong    (*getfilesize)(struct InputStream *cc);
-};
-
-typedef struct InputStream InputStream;
-
-/* matroska file */
-struct MatroskaFile; /* opaque */
-
-typedef struct MatroskaFile MatroskaFile;
-
-#define	COMP_ZLIB   0
-#define	COMP_BZIP   1
-#define	COMP_LZO1X  2
-#define	COMP_PREPEND 3
-
-#define	TT_VIDEO    1
-#define	TT_AUDIO    2
-#define	TT_SUB	    17
-
-struct TrackInfo {
-  unsigned char	  Number;
-  unsigned char	  Type;
-  unsigned char	  TrackOverlay;
-  ulonglong	  UID;
-  ulonglong	  MinCache;
-  ulonglong	  MaxCache;
-  ulonglong	  DefaultDuration;
-  MKFLOAT	  TimecodeScale;
-  void		  *CodecPrivate;
-  unsigned	  CodecPrivateSize;
-  unsigned	  CompMethod;
-  void		  *CompMethodPrivate;
-  unsigned	  CompMethodPrivateSize;
-  unsigned	  MaxBlockAdditionID;
-  struct {
-    unsigned int  Enabled:1;
-    unsigned int  Default:1;
-    unsigned int  Lacing:1;
-    unsigned int  DecodeAll:1;
-    unsigned int  CompEnabled:1;
-  };
-
-  union {
-    struct {
-      unsigned char   StereoMode;
-      unsigned char   DisplayUnit;
-      unsigned char   AspectRatioType;
-      unsigned int    PixelWidth;
-      unsigned int    PixelHeight;
-      unsigned int    DisplayWidth;
-      unsigned int    DisplayHeight;
-      unsigned int    CropL, CropT, CropR, CropB;
-      unsigned int    ColourSpace;
-      MKFLOAT	      GammaValue;
-      struct {
-	unsigned int  Interlaced:1;
-      };
-    } Video;
-    struct {
-      MKFLOAT	      SamplingFreq;
-      MKFLOAT	      OutputSamplingFreq;
-      unsigned char   Channels;
-      unsigned char   BitDepth;
-    } Audio;
-  } AV;
-
-  /* various strings */
-  char			*Name;
-  char			Language[4];
-  char			*CodecID;
-};
-
-typedef struct TrackInfo  TrackInfo;
-
-struct SegmentInfo {
-  char			UID[16];
-  char			PrevUID[16];
-  char			NextUID[16];
-  char			*Filename;
-  char			*PrevFilename;
-  char			*NextFilename;
-  char			*Title;
-  char			*MuxingApp;
-  char			*WritingApp;
-  ulonglong		TimecodeScale;
-  ulonglong		Duration;
-  longlong		DateUTC;
-  char			DateUTCValid;
-};
-
-typedef struct SegmentInfo SegmentInfo;
-
-struct Attachment {
-  ulonglong		Position;
-  ulonglong		Length;
-  ulonglong		UID;
-  char			*Name;
-  char			*Description;
-  char			*MimeType;
-};
-
-typedef struct Attachment Attachment;
-
-struct ChapterDisplay {
-  char			*String;
-  char			Language[4];
-  char			Country[4];
-};
-
-struct ChapterCommand {
-  unsigned		Time;
-  unsigned		CommandLength;
-  void			*Command;
-};
-
-struct ChapterProcess {
-  unsigned		CodecID;
-  unsigned		CodecPrivateLength;
-  void			*CodecPrivate;
-  unsigned		nCommands,nCommandsSize;
-  struct ChapterCommand	*Commands;
-};
-
-struct Chapter {
-  ulonglong		UID;
-  ulonglong		Start;
-  ulonglong		End;
-
-  unsigned		nTracks,nTracksSize;
-  ulonglong		*Tracks;
-  unsigned		nDisplay,nDisplaySize;
-  struct ChapterDisplay	*Display;
-  unsigned		nChildren,nChildrenSize;
-  struct Chapter	*Children;
-  unsigned		nProcess,nProcessSize;
-  struct ChapterProcess	*Process;
-
-  char			SegmentUID[16];
-
-  struct {
-    unsigned int	Hidden:1;
-    unsigned int	Enabled:1;
-
-    // Editions
-    unsigned int	Default:1;
-    unsigned int	Ordered:1;
-  };
-};
-
-typedef struct Chapter	Chapter;
-
-#define	TARGET_TRACK	  0
-#define	TARGET_CHAPTER	  1
-#define	TARGET_ATTACHMENT 2
-#define	TARGET_EDITION	  3
-struct Target {
-  ulonglong	    UID;
-  unsigned	    Type;
-};
-
-struct SimpleTag {
-  char		    *Name;
-  char		    *Value;
-  char		    Language[4];
-  unsigned	    Default:1;
-};
-
-struct Tag {
-  unsigned	    nTargets,nTargetsSize;
-  struct Target	    *Targets;
-
-  unsigned	    nSimpleTags,nSimpleTagsSize;
-  struct SimpleTag  *SimpleTags;
-};
-
-typedef struct Tag  Tag;
-
-/* Open a matroska file
- * io pointer is recorded inside MatroskaFile
- */
-X MatroskaFile  *mkv_Open(/* in */ InputStream *io,
-			/* out */ char *err_msg,
-			/* in */  unsigned msgsize);
-
-#define	MKVF_AVOID_SEEKS    1 /* use sequential reading only */
-
-X MatroskaFile  *mkv_OpenEx(/* in */  InputStream *io,
-			  /* in */  ulonglong base,
-			  /* in */  unsigned flags,
-			  /* out */ char *err_msg,
-			  /* in */  unsigned msgsize);
-
-/* Close and deallocate mf
- * NULL pointer is ok and is simply ignored
- */
-X void		mkv_Close(/* in */ MatroskaFile *mf);
-
-/* Fetch the error message of the last failed operation */
-X const char    *mkv_GetLastError(/* in */ MatroskaFile *mf);
-
-/* Get file information */
-X SegmentInfo   *mkv_GetFileInfo(/* in */ MatroskaFile *mf);
-
-/* Get track information */
-X unsigned int  mkv_GetNumTracks(/* in */ MatroskaFile *mf);
-X TrackInfo     *mkv_GetTrackInfo(/* in */ MatroskaFile *mf,/* in */ unsigned track);
-
-/* chapters, tags and attachments */
-X void	      mkv_GetAttachments(/* in */   MatroskaFile *mf,
-				 /* out */  Attachment **at,
-				 /* out */  unsigned *count);
-X void	      mkv_GetChapters(/* in */	MatroskaFile *mf,
-			      /* out */	Chapter **ch,
-			      /* out */ unsigned *count);
-X void	      mkv_GetTags(/* in */  MatroskaFile *mf,
-			  /* out */ Tag **tag,
-			  /* out */ unsigned *count);
-
-X ulonglong   mkv_GetSegmentTop(MatroskaFile *mf);
-
-/* Seek to specified timecode,
- * if timecode is past end of file,
- * all tracks are set to return EOF
- * on next read
- */
-#define	MKVF_SEEK_TO_PREV_KEYFRAME  1
-
-X void	      mkv_Seek(/* in */ MatroskaFile *mf,
-		       /* in */	ulonglong timecode /* in ns */,
-		       /* in */ unsigned flags);
-
-X void	      mkv_SkipToKeyframe(MatroskaFile *mf);
-
-X ulonglong   mkv_GetLowestQTimecode(MatroskaFile *mf);
-
-X int	      mkv_TruncFloat(MKFLOAT f);
-
-/*************************************************************************
- * reading data, pull model
- */
-
-/* frame flags */
-#define	FRAME_UNKNOWN_START   0x00000001
-#define	FRAME_UNKNOWN_END     0x00000002
-#define	FRAME_KF	      0x00000004
-#define	FRAME_GAP	      0x00800000
-#define	FRAME_STREAM_MASK     0xff000000
-#define	FRAME_STREAM_SHIFT    24
-
-/* This sets the masking flags for the parser,
- *  masked tracks [with 1s in their bit positions]
- *  will be ignored when reading file data.
- * This call discards all parsed and queued frames
- */
-X void	      mkv_SetTrackMask(/* in */ MatroskaFile *mf,/* in */ unsigned int mask);
-
-/* Read one frame from the queue.
- * mask specifies what tracks to ignore.
- * Returns -1 if there are no more frames in the specified
- * set of tracks, 0 on success
- */
-X int	      mkv_ReadFrame(/* in */  MatroskaFile *mf,
-			    /* in */  unsigned int mask,
-			    /* out */ unsigned int *track,
-			    /* out */ ulonglong *StartTime /* in ns */,
-			    /* out */ ulonglong *EndTime /* in ns */,
-			    /* out */ ulonglong *FilePos /* in bytes from start of file */,
-			    /* out */ unsigned int *FrameSize /* in bytes */,
-			    /* out */ unsigned int *FrameFlags);
-
-#ifdef MATROSKA_COMPRESSION_SUPPORT
-/* Compressed streams support */
-struct CompressedStream;
-
-typedef struct CompressedStream CompressedStream;
-
-X CompressedStream  *cs_Create(/* in */	MatroskaFile *mf,
-			     /* in */	unsigned tracknum,
-			     /* out */	char *errormsg,
-			     /* in */	unsigned msgsize);
-X void		  cs_Destroy(/* in */ CompressedStream *cs);
-
-/* advance to the next frame in matroska stream, you need to pass values returned
- * by mkv_ReadFrame */
-X void		  cs_NextFrame(/* in */ CompressedStream *cs,
-			       /* in */ ulonglong pos,
-			       /* in */ unsigned size);
-
-/* read and decode more data from current frame, return number of bytes decoded,
- * 0 on end of frame, or -1 on error */
-X int		  cs_ReadData(CompressedStream *cs,char *buffer,unsigned bufsize);
-
-/* return error message for the last error */
-X const char	  *cs_GetLastError(CompressedStream *cs);
-#endif
-
-#ifdef __cplusplus
-}
-#endif
-
-#undef X
-
-#endif

FFmpegSource2/avisynth.h

@@ -1,749 +0,0 @@
-// Avisynth v2.5.  Copyright 2002 Ben Rudiak-Gould et al.
-// http://www.avisynth.org
-
-// 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., 675 Mass Ave, Cambridge, MA 02139, USA, or visit
-// http://www.gnu.org/copyleft/gpl.html .
-//
-// Linking Avisynth statically or dynamically with other modules is making a
-// combined work based on Avisynth.  Thus, the terms and conditions of the GNU
-// General Public License cover the whole combination.
-//
-// As a special exception, the copyright holders of Avisynth give you
-// permission to link Avisynth with independent modules that communicate with
-// Avisynth solely through the interfaces defined in avisynth.h, regardless of the license
-// terms of these independent modules, and to copy and distribute the
-// resulting combined work under terms of your choice, provided that
-// every copy of the combined work is accompanied by a complete copy of
-// the source code of Avisynth (the version of Avisynth used to produce the
-// combined work), being distributed under the terms of the GNU General
-// Public License plus this exception.  An independent module is a module
-// which is not derived from or based on Avisynth, such as 3rd-party filters,
-// import and export plugins, or graphical user interfaces.
-
-
-
-
-
-#ifndef __AVISYNTH_H__
-#define __AVISYNTH_H__
-
-enum { AVISYNTH_INTERFACE_VERSION = 3 };
-
-
-/* Define all types necessary for interfacing with avisynth.dll
-   Moved from internal.h */
-
-// Win32 API macros, notably the types BYTE, DWORD, ULONG, etc. 
-#include <windef.h>  
-
-// COM interface macros
-#include <objbase.h>
-
-
-// Raster types used by VirtualDub & Avisynth
-#define in64 (__int64)(unsigned short)
-typedef unsigned long	Pixel;    // this will break on 64-bit machines!
-typedef unsigned long	Pixel32;
-typedef unsigned char Pixel8;
-typedef long			PixCoord;
-typedef	long			PixDim;
-typedef	long			PixOffset;
-
-
-/* Compiler-specific crap */
-
-// Tell MSVC to stop precompiling here
-#ifdef _MSC_VER
-  #pragma hdrstop
-#endif
-
-// Set up debugging macros for MS compilers; for others, step down to the
-// standard <assert.h> interface
-#ifdef _MSC_VER
-  #include <crtdbg.h>
-#else
-  #define _RPT0(a,b) ((void)0)
-  #define _RPT1(a,b,c) ((void)0)
-  #define _RPT2(a,b,c,d) ((void)0)
-  #define _RPT3(a,b,c,d,e) ((void)0)
-  #define _RPT4(a,b,c,d,e,f) ((void)0)
-  
-  #define _ASSERTE(x) assert(x)
-  #include <assert.h>
-#endif
-
-
-
-// I had problems with Premiere wanting 1-byte alignment for its structures,
-// so I now set the Avisynth struct alignment explicitly here.
-#pragma pack(push,8)
-
-#define FRAME_ALIGN 16
-// Default frame alignment is 16 bytes, to help P4, when using SSE2
-
-// The VideoInfo struct holds global information about a clip (i.e.
-// information that does not depend on the frame number).  The GetVideoInfo
-// method in IClip returns this struct.
-
-// Audio Sample information
-typedef float SFLOAT;
-
-enum {SAMPLE_INT8  = 1<<0,
-        SAMPLE_INT16 = 1<<1, 
-        SAMPLE_INT24 = 1<<2,    // Int24 is a very stupid thing to code, but it's supported by some hardware.
-        SAMPLE_INT32 = 1<<3,
-        SAMPLE_FLOAT = 1<<4};
-
-enum {
-   PLANAR_Y=1<<0,
-   PLANAR_U=1<<1,
-   PLANAR_V=1<<2,
-   PLANAR_ALIGNED=1<<3,
-   PLANAR_Y_ALIGNED=PLANAR_Y|PLANAR_ALIGNED,
-   PLANAR_U_ALIGNED=PLANAR_U|PLANAR_ALIGNED,
-   PLANAR_V_ALIGNED=PLANAR_V|PLANAR_ALIGNED,
-  };
-
-struct VideoInfo {
-  int width, height;    // width=0 means no video
-  unsigned fps_numerator, fps_denominator;
-  int num_frames;
-  // This is more extensible than previous versions. More properties can be added seeminglesly.
-
-  // Colorspace properties.
-  enum {
-    CS_BGR = 1<<28,  
-    CS_YUV = 1<<29,
-    CS_INTERLEAVED = 1<<30,
-    CS_PLANAR = 1<<31
-  };
-
-  // Specific colorformats
-  enum { CS_UNKNOWN = 0,
-         CS_BGR24 = 1<<0 | CS_BGR | CS_INTERLEAVED,
-         CS_BGR32 = 1<<1 | CS_BGR | CS_INTERLEAVED,
-         CS_YUY2 = 1<<2 | CS_YUV | CS_INTERLEAVED,
-         CS_YV12 = 1<<3 | CS_YUV | CS_PLANAR,  // y-v-u, planar
-         CS_I420 = 1<<4 | CS_YUV | CS_PLANAR,  // y-u-v, planar
-         CS_IYUV = 1<<4 | CS_YUV | CS_PLANAR  // same as above
-         };
-  int pixel_type;                // changed to int as of 2.5
-  
-
-  int audio_samples_per_second;   // 0 means no audio
-  int sample_type;                // as of 2.5
-  __int64 num_audio_samples;      // changed as of 2.5
-  int nchannels;                  // as of 2.5
-
-  // Imagetype properties
-
-  int image_type;
-
-  enum {
-    IT_BFF = 1<<0,
-    IT_TFF = 1<<1,
-    IT_FIELDBASED = 1<<2
-  };
-
-  // useful functions of the above
-  bool HasVideo() const { return (width!=0); }
-  bool HasAudio() const { return (audio_samples_per_second!=0); }
-  bool IsRGB() const { return !!(pixel_type&CS_BGR); }
-  bool IsRGB24() const { return (pixel_type&CS_BGR24)==CS_BGR24; } // Clear out additional properties
-  bool IsRGB32() const { return (pixel_type & CS_BGR32) == CS_BGR32 ; }
-  bool IsYUV() const { return !!(pixel_type&CS_YUV ); }
-  bool IsYUY2() const { return (pixel_type & CS_YUY2) == CS_YUY2; }  
-  bool IsYV12() const { return ((pixel_type & CS_YV12) == CS_YV12)||((pixel_type & CS_I420) == CS_I420); }
-  bool IsColorSpace(int c_space) const { return ((pixel_type & c_space) == c_space); }
-  bool Is(int property) const { return ((pixel_type & property)==property ); }
-  bool IsPlanar() const { return !!(pixel_type & CS_PLANAR); }
-  bool IsFieldBased() const { return !!(image_type & IT_FIELDBASED); }
-  bool IsParityKnown() const { return ((image_type & IT_FIELDBASED)&&(image_type & (IT_BFF|IT_TFF))); }
-  bool IsBFF() const { return !!(image_type & IT_BFF); }
-  bool IsTFF() const { return !!(image_type & IT_TFF); }
-  
-  bool IsVPlaneFirst() const {return ((pixel_type & CS_YV12) == CS_YV12); }  // Don't use this 
-  int BytesFromPixels(int pixels) const { return pixels * (BitsPerPixel()>>3); }   // Will not work on planar images, but will return only luma planes
-  int RowSize() const { return BytesFromPixels(width); }  // Also only returns first plane on planar images
-  int BMPSize() const { if (IsPlanar()) {int p = height * ((RowSize()+3) & ~3); p+=p>>1; return p;  } return height * ((RowSize()+3) & ~3); }
-  __int64 AudioSamplesFromFrames(__int64 frames) const { return (fps_numerator && HasVideo()) ? ((__int64)(frames) * audio_samples_per_second * fps_denominator / fps_numerator) : 0; }
-  int FramesFromAudioSamples(__int64 samples) const { return (fps_denominator && HasAudio()) ? (int)((samples * (__int64)fps_numerator)/((__int64)fps_denominator * (__int64)audio_samples_per_second)) : 0; }
-  __int64 AudioSamplesFromBytes(__int64 bytes) const { return HasAudio() ? bytes / BytesPerAudioSample() : 0; }
-  __int64 BytesFromAudioSamples(__int64 samples) const { return samples * BytesPerAudioSample(); }
-  int AudioChannels() const { return HasAudio() ? nchannels : 0; }
-  int SampleType() const{ return sample_type;}
-  bool IsSampleType(int testtype) const{ return !!(sample_type&testtype);}
-  int SamplesPerSecond() const { return audio_samples_per_second; }
-  int BytesPerAudioSample() const { return nchannels*BytesPerChannelSample();}
-  void SetFieldBased(bool isfieldbased)  { if (isfieldbased) image_type|=IT_FIELDBASED; else  image_type&=~IT_FIELDBASED; }
-  void Set(int property)  { image_type|=property; }
-  void Clear(int property)  { image_type&=~property; }
-
-  int BitsPerPixel() const { 
-    switch (pixel_type) {
-      case CS_BGR24:
-        return 24;
-      case CS_BGR32:
-        return 32;
-      case CS_YUY2:
-        return 16;
-      case CS_YV12:
-      case CS_I420:
-        return 12;
-      default:
-        return 0;
-    }
-  }
-  int BytesPerChannelSample() const { 
-    switch (sample_type) {
-    case SAMPLE_INT8:
-      return sizeof(signed char);
-    case SAMPLE_INT16:
-      return sizeof(signed short);
-    case SAMPLE_INT24:
-      return 3;
-    case SAMPLE_INT32:
-      return sizeof(signed int);
-    case SAMPLE_FLOAT:
-      return sizeof(SFLOAT);
-    default:
-      _ASSERTE("Sample type not recognized!");
-      return 0;
-    }
-  }
-
-  // useful mutator
-  void SetFPS(unsigned numerator, unsigned denominator) {
-	if ((numerator == 0) || (denominator == 0)) {
-	  fps_numerator = 0;
-	  fps_denominator = 1;
-	}
-	else {
-	  unsigned x=numerator, y=denominator;
-	  while (y) {   // find gcd
-		unsigned t = x%y; x = y; y = t;
-	  }
-	  fps_numerator = numerator/x;
-	  fps_denominator = denominator/x;
-	}
-  }
-
-  // Range protected multiply-divide of FPS
-  void MulDivFPS(unsigned multiplier, unsigned divisor) {
-	unsigned __int64 numerator   = UInt32x32To64(fps_numerator,   multiplier);
-	unsigned __int64 denominator = UInt32x32To64(fps_denominator, divisor);
-
-	unsigned __int64 x=numerator, y=denominator;
-	while (y) {   // find gcd
-	  unsigned __int64 t = x%y; x = y; y = t;
-	}
-	numerator   /= x; // normalize
-	denominator /= x;
-
-	unsigned __int64 temp = numerator | denominator; // Just looking top bit
-	unsigned u = 0;
-	while (temp & 0xffffffff80000000) { // or perhaps > 16777216*2
-	  temp = Int64ShrlMod32(temp, 1);
-	  u++;
-	}
-	if (u) { // Scale to fit
-	  const unsigned round = 1 << (u-1);
-	  SetFPS( (unsigned)Int64ShrlMod32(numerator   + round, u),
-	          (unsigned)Int64ShrlMod32(denominator + round, u) );
-	}
-	else {
-	  fps_numerator   = (unsigned)numerator;
-	  fps_denominator = (unsigned)denominator;
-	}
-  }
-
-  // Test for same colorspace
-  bool IsSameColorspace(const VideoInfo& vi) const {
-    if (vi.pixel_type == pixel_type) return TRUE;
-    if (IsYV12() && vi.IsYV12()) return TRUE;
-    return FALSE;
-  }
-
-};
-
-
-
-
-// VideoFrameBuffer holds information about a memory block which is used
-// for video data.  For efficiency, instances of this class are not deleted
-// when the refcount reaches zero; instead they're stored in a linked list
-// to be reused.  The instances are deleted when the corresponding AVS
-// file is closed.
-
-class VideoFrameBuffer {
-  BYTE* const data;
-  const int data_size;
-  // sequence_number is incremented every time the buffer is changed, so
-  // that stale views can tell they're no longer valid.
-  long sequence_number;
-
-  friend class VideoFrame;
-  friend class Cache;
-  friend class ScriptEnvironment;
-  long refcount;
-
-public:
-  VideoFrameBuffer(int size);
-  VideoFrameBuffer();
-  ~VideoFrameBuffer();
-
-  const BYTE* GetReadPtr() const { return data; }
-  BYTE* GetWritePtr() { ++sequence_number; return data; }
-  int GetDataSize() { return data_size; }
-  int GetSequenceNumber() { return sequence_number; }
-  int GetRefcount() { return refcount; }
-};
-
-
-class IClip;
-class PClip;
-class PVideoFrame;
-class IScriptEnvironment;
-class AVSValue;
-
-
-// VideoFrame holds a "window" into a VideoFrameBuffer.  Operator new
-// is overloaded to recycle class instances.
-
-class VideoFrame {
-  int refcount;
-  VideoFrameBuffer* const vfb;
-  const int offset, pitch, row_size, height, offsetU, offsetV, pitchUV;  // U&V offsets are from top of picture.
-
-  friend class PVideoFrame;
-  void AddRef() { InterlockedIncrement((long *)&refcount); }
-  void Release() { if (refcount==1) InterlockedDecrement(&vfb->refcount); InterlockedDecrement((long *)&refcount); }
-
-  friend class ScriptEnvironment;
-  friend class Cache;
-
-  VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height);
-  VideoFrame(VideoFrameBuffer* _vfb, int _offset, int _pitch, int _row_size, int _height, int _offsetU, int _offsetV, int _pitchUV);
-
-  void* operator new(unsigned size);
-// TESTME: OFFSET U/V may be switched to what could be expected from AVI standard!
-public:
-  int GetPitch() const { return pitch; }
-  int GetPitch(int plane) const { switch (plane) {case PLANAR_U: case PLANAR_V: return pitchUV;} return pitch; }
-  int GetRowSize() const { return row_size; }
-  int GetRowSize(int plane) const { 
-    switch (plane) {
-    case PLANAR_U: case PLANAR_V: if (pitchUV) return row_size>>1; else return 0;
-    case PLANAR_U_ALIGNED: case PLANAR_V_ALIGNED: 
-      if (pitchUV) { 
-        int r = ((row_size+FRAME_ALIGN-1)&(~(FRAME_ALIGN-1)) )>>1; // Aligned rowsize
-        if (r<=pitchUV) 
-          return r; 
-        return row_size>>1; 
-      } else return 0;
-    case PLANAR_Y_ALIGNED:
-      int r = (row_size+FRAME_ALIGN-1)&(~(FRAME_ALIGN-1)); // Aligned rowsize
-      if (r<=pitch) 
-        return r; 
-      return row_size;
-    }
-    return row_size; }
-  int GetHeight() const { return height; }
-  int GetHeight(int plane) const {  switch (plane) {case PLANAR_U: case PLANAR_V: if (pitchUV) return height>>1; return 0;} return height; }
-
-  // generally you shouldn't use these three
-  VideoFrameBuffer* GetFrameBuffer() const { return vfb; }
-  int GetOffset() const { return offset; }
-  int GetOffset(int plane) const { switch (plane) {case PLANAR_U: return offsetU;case PLANAR_V: return offsetV;default: return offset;}; }
-
-  // in plugins use env->SubFrame()
-  VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height) const;
-  VideoFrame* Subframe(int rel_offset, int new_pitch, int new_row_size, int new_height, int rel_offsetU, int rel_offsetV, int pitchUV) const;
-
-
-  const BYTE* GetReadPtr() const { return vfb->GetReadPtr() + offset; }
-  const BYTE* GetReadPtr(int plane) const { return vfb->GetReadPtr() + GetOffset(plane); }
-
-  bool IsWritable() const { return (refcount == 1 && vfb->refcount == 1); }
-
-  BYTE* GetWritePtr() const {
-    if (vfb->GetRefcount()>1) {
-      _ASSERT(FALSE);
-      //throw AvisynthError("Internal Error - refcount was more than one!");
-    }
-    return IsWritable() ? (vfb->GetWritePtr() + offset) : 0;
-  }
-
-  BYTE* GetWritePtr(int plane) const {
-    if (plane==PLANAR_Y) {
-      if (vfb->GetRefcount()>1) {
-        _ASSERT(FALSE);
-//        throw AvisynthError("Internal Error - refcount was more than one!");
-      }
-      return IsWritable() ? vfb->GetWritePtr() + GetOffset(plane) : 0;
-    }
-    return vfb->data + GetOffset(plane);
-  }
-
-  ~VideoFrame() { InterlockedDecrement(&vfb->refcount); }
-};
-
-enum {
-  CACHE_NOTHING=0,
-  CACHE_RANGE=1,
-  CACHE_ALL=2,
-  CACHE_AUDIO=3,
-  CACHE_AUDIO_NONE=4
- };
-
-// Base class for all filters.
-class IClip {
-  friend class PClip;
-  friend class AVSValue;
-  int refcnt;
-  void AddRef() { InterlockedIncrement((long *)&refcnt); }
-  void Release() { InterlockedDecrement((long *)&refcnt); if (!refcnt) delete this; }
-public:
-  IClip() : refcnt(0) {}
-
-  virtual int __stdcall GetVersion() { return AVISYNTH_INTERFACE_VERSION; }
-  
-  virtual PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) = 0;
-  virtual bool __stdcall GetParity(int n) = 0;  // return field parity if field_based, else parity of first field in frame
-  virtual void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env) = 0;  // start and count are in samples
-  virtual void __stdcall SetCacheHints(int cachehints,int frame_range) = 0 ;  // We do not pass cache requests upwards, only to the next filter.
-  virtual const VideoInfo& __stdcall GetVideoInfo() = 0;
-  virtual __stdcall ~IClip() {}
-};
-
-
-// smart pointer to IClip
-class PClip {
-
-  IClip* p;
-
-  IClip* GetPointerWithAddRef() const { if (p) p->AddRef(); return p; }
-  friend class AVSValue;
-  friend class VideoFrame;
-
-  void Init(IClip* x) {
-    if (x) x->AddRef();
-    p=x;
-  }
-  void Set(IClip* x) {
-    if (x) x->AddRef();
-    if (p) p->Release();
-    p=x;
-  }
-
-public:
-  PClip() { p = 0; }
-  PClip(const PClip& x) { Init(x.p); }
-  PClip(IClip* x) { Init(x); }
-  void operator=(IClip* x) { Set(x); }
-  void operator=(const PClip& x) { Set(x.p); }
-
-  IClip* operator->() const { return p; }
-
-  // useful in conditional expressions
-  operator void*() const { return p; }
-  bool operator!() const { return !p; }
-
-  ~PClip() { if (p) p->Release(); }
-};
-
-
-// smart pointer to VideoFrame
-class PVideoFrame {
-
-  VideoFrame* p;
-
-  void Init(VideoFrame* x) {
-    if (x) x->AddRef();
-    p=x;
-  }
-  void Set(VideoFrame* x) {
-    if (x) x->AddRef();
-    if (p) p->Release();
-    p=x;
-  }
-
-public:
-  PVideoFrame() { p = 0; }
-  PVideoFrame(const PVideoFrame& x) { Init(x.p); }
-  PVideoFrame(VideoFrame* x) { Init(x); }
-  void operator=(VideoFrame* x) { Set(x); }
-  void operator=(const PVideoFrame& x) { Set(x.p); }
-
-  VideoFrame* operator->() const { return p; }
-
-  // for conditional expressions
-  operator void*() const { return p; }
-  bool operator!() const { return !p; }
-
-  ~PVideoFrame() { if (p) p->Release();}
-};
-
-
-class AVSValue {
-public:
-
-  AVSValue() { type = 'v'; }
-  AVSValue(IClip* c) { type = 'c'; clip = c; if (c) c->AddRef(); }
-  AVSValue(const PClip& c) { type = 'c'; clip = c.GetPointerWithAddRef(); }
-  AVSValue(bool b) { type = 'b'; boolean = b; }
-  AVSValue(int i) { type = 'i'; integer = i; }
-//  AVSValue(__int64 l) { type = 'l'; longlong = l; }
-  AVSValue(float f) { type = 'f'; floating_pt = f; }
-  AVSValue(double f) { type = 'f'; floating_pt = float(f); }
-  AVSValue(const char* s) { type = 's'; string = s; }
-  AVSValue(const AVSValue* a, int size) { type = 'a'; array = a; array_size = size; }
-  AVSValue(const AVSValue& v) { Assign(&v, true); }
-
-  ~AVSValue() { if (IsClip() && clip) clip->Release(); }
-  AVSValue& operator=(const AVSValue& v) { Assign(&v, false); return *this; }
-
-  // Note that we transparently allow 'int' to be treated as 'float'.
-  // There are no int<->bool conversions, though.
-
-  bool Defined() const { return type != 'v'; }
-  bool IsClip() const { return type == 'c'; }
-  bool IsBool() const { return type == 'b'; }
-  bool IsInt() const { return type == 'i'; }
-//  bool IsLong() const { return (type == 'l'|| type == 'i'); }
-  bool IsFloat() const { return type == 'f' || type == 'i'; }
-  bool IsString() const { return type == 's'; }
-  bool IsArray() const { return type == 'a'; }
-
-  PClip AsClip() const { _ASSERTE(IsClip()); return IsClip()?clip:0; }
-  bool AsBool() const { _ASSERTE(IsBool()); return boolean; }
-  int AsInt() const { _ASSERTE(IsInt()); return integer; }   
-//  int AsLong() const { _ASSERTE(IsLong()); return longlong; } 
-  const char* AsString() const { _ASSERTE(IsString()); return IsString()?string:0; }
-  double AsFloat() const { _ASSERTE(IsFloat()); return IsInt()?integer:floating_pt; }
-
-  bool AsBool(bool def) const { _ASSERTE(IsBool()||!Defined()); return IsBool() ? boolean : def; }
-  int AsInt(int def) const { _ASSERTE(IsInt()||!Defined()); return IsInt() ? integer : def; }
-  double AsFloat(double def) const { _ASSERTE(IsFloat()||!Defined()); return IsInt() ? integer : type=='f' ? floating_pt : def; }
-  const char* AsString(const char* def) const { _ASSERTE(IsString()||!Defined()); return IsString() ? string : def; }
-
-  int ArraySize() const { _ASSERTE(IsArray()); return IsArray()?array_size:1; }
-
-  const AVSValue& operator[](int index) const {
-    _ASSERTE(IsArray() && index>=0 && index<array_size);
-    return (IsArray() && index>=0 && index<array_size) ? array[index] : *this;
-  }
-
-private:
-
-  short type;  // 'a'rray, 'c'lip, 'b'ool, 'i'nt, 'f'loat, 's'tring, 'v'oid, or 'l'ong
-  short array_size;
-  union {
-    IClip* clip;
-    bool boolean;
-    int integer;
-    float floating_pt;
-    const char* string;
-    const AVSValue* array;
-//    __int64 longlong;
-  };
-
-  void Assign(const AVSValue* src, bool init) {
-    if (src->IsClip() && src->clip)
-      src->clip->AddRef();
-    if (!init && IsClip() && clip)
-      clip->Release();
-    // make sure this copies the whole struct!
-    ((__int32*)this)[0] = ((__int32*)src)[0];
-    ((__int32*)this)[1] = ((__int32*)src)[1];
-  }
-};
-
-
-// instantiable null filter
-class GenericVideoFilter : public IClip {
-protected:
-  PClip child;
-  VideoInfo vi;
-public:
-  GenericVideoFilter(PClip _child) : child(_child) { vi = child->GetVideoInfo(); }
-  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env) { return child->GetFrame(n, env); }
-  void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env) { child->GetAudio(buf, start, count, env); }
-  const VideoInfo& __stdcall GetVideoInfo() { return vi; }
-  bool __stdcall GetParity(int n) { return child->GetParity(n); }
-  void __stdcall SetCacheHints(int cachehints,int frame_range) { } ;  // We do not pass cache requests upwards, only to the next filter.
-};
-
-
-class AvisynthError /* exception */ {
-public:
-  const char* const msg;
-  AvisynthError(const char* _msg) : msg(_msg) {}
-};
-
-
-
-
-/* Helper classes useful to plugin authors */
-
-class AlignPlanar : public GenericVideoFilter 
-{
-public:
-  AlignPlanar(PClip _clip);
-  static PClip Create(PClip clip);
-  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env);
-};
-
-
-
-class FillBorder : public GenericVideoFilter 
-{
-public:
-  FillBorder(PClip _clip);
-  static PClip Create(PClip clip);
-  PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* env);
-};
-
-
-
-class ConvertAudio : public GenericVideoFilter 
-/**
-  * Helper class to convert audio to any format
- **/
-{
-public:
-  ConvertAudio(PClip _clip, int prefered_format);
-  void __stdcall GetAudio(void* buf, __int64 start, __int64 count, IScriptEnvironment* env);
-  void __stdcall SetCacheHints(int cachehints,int frame_range);  // We do pass cache requests upwards, to the cache!
-
-  static PClip Create(PClip clip, int sample_type, int prefered_type);
-  static AVSValue __cdecl Create_float(AVSValue args, void*, IScriptEnvironment*);
-  static AVSValue __cdecl Create_32bit(AVSValue args, void*, IScriptEnvironment*);
-  static AVSValue __cdecl Create_24bit(AVSValue args, void*, IScriptEnvironment*);
-  static AVSValue __cdecl Create_16bit(AVSValue args, void*, IScriptEnvironment*);
-  static AVSValue __cdecl Create_8bit(AVSValue args, void*, IScriptEnvironment*);
-  virtual ~ConvertAudio();
-
-private:
-  void convertToFloat(char* inbuf, float* outbuf, char sample_type, int count);
-  void convertToFloat_3DN(char* inbuf, float* outbuf, char sample_type, int count);
-  void convertToFloat_SSE(char* inbuf, float* outbuf, char sample_type, int count);
-  void convertToFloat_SSE2(char* inbuf, float* outbuf, char sample_type, int count);
-  void convertFromFloat(float* inbuf, void* outbuf, char sample_type, int count);
-  void convertFromFloat_3DN(float* inbuf, void* outbuf, char sample_type, int count);
-  void convertFromFloat_SSE(float* inbuf, void* outbuf, char sample_type, int count);
-  void convertFromFloat_SSE2(float* inbuf, void* outbuf, char sample_type, int count);
-
-  __inline int Saturate_int8(float n);
-  __inline short Saturate_int16(float n);
-  __inline int Saturate_int24(float n);
-  __inline int Saturate_int32(float n);
-
-  char src_format;
-  char dst_format;
-  int src_bps;
-  char *tempbuffer;
-  SFLOAT *floatbuffer;
-  int tempbuffer_size;
-};
-
-
-// For GetCPUFlags.  These are backwards-compatible with those in VirtualDub.
-enum {                    
-                    /* slowest CPU to support extension */
-  CPUF_FORCE			  = 0x01,   // N/A
-  CPUF_FPU			    = 0x02,   // 386/486DX
-  CPUF_MMX			    = 0x04,   // P55C, K6, PII
-  CPUF_INTEGER_SSE	= 0x08,		// PIII, Athlon
-  CPUF_SSE			    = 0x10,		// PIII, Athlon XP/MP
-  CPUF_SSE2			    = 0x20,		// PIV, Hammer
-  CPUF_3DNOW			  = 0x40,   // K6-2
-  CPUF_3DNOW_EXT		= 0x80,		// Athlon
-  CPUF_X86_64       = 0xA0,   // Hammer (note: equiv. to 3DNow + SSE2, which only Hammer
-                              //         will have anyway)
-  CPUF_SSE3		= 0x100,		    // Some P4 & Athlon 64.
-};
-#define MAX_INT 0x7fffffff
-#define MIN_INT -0x7fffffff
-
-
-
-class IScriptEnvironment {
-public:
-  virtual __stdcall ~IScriptEnvironment() {}
-
-  virtual /*static*/ long __stdcall GetCPUFlags() = 0;
-
-  virtual char* __stdcall SaveString(const char* s, int length = -1) = 0;
-  virtual char* __stdcall Sprintf(const char* fmt, ...) = 0;
-  // note: val is really a va_list; I hope everyone typedefs va_list to a pointer
-  virtual char* __stdcall VSprintf(const char* fmt, void* val) = 0;
-
-  __declspec(noreturn) virtual void __stdcall ThrowError(const char* fmt, ...) = 0;
-
-  class NotFound /*exception*/ {};  // thrown by Invoke and GetVar
-
-  typedef AVSValue (__cdecl *ApplyFunc)(AVSValue args, void* user_data, IScriptEnvironment* env);
-
-  virtual void __stdcall AddFunction(const char* name, const char* params, ApplyFunc apply, void* user_data) = 0;
-  virtual bool __stdcall FunctionExists(const char* name) = 0;
-  virtual AVSValue __stdcall Invoke(const char* name, const AVSValue args, const char** arg_names=0) = 0;
-
-  virtual AVSValue __stdcall GetVar(const char* name) = 0;
-  virtual bool __stdcall SetVar(const char* name, const AVSValue& val) = 0;
-  virtual bool __stdcall SetGlobalVar(const char* name, const AVSValue& val) = 0;
-
-  virtual void __stdcall PushContext(int level=0) = 0;
-  virtual void __stdcall PopContext() = 0;
-
-  // align should be 4 or 8
-  virtual PVideoFrame __stdcall NewVideoFrame(const VideoInfo& vi, int align=FRAME_ALIGN) = 0;
-
-  virtual bool __stdcall MakeWritable(PVideoFrame* pvf) = 0;
-
-  virtual /*static*/ void __stdcall BitBlt(BYTE* dstp, int dst_pitch, const BYTE* srcp, int src_pitch, int row_size, int height) = 0;
-
-  typedef void (__cdecl *ShutdownFunc)(void* user_data, IScriptEnvironment* env);
-  virtual void __stdcall AtExit(ShutdownFunc function, void* user_data) = 0;
-
-  virtual void __stdcall CheckVersion(int version = AVISYNTH_INTERFACE_VERSION) = 0;
-
-  virtual PVideoFrame __stdcall Subframe(PVideoFrame src, int rel_offset, int new_pitch, int new_row_size, int new_height) = 0;
-
-  virtual int __stdcall SetMemoryMax(int mem) = 0;
-
-  virtual int __stdcall SetWorkingDir(const char * newdir) = 0;
-
-  virtual void* __stdcall ManageCache(int key, void* data) = 0;
-
-  enum PlanarChromaAlignmentMode {
-			PlanarChromaAlignmentOff,
-			PlanarChromaAlignmentOn,
-			PlanarChromaAlignmentTest };
-
-  virtual bool __stdcall PlanarChromaAlignment(PlanarChromaAlignmentMode key) = 0;
-
-  virtual PVideoFrame __stdcall SubframePlanar(PVideoFrame src, int rel_offset, int new_pitch, int new_row_size, int new_height, int rel_offsetU, int rel_offsetV, int new_pitchUV) = 0;
-};
-
-
-// avisynth.dll exports this; it's a way to use it as a library, without
-// writing an AVS script or without going through AVIFile.
-IScriptEnvironment* __stdcall CreateScriptEnvironment(int version = AVISYNTH_INTERFACE_VERSION);
-
-
-#pragma pack(pop)
-
-#endif //__AVISYNTH_H__

FFmpegSource2/coparser.h

@@ -1,121 +0,0 @@
-/*
- * Copyright (c) 2004-2008 Mike Matsnev.  All Rights Reserved.
- * 
- * $Id: CoParser.h,v 1.21 2008/03/29 15:41:28 mike Exp $
- * 
- */
-
-#ifndef COPARSER_H
-#define	COPARSER_H
-
-// Generic multimedia container parsers support
-
-// random access stream, this will be provided by
-// IMMContainer's client
-[uuid("8E192E9F-E536-4027-8D46-664CC7A102C5")]
-interface IMMStream : public IUnknown {
-  // read count bytes starting at position
-  STDMETHOD(Read)(	    unsigned long long position,
-		  	    void *buffer,
-			    unsigned int *count) = 0;
-
-  // scan the file starting at position for the signature
-  // signature can't have zero bytes
-  STDMETHOD(Scan)(	    unsigned long long *position,
-		  	    unsigned int signature) = 0;
-};
-
-[uuid("A237C873-C6AD-422E-90DB-7CB4627DCFD9")]
-interface IMMStreamOpen : public IUnknown {
-  STDMETHOD(Open)(LPCWSTR name) = 0;
-};
-
-[uuid("D8FF7213-6E09-4256-A2E5-5872C798B128")]
-interface IMMFrame : public IMediaSample2 {
-  // track number must be the same as returned by
-  // IMMContainer->EnumTracks() iterator
-  STDMETHOD_(unsigned, GetTrack)() = 0;
-  STDMETHOD(SetTrack)(unsigned) = 0;
-
-  STDMETHOD_(unsigned, GetPre)() = 0;
-  STDMETHOD(SetPre)(unsigned) = 0;
-};
-
-[uuid("B8324E2A-21A9-46A1-8922-70C55D06311A")]
-interface IMMErrorInfo : public IUnknown {
-  STDMETHOD(LogError)(BSTR message) = 0;    // message is owned by the caller
-  STDMETHOD(LogWarning)(BSTR message) = 0;
-};
-
-[uuid("C7120EDB-528C-4ebe-BB53-DA8E70E618EE")]
-interface IMemAlloc : public IUnknown {
-  STDMETHOD(GetBuffer)(HANDLE hAbortEvt, DWORD size, IMMFrame **pS) = 0;
-};
-
-// container itself should support IPropertyBag and return
-// at least Duration[UI8] (in ns) property
-// if a containter supports multiple segments in the same
-// physical file it should return SegmentTop[UI8] property
-// that return the offset of the first byte after this
-// segment's end
-[uuid("A369001B-F292-45f7-A942-84F9C8C0718A")]
-interface IMMContainer : public IUnknown {
-  STDMETHOD(Open)(	    IMMStream *stream,
-			    unsigned long long position,
-			    IMMErrorInfo *einfo,
-			    IMemAlloc *alloc) = 0;
-  STDMETHOD(GetProgress)(unsigned long long *cur,unsigned long long *max) = 0;
-  STDMETHOD(AbortOpen)() = 0;
-
-  // pu->Next() returns objects supporting IPropertyBag interface
-  STDMETHOD(EnumTracks)(IEnumUnknown **pu) = 0;
-
-  // pu->Next() returns objects supporting IProperyBag and IEnumUnknown interfaces
-  STDMETHOD(EnumEditions)(IEnumUnknown **pu) = 0;
-
-  // pu->Next() returns objects supporting IProperyBag and IMMStream interfaces
-  STDMETHOD(EnumAttachments)(IEnumUnknown **pu) = 0;
-
-  // S_FALSE is end of stream, S_OK next valid frame returned, E_ABORT wait aborted
-  STDMETHOD(ReadFrame)(HANDLE hAbortEvt, IMMFrame **frame) = 0;
-
-  // seeking
-  STDMETHOD(Seek)(unsigned long long timecode,unsigned flags) = 0;
-};
-
-/* FIXME: duplicated in matroska parser
-enum { // Track type
-  TT_VIDEO = 1,
-  TT_AUDIO = 2,
-  TT_SUBS = 17,
-
-  TT_INTERLEAVED = 0x10001,
-};
-*/
-
-enum { // Seek flags
-  MMSF_PREV_KF = 1,
-  MMSF_NEXT_KF = 2
-};
-
-/* Track properties [IPropertyBag from EnumTracks->Next()]
-    Name		    Type      Optional
-  DefaultDuration	    UI8		Yes	    in ns
-  Video.Interlaced	    BOOL	Yes
-  Video.DisplayWidth	    UI4		Yes
-  Video.DisplayHeight	    UI4		Yes
-  Video.PixelWidth	    UI4		No
-  Video.PixelHeight	    UI4		No
-  CodecID		    BSTR	No
-  Type			    UI4		No	    TT_* enumeration
-  CodecPrivate		    ARRAY|UI1	Yes
-  Audio.Channels	    UI4		No
-  Audio.BitDepth	    UI4		Yes
-  Audio.SamplingFreq	    UI4		No
-  Audio.OutputSamplingFreq  UI4		Yes
-  Language		    BSTR	Yes
-  Name			    BSTR	Yes
-  FOURCC		    UI4		Yes
-*/
-
-#endif

FFmpegSource2/ffaudiosource.cpp

@@ -1,368 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "ffaudiosource.h"
-#include <errno.h>
-
-#ifdef __UNIX__
-#define _snprintf snprintf
-#endif
-
-AudioBase::AudioBase() {
-	DecodingBuffer = new uint8_t[AVCODEC_MAX_AUDIO_FRAME_SIZE * 10];
-};
-
-AudioBase::~AudioBase() {
-	delete[] DecodingBuffer;
-};
-
-size_t AudioBase::FindClosestAudioKeyFrame(int64_t Sample) {
-	for (size_t i = 0; i < Frames.size(); i++) {
-		if (Frames[i].SampleStart == Sample && Frames[i].KeyFrame)
-			return i;
-		else if (Frames[i].SampleStart > Sample && Frames[i].KeyFrame)
-			return i  - 1;
-	}
-	return Frames.size() - 1;
-}
-
-void FFAudioSource::Free(bool CloseCodec) {
-	if (CloseCodec)
-		avcodec_close(CodecContext);
-	av_close_input_file(FormatContext);
-}
-
-FFAudioSource::FFAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize) {
-	FormatContext = NULL;
-	AVCodec *Codec = NULL;
-	AudioTrack = Track;
-	Frames = (*TrackIndices)[AudioTrack];
-
-	if (Frames.size() == 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Audio track contains no frames");
-		throw ErrorMsg;
-	}
-
-	if (av_open_input_file(&FormatContext, SourceFile, NULL, 0, NULL) != 0) {
-		_snprintf(ErrorMsg, MsgSize, "Couldn't open '%s'", SourceFile);
-		throw ErrorMsg;
-	}
-	
-	if (av_find_stream_info(FormatContext) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Couldn't find stream information");
-		throw ErrorMsg;
-	}
-
-	CodecContext = FormatContext->streams[AudioTrack]->codec;
-
-	Codec = avcodec_find_decoder(CodecContext->codec_id);
-	if (Codec == NULL) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Audio codec not found");
-		throw ErrorMsg;
-	}
-
-	if (avcodec_open(CodecContext, Codec) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Could not open audio codec");
-		throw ErrorMsg;
-	}
-
-	// Always try to decode a frame to make sure all required parameters are known
-	uint8_t DummyBuf[512];
-	if (GetAudio(DummyBuf, 0, 1, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	AP.BitsPerSample = av_get_bits_per_sample_format(CodecContext->sample_fmt);
-	AP.Channels = CodecContext->channels;;
-	AP.Float = AudioFMTIsFloat(CodecContext->sample_fmt);
-	AP.SampleRate = CodecContext->sample_rate;
-	AP.NumSamples = (Frames.back()).SampleStart;
-
-	if (AP.SampleRate <= 0 || AP.BitsPerSample <= 0) {
-		Free(true);
-		_snprintf(ErrorMsg, MsgSize, "Codec returned zero size audio");
-		throw ErrorMsg;
-	}
-}
-
-int FFAudioSource::DecodeNextAudioBlock(uint8_t *Buf, int64_t *Count, char *ErrorMsg, unsigned MsgSize) {
-	const size_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8;
-	int Ret = -1;
-	*Count = 0;
-	AVPacket Packet;
-
-	while (av_read_frame(FormatContext, &Packet) >= 0) {
-        if (Packet.stream_index == AudioTrack) {
-			uint8_t *Data = Packet.data;
-			int Size = Packet.size;
-
-			while (Size > 0) {
-				int TempOutputBufSize = AVCODEC_MAX_AUDIO_FRAME_SIZE * 10;
-				Ret = avcodec_decode_audio2(CodecContext, (int16_t *)Buf, &TempOutputBufSize, Data, Size);
-
-				if (Ret < 0) {// throw error or something?
-					av_free_packet(&Packet);
-					goto Done;
-				}
-
-				if (Ret > 0) {
-					Size -= Ret;
-					Data += Ret;
-					Buf += TempOutputBufSize;
-					if (SizeConst)
-						*Count += TempOutputBufSize / SizeConst;
-				}
-			}
-
-			av_free_packet(&Packet);
-			goto Done;
-        }
-
-		av_free_packet(&Packet);
-	}
-
-Done:
-	return Ret;
-}
-
-int FFAudioSource::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) {
-	const size_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8;
-	size_t CurrentAudioBlock = FFMAX((int64_t)FindClosestAudioKeyFrame(Start) - 50, (int64_t)0);
-	memset(Buf, 0, SizeConst * Count);
-	AVPacket Packet;
-
-	avcodec_flush_buffers(CodecContext);
-	av_seek_frame(FormatContext, AudioTrack, Frames[CurrentAudioBlock].DTS, AVSEEK_FLAG_BACKWARD);
-
-	// Establish where we actually are
-	// Trigger on packet dts difference since groups can otherwise be indistinguishable
-	int64_t LastDTS = - 1;
-	while (av_read_frame(FormatContext, &Packet) >= 0) {
-        if (Packet.stream_index == AudioTrack) {
-			if (LastDTS < 0) {
-				LastDTS = Packet.dts;
-			} else if (LastDTS != Packet.dts) {
-				for (size_t i = 0; i < Frames.size(); i++)
-					if (Frames[i].DTS == Packet.dts) {
-						// The current match was consumed
-						CurrentAudioBlock = i + 1;
-						break;
-					}
-
-				av_free_packet(&Packet);
-				break;
-			}
-		}
-
-		av_free_packet(&Packet);
-	}
-
-	uint8_t *DstBuf = (uint8_t *)Buf;
-	int64_t RemainingSamples = Count;
-	int64_t DecodeCount;
-
-	do {
-		int64_t DecodeStart = Frames[CurrentAudioBlock].SampleStart;
-		int Ret = DecodeNextAudioBlock(DecodingBuffer, &DecodeCount, ErrorMsg, MsgSize);
-		if (Ret < 0) {
-			// FIXME
-			//Env->ThrowError("Bleh, bad audio decoding");
-		}
-		CurrentAudioBlock++;
-
-		int64_t OffsetBytes = SizeConst * FFMAX(0, Start - DecodeStart);
-		int64_t CopyBytes = FFMAX(0, SizeConst * FFMIN(RemainingSamples, DecodeCount - FFMAX(0, Start - DecodeStart)));
-
-		memcpy(DstBuf, DecodingBuffer + OffsetBytes, CopyBytes);
-		DstBuf += CopyBytes;
-
-		if (SizeConst)
-			RemainingSamples -= CopyBytes / SizeConst;
-
-	} while (RemainingSamples > 0 && CurrentAudioBlock < Frames.size());
-
-	return 0;
-}
-
-FFAudioSource::~FFAudioSource() {
-	Free(true);
-}
-
-void MatroskaAudioSource::Free(bool CloseCodec) {
-	if (CS)
-		cs_Destroy(CS);
-	if (MC.ST.fp) {
-		mkv_Close(MF);
-		fclose(MC.ST.fp);
-	}
-	if (CloseCodec)
-		avcodec_close(CodecContext);
-	av_free(CodecContext);
-}
-	
-MatroskaAudioSource::MatroskaAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize) {
-	CodecContext = NULL;
-	AVCodec *Codec = NULL;
-	TrackInfo *TI = NULL;
-	CS = NULL;
-	Frames = (*TrackIndices)[Track];
-
-	if (Frames.size() == 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Audio track contains no frames");
-		throw ErrorMsg;
-	}
-
-	MC.ST.fp = fopen(SourceFile, "rb");
-	if (MC.ST.fp == NULL) {
-		_snprintf(ErrorMsg, MsgSize, "Can't open '%s': %s", SourceFile, strerror(errno));
-		throw ErrorMsg;
-	}
-
-	setvbuf(MC.ST.fp, NULL, _IOFBF, CACHESIZE);
-
-	MF = mkv_OpenEx(&MC.ST.base, 0, 0, ErrorMessage, sizeof(ErrorMessage));
-	if (MF == NULL) {
-		fclose(MC.ST.fp);
-		_snprintf(ErrorMsg, MsgSize, "Can't parse Matroska file: %s", ErrorMessage);
-		throw ErrorMsg;
-	}
-
-	mkv_SetTrackMask(MF, ~(1 << Track));
-	TI = mkv_GetTrackInfo(MF, Track);
-
-	if (TI->CompEnabled) {
-		CS = cs_Create(MF, Track, ErrorMessage, sizeof(ErrorMessage));
-		if (CS == NULL) {
-			Free(false);
-			_snprintf(ErrorMsg, MsgSize, "Can't create decompressor: %s", ErrorMessage);
-			throw ErrorMsg;
-		}
-	}
-
-	CodecContext = avcodec_alloc_context();
-	CodecContext->extradata = (uint8_t *)TI->CodecPrivate;
-	CodecContext->extradata_size = TI->CodecPrivateSize;
-
-	Codec = avcodec_find_decoder(MatroskaToFFCodecID(TI->CodecID, TI->CodecPrivate));
-	if (Codec == NULL) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Video codec not found");
-		throw ErrorMsg;
-	}
-
-	if (avcodec_open(CodecContext, Codec) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Could not open video codec");
-		throw ErrorMsg;
-	}
-
-	// Always try to decode a frame to make sure all required parameters are known
-	uint8_t DummyBuf[512];
-	if (GetAudio(DummyBuf, 0, 1, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	AP.BitsPerSample = av_get_bits_per_sample_format(CodecContext->sample_fmt);
-	AP.Channels = CodecContext->channels;;
-	AP.Float = AudioFMTIsFloat(CodecContext->sample_fmt);
-	AP.SampleRate = CodecContext->sample_rate;
-	AP.NumSamples = (Frames.back()).SampleStart;
-
-	if (AP.SampleRate <= 0 || AP.BitsPerSample <= 0) {
-		Free(true);
-		_snprintf(ErrorMsg, MsgSize, "Codec returned zero size audio");
-		throw ErrorMsg;
-	}
-}
-
-MatroskaAudioSource::~MatroskaAudioSource() {
-	Free(true);
-}
-
-int MatroskaAudioSource::GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) {
-	const size_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8;
-	size_t CurrentAudioBlock = FFMAX((int64_t)FindClosestAudioKeyFrame(Start) - 10, (int64_t)0);
-	avcodec_flush_buffers(CodecContext);
-
-	memset(Buf, 0, SizeConst * Count);
-
-	uint8_t *DstBuf = (uint8_t *)Buf;
-	int64_t RemainingSamples = Count;
-	int64_t DecodeCount;
-
-	do {
-		int64_t DecodeStart = Frames[CurrentAudioBlock].SampleStart;
-		int Ret = DecodeNextAudioBlock(DecodingBuffer, &DecodeCount, Frames[CurrentAudioBlock].FilePos, Frames[CurrentAudioBlock].FrameSize, ErrorMsg, MsgSize);
-		if (Ret < 0) {
-			// FIXME
-			//Env->ThrowError("Bleh, bad audio decoding");
-		}
-		CurrentAudioBlock++;
-
-		int64_t OffsetBytes = SizeConst * FFMAX(0, Start - DecodeStart);
-		int64_t CopyBytes = FFMAX(0, SizeConst * FFMIN(RemainingSamples, DecodeCount - FFMAX(0, Start - DecodeStart)));
-
-		memcpy(DstBuf, DecodingBuffer + OffsetBytes, CopyBytes);
-		DstBuf += CopyBytes;
-
-		if (SizeConst)
-			RemainingSamples -= CopyBytes / SizeConst;
-
-	} while (RemainingSamples > 0 && CurrentAudioBlock < Frames.size());
-
-	return 0;
-}
-
-int MatroskaAudioSource::DecodeNextAudioBlock(uint8_t *Buf, int64_t *Count, uint64_t FilePos, unsigned int FrameSize, char *ErrorMsg, unsigned MsgSize) {
-	const size_t SizeConst = (av_get_bits_per_sample_format(CodecContext->sample_fmt) * CodecContext->channels) / 8;
-	int Ret = -1;
-	*Count = 0;
-
-	// FIXME check return
-	ReadFrame(FilePos, FrameSize, CS, MC, ErrorMsg, MsgSize);
-	int Size = FrameSize;
-	uint8_t *Data = MC.Buffer;
-
-	while (Size > 0) {
-		int TempOutputBufSize = AVCODEC_MAX_AUDIO_FRAME_SIZE;
-		Ret = avcodec_decode_audio2(CodecContext, (int16_t *)Buf, &TempOutputBufSize, Data, Size);
-
-		if (Ret < 0) // throw error or something?
-			goto Done;
-
-		if (Ret > 0) {
-			Size -= Ret;
-			Data += Ret;
-			Buf += TempOutputBufSize;
-			if (SizeConst)
-				*Count += TempOutputBufSize / SizeConst;
-		}
-	}
-
-Done:
-	return Ret;
-}

FFmpegSource2/ffaudiosource.h

@@ -1,80 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef FFAUDIOSOURCE_H
-#define FFAUDIOSOURCE_H
-
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-}
-
-#include <vector>
-#include "indexing.h"
-#include "utils.h"
-#include "ffms.h"
-
-class AudioBase {
-protected:
-	uint8_t *DecodingBuffer;
-	FrameInfoVector Frames;
-	AVCodecContext *CodecContext;
-	AudioProperties AP;
-
-	size_t FindClosestAudioKeyFrame(int64_t Sample);
-public:
-	AudioBase();
-	~AudioBase();
-
-	const AudioProperties& GetAudioProperties() { return AP; }
-	virtual int GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) = 0;
-};
-
-class FFAudioSource : public AudioBase {
-private:
-	AVFormatContext *FormatContext;
-	int AudioTrack;
-
-	int DecodeNextAudioBlock(uint8_t *Buf, int64_t *Count, char *ErrorMsg, unsigned MsgSize);
-	void Free(bool CloseCodec);
-public:
-	FFAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize);
-	~FFAudioSource();
-
-	int GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize);
-};
-
-class MatroskaAudioSource : public AudioBase {
-private:
-	MatroskaFile *MF;
-	MatroskaReaderContext MC;
-    CompressedStream *CS;
-	char ErrorMessage[256];
-
-	int DecodeNextAudioBlock(uint8_t *Buf, int64_t *Count, uint64_t FilePos, unsigned int FrameSize, char *ErrorMsg, unsigned MsgSize);
-	void Free(bool CloseCodec);
-public:
-	MatroskaAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize);
-	~MatroskaAudioSource();
-
-	int GetAudio(void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize);
-};
-
-#endif

FFmpegSource2/ffavisynth.cpp

@@ -1,190 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "ffavisynth.h"
-#include "utils.h"
-
-AvisynthVideoSource::AvisynthVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, int FPSNum, int FPSDen, const char *PP, int Threads, int SeekMode, IScriptEnvironment* Env, char *ErrorMsg, unsigned MsgSize) {
-	memset(&VI, 0, sizeof(VI));
-	SWS = NULL;
-	ConvertToFormat = PIX_FMT_NONE;
-	this->FPSNum = FPSNum;
-	this->FPSDen = FPSDen;
-
-	VS = FFMS_CreateVideoSource(SourceFile, Track, TrackIndices, PP, Threads, SeekMode, ErrorMsg, MsgSize);
-	if (!VS)
-		Env->ThrowError(ErrorMsg);
-
-	const VideoProperties VP = *FFMS_GetVideoProperties(VS);
-
-	VI.image_type = VideoInfo::IT_TFF;
-	VI.width = VP.Width;
-	VI.height = VP.Height;
-
-	if (FPSNum > 0 && FPSDen > 0) {
-		VI.fps_denominator = FPSDen;
-		VI.fps_numerator = FPSNum;
-		VI.num_frames = ceil(((VP.LastTime - VP.FirstTime) * FPSNum) / FPSDen);
-	} else {
-		VI.fps_denominator = VP.FPSDenominator;
-		VI.fps_numerator = VP.FPSNumerator;
-		VI.num_frames = VP.NumFrames;
-	}
-
-	try {
-		InitOutputFormat(VP.PixelFormat, Env);
-	} catch (AvisynthError &) {
-		FFMS_DestroyVideoSource(VS);
-		throw;
-	}
-
-	// Set AR variables
-	Env->SetVar("FFSAR_NUM", VP.SARNum);
-	Env->SetVar("FFSAR_DEN", VP.SARDen);
-	Env->SetVar("FFSAR", VP.SARNum / (double)VP.SARDen);
-
-	// Set crop variables
-	Env->SetVar("FFCROP_LEFT", VP.CropLeft);
-	Env->SetVar("FFCROP_RIGHT", VP.CropRight);
-	Env->SetVar("FFCROP_TOP", VP.CropTop);
-	Env->SetVar("FFCROP_BOTTOM", VP.CropBottom);
-}
-
-AvisynthVideoSource::~AvisynthVideoSource() {
-	if (SWS)
-		sws_freeContext(SWS);
-	FFMS_DestroyVideoSource(VS);
-}
-
-void AvisynthVideoSource::InitOutputFormat(int CurrentFormat, IScriptEnvironment *Env) {
-	int Loss;
-	int BestFormat = avcodec_find_best_pix_fmt((1 << PIX_FMT_YUVJ420P) | (1 << PIX_FMT_YUV420P) | (1 << PIX_FMT_YUYV422) | (1 << PIX_FMT_RGB32) | (1 << PIX_FMT_BGR24), CurrentFormat, 1 /* Required to prevent pointless RGB32 => RGB24 conversion */, &Loss);
-
-	switch (BestFormat) {
-		case PIX_FMT_YUVJ420P: // stupid yv12 distinctions, also inexplicably completely undeniably incompatible with all other supported output formats
-		case PIX_FMT_YUV420P: VI.pixel_type = VideoInfo::CS_I420; break;
-		case PIX_FMT_YUYV422: VI.pixel_type = VideoInfo::CS_YUY2; break;
-		case PIX_FMT_RGB32: VI.pixel_type = VideoInfo::CS_BGR32; break;
-		case PIX_FMT_BGR24: VI.pixel_type = VideoInfo::CS_BGR24; break;
-		default:
-			Env->ThrowError("FFVideoSource: No suitable output format found");
-	}
-
-	if (BestFormat != CurrentFormat) {
-		ConvertToFormat = BestFormat;
-		SWS = sws_getContext(VI.width, VI.height, CurrentFormat, VI.width, VI.height, ConvertToFormat, GetCPUFlags() | SWS_BICUBIC, NULL, NULL, NULL);
-	}
-
-	if (BestFormat == PIX_FMT_YUVJ420P || BestFormat == PIX_FMT_YUV420P) {
-		VI.height -= VI.height & 1;
-		VI.width -= VI.width & 1;
-	}
-
-	if (BestFormat == PIX_FMT_YUYV422) {
-		VI.width -= VI.width & 1;
-	}
-}
-
-PVideoFrame AvisynthVideoSource::OutputFrame(const AVFrameLite *Frame, IScriptEnvironment *Env) {
-	// Yes, this function is overly complex and could probably be simplified
-	AVPicture *SrcPicture = reinterpret_cast<AVPicture *>(const_cast<AVFrameLite *>(Frame));
-	PVideoFrame Dst = Env->NewVideoFrame(VI);
-
-	if (ConvertToFormat != PIX_FMT_NONE && VI.pixel_type == VideoInfo::CS_I420) {
-		uint8_t *DstData[3] = {Dst->GetWritePtr(PLANAR_Y), Dst->GetWritePtr(PLANAR_U), Dst->GetWritePtr(PLANAR_V)};
-		int DstStride[3] = {Dst->GetPitch(PLANAR_Y), Dst->GetPitch(PLANAR_U), Dst->GetPitch(PLANAR_V)};
-		sws_scale(SWS, SrcPicture->data, SrcPicture->linesize, 0, VI.height, DstData, DstStride);
-	} else if (ConvertToFormat != PIX_FMT_NONE) {
-		if (VI.IsRGB()) {
-			uint8_t *DstData[1] = {Dst->GetWritePtr() + Dst->GetPitch() * (Dst->GetHeight() - 1)};
-			int DstStride[1] = {-Dst->GetPitch()};
-			sws_scale(SWS, SrcPicture->data, SrcPicture->linesize, 0, VI.height, DstData, DstStride);
-		} else {
-			uint8_t *DstData[1] = {Dst->GetWritePtr()};
-			int DstStride[1] = {Dst->GetPitch()};
-			sws_scale(SWS, SrcPicture->data, SrcPicture->linesize, 0, VI.height, DstData, DstStride);
-		}
-	} else if (VI.pixel_type == VideoInfo::CS_I420) {
-		Env->BitBlt(Dst->GetWritePtr(PLANAR_Y), Dst->GetPitch(PLANAR_Y), SrcPicture->data[0], SrcPicture->linesize[0], Dst->GetRowSize(PLANAR_Y), Dst->GetHeight(PLANAR_Y)); 
-		Env->BitBlt(Dst->GetWritePtr(PLANAR_U), Dst->GetPitch(PLANAR_U), SrcPicture->data[1], SrcPicture->linesize[1], Dst->GetRowSize(PLANAR_U), Dst->GetHeight(PLANAR_U)); 
-		Env->BitBlt(Dst->GetWritePtr(PLANAR_V), Dst->GetPitch(PLANAR_V), SrcPicture->data[2], SrcPicture->linesize[2], Dst->GetRowSize(PLANAR_V), Dst->GetHeight(PLANAR_V)); 
-	} else {
-		if (VI.IsRGB())
-			Env->BitBlt(Dst->GetWritePtr() + Dst->GetPitch() * (Dst->GetHeight() - 1), -Dst->GetPitch(), SrcPicture->data[0], SrcPicture->linesize[0], Dst->GetRowSize(), Dst->GetHeight()); 
-		else
-			Env->BitBlt(Dst->GetWritePtr(), Dst->GetPitch(), SrcPicture->data[0], SrcPicture->linesize[0], Dst->GetRowSize(), Dst->GetHeight()); 
-	}
-
-	return Dst;
-}
-
-PVideoFrame AvisynthVideoSource::GetFrame(int n, IScriptEnvironment *Env) {
-	char ErrorMsg[1024];
-	unsigned MsgSize = sizeof(ErrorMsg);
-	const AVFrameLite *Frame;
-
-	if (FPSNum > 0 && FPSDen > 0)
-		Frame = FFMS_GetFrameByTime(VS, FFMS_GetVideoProperties(VS)->FirstTime + (double)(n * (int64_t)FPSDen) / FPSNum, ErrorMsg, MsgSize);
-	else
-		Frame = FFMS_GetFrame(VS, n, ErrorMsg, MsgSize);
-
-	if (Frame == NULL)
-		Env->ThrowError("FFVideoSource: %s", ErrorMsg);
-
-	Env->SetVar("FFPICT_TYPE", Frame->PictType);
-	return OutputFrame(Frame, Env);
-}
-
-AvisynthAudioSource::AvisynthAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, IScriptEnvironment* Env, char *ErrorMsg, unsigned MsgSize) {
-	memset(&VI, 0, sizeof(VI));
-
-	AS = FFMS_CreateAudioSource(SourceFile, Track, TrackIndices, ErrorMsg, MsgSize);
-	if (!AS)
-		Env->ThrowError(ErrorMsg);
-
-	const AudioProperties AP = *FFMS_GetAudioProperties(AS);
-
-	VI.nchannels = AP.Channels;
-	VI.num_audio_samples = AP.NumSamples;
-	VI.audio_samples_per_second = AP.SampleRate;
-
-	if (AP.Float && AP.BitsPerSample == 32) {
-		VI.sample_type = SAMPLE_FLOAT;
-	} else {
-		switch (AP.BitsPerSample) {
-			case 8: VI.sample_type = SAMPLE_INT8; break;
-			case 16: VI.sample_type = SAMPLE_INT16; break;
-			case 24: VI.sample_type = SAMPLE_INT24; break;
-			case 32: VI.sample_type = SAMPLE_INT32; break;
-			default: Env->ThrowError("FFAudioSource: Bad audio format");
-		}
-	}
-}
-
-AvisynthAudioSource::~AvisynthAudioSource() {
-	FFMS_DestroyAudioSource(AS);
-}
-
-void AvisynthAudioSource::GetAudio(void* Buf, __int64 Start, __int64 Count, IScriptEnvironment *Env) {
-	char ErrorMsg[1024];
-	unsigned MsgSize = sizeof(ErrorMsg);
-	if (FFMS_GetAudio(AS, Buf, Start, Count, ErrorMsg, MsgSize))
-		Env->ThrowError(ErrorMsg);
-}

FFmpegSource2/ffavisynth.h

@@ -1,70 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef FFAVISYNTH_H
-#define FFAVISYNTH_H
-
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-#include <libswscale/swscale.h>
-#include <libpostproc/postprocess.h>
-}
-
-#include <windows.h>
-#include "avisynth.h"
-#include "ffms.h"
-
-class AvisynthVideoSource : public IClip {
-private:
-	VideoInfo VI;
-	VideoBase *VS;
-	SwsContext *SWS;
-	int ConvertToFormat;
-	int FPSNum;
-	int FPSDen;
-
-	void InitOutputFormat(int CurrentFormat, IScriptEnvironment *Env);
-	PVideoFrame OutputFrame(const AVFrameLite *SrcPicture, IScriptEnvironment *Env);
-public:
-	AvisynthVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, int FPSNum, int FPSDen, const char *PP, int Threads, int SeekMode, IScriptEnvironment* Env, char *ErrorMsg, unsigned MsgSize);
-	~AvisynthVideoSource();
-	bool __stdcall GetParity(int n) { return false; }
-	void __stdcall SetCacheHints(int cachehints, int frame_range) { }
-	const VideoInfo& __stdcall GetVideoInfo() { return VI; }
-	void __stdcall GetAudio(void* Buf, __int64 Start, __int64 Count, IScriptEnvironment *Env) { }
-	PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment *Env);
-};
-
-class AvisynthAudioSource : public IClip {
-private:
-	VideoInfo VI;
-	AudioBase *AS;
-public:
-	AvisynthAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, IScriptEnvironment* Env, char *ErrorMsg, unsigned MsgSize);
-	~AvisynthAudioSource();
-	bool __stdcall GetParity(int n) { return false; }
-	void __stdcall SetCacheHints(int cachehints, int frame_range) { }
-	const VideoInfo& __stdcall GetVideoInfo() { return VI; }
-	void __stdcall GetAudio(void* Buf, __int64 Start, __int64 Count, IScriptEnvironment *Env);
-	PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment *Env) { return NULL; };
-};
-
-#endif

FFmpegSource2/ffavsfilters.cpp

@@ -1,236 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include <string>
-#include "ffms.h"
-#include "ffavisynth.h"
-#include "ffswscale.h"
-#include "ffpp.h"
-
-int GetNumberOfLogicalCPUs() {
-	SYSTEM_INFO SI;
-	GetSystemInfo(&SI);
-	return SI.dwNumberOfProcessors;
-}
-
-AVSValue __cdecl CreateFFIndex(AVSValue Args, void* UserData, IScriptEnvironment* Env) {
-	FFMS_Init();
-
-	char ErrorMsg[1024];
-	unsigned MsgSize = sizeof(ErrorMsg);
-
-
-	if (!Args[0].Defined())
-    	Env->ThrowError("FFIndex: No source specified");
-
-	const char *Source = Args[0].AsString();
-	const char *CacheFile = Args[1].AsString("");
-	int IndexMask = Args[2].AsInt(0);
-	int DumpMask = Args[3].AsInt(0);
-	const char *AudioFile = Args[4].AsString("");
-	bool OverWrite = Args[5].AsBool(false);
-
-	std::string DefaultCache(Source);
-	DefaultCache.append(".ffindex");
-	if (!strcmp(CacheFile, ""))
-		CacheFile = DefaultCache.c_str();
-
-	if (!strcmp(AudioFile, ""))
-		AudioFile = Source;
-
-	// Return values
-	// 0: Index already present
-	// 1: Index generated
-	// 2: Index forced to be overwritten
-
-	FrameIndex *Index = NULL;
-	if (OverWrite || !(Index = FFMS_ReadIndex(CacheFile, ErrorMsg, MsgSize))) {
-		if (!(Index = FFMS_MakeIndex(Source, IndexMask, DumpMask, AudioFile, true, NULL, NULL, ErrorMsg, MsgSize)))
-			Env->ThrowError("FFIndex: %s", ErrorMsg);
-		if (FFMS_WriteIndex(CacheFile, Index, ErrorMsg, MsgSize)) {
-			FFMS_DestroyFrameIndex(Index);
-			Env->ThrowError("FFIndex: %s", ErrorMsg);
-		}
-		FFMS_DestroyFrameIndex(Index);
-		if (!OverWrite)
-			return AVSValue(1);
-		else
-			return AVSValue(2);
-	} else {
-		FFMS_DestroyFrameIndex(Index);
-		return AVSValue(0);
-	}
-}
-
-AVSValue __cdecl CreateFFVideoSource(AVSValue Args, void* UserData, IScriptEnvironment* Env) {
-	FFMS_Init();
-
-	char ErrorMsg[1024];
-	unsigned MsgSize = sizeof(ErrorMsg);
-
-	if (!Args[0].Defined())
-    	Env->ThrowError("FFVideoSource: No source specified");
-
-	const char *Source = Args[0].AsString();
-	int Track = Args[1].AsInt(-1);
-	bool Cache = Args[2].AsBool(true);
-	const char *CacheFile = Args[3].AsString("");
-	int FPSNum = Args[4].AsInt(-1);
-	int FPSDen = Args[5].AsInt(1);
-	const char *PP = Args[6].AsString("");
-	int Threads = Args[7].AsInt(-1);
-	const char *Timecodes = Args[8].AsString("");
-	int SeekMode = Args[9].AsInt(1);
-
-	if (Track <= -2)
-		Env->ThrowError("FFVideoSource: No video track selected");
-
-	if (SeekMode < -1 || SeekMode > 3)
-		Env->ThrowError("FFVideoSource: Invalid seekmode selected");
-
-	if (Threads <= 0) 
-		Threads = GetNumberOfLogicalCPUs();
-	if (Threads < 1)
-		Env->ThrowError("FFVideoSource: Invalid thread count");
-
-	if (!_stricmp(Source, Timecodes))
-		Env->ThrowError("FFVideoSource: Timecodes will overwrite the source");
-
-	std::string DefaultCache(Source);
-	DefaultCache.append(".ffindex");
-	if (!strcmp(CacheFile, ""))
-		CacheFile = DefaultCache.c_str();
-
-	FrameIndex *Index = NULL;
-	if (Cache)
-		Index = FFMS_ReadIndex(CacheFile, ErrorMsg, MsgSize);
-	if (!Index) {
-		if (!(Index = FFMS_MakeIndex(Source, 0, 0, NULL, true, NULL, NULL, ErrorMsg, MsgSize)))
-			Env->ThrowError("FFVideoSource: %s", ErrorMsg);
-
-		if (Cache)
-			if (FFMS_WriteIndex(CacheFile, Index, ErrorMsg, MsgSize)) {
-				FFMS_DestroyFrameIndex(Index);
-				Env->ThrowError("FFVideoSource: %s", ErrorMsg);
-			}
-	}
-
-	if (Track == -1)
-		Track = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_VIDEO, ErrorMsg, MsgSize);
-	if (Track < 0)
-		Env->ThrowError("FFVideoSource: No video track found");
-
-	if (strcmp(Timecodes, "")) {
-		if (FFMS_WriteTimecodes(FFMS_GetTITrackIndex(Index, Track, ErrorMsg, MsgSize), Timecodes, ErrorMsg, MsgSize)) {
-			FFMS_DestroyFrameIndex(Index);
-			Env->ThrowError("FFVideoSource: %s", ErrorMsg);
-		}
-	}
-
-	AvisynthVideoSource *Filter;
-
-	try {
-		Filter = new AvisynthVideoSource(Source, Track, Index, FPSNum, FPSDen, PP, Threads, SeekMode, Env, ErrorMsg, MsgSize);
-	} catch (...) {
-		FFMS_DestroyFrameIndex(Index);	
-		throw;
-	}
-
-	FFMS_DestroyFrameIndex(Index);
-	return Filter;
-}
-
-AVSValue __cdecl CreateFFAudioSource(AVSValue Args, void* UserData, IScriptEnvironment* Env) {
-	FFMS_Init();
-
-	char ErrorMsg[1024];
-	unsigned MsgSize = sizeof(ErrorMsg);
-
-	if (!Args[0].Defined())
-    	Env->ThrowError("FFAudioSource: No source specified");
-
-	const char *Source = Args[0].AsString();
-	int Track = Args[1].AsInt(-1);
-	bool Cache = Args[2].AsBool(true);
-	const char *CacheFile = Args[3].AsString("");
-
-	if (Track <= -2)
-		Env->ThrowError("FFAudioSource: No audio track selected");
-
-	std::string DefaultCache(Source);
-	DefaultCache.append(".ffindex");
-	if (!strcmp(CacheFile, ""))
-		CacheFile = DefaultCache.c_str();
-
-	FrameIndex *Index = NULL;
-	if (Cache)
-		Index = FFMS_ReadIndex(CacheFile, ErrorMsg, MsgSize);
-	if (!Index) {
-		if (!(Index = FFMS_MakeIndex(Source, -1, 0, CacheFile, true, NULL, NULL, ErrorMsg, MsgSize)))
-			Env->ThrowError("FFAudioSource: %s", ErrorMsg);
-
-		if (Cache)
-			if (FFMS_WriteIndex(CacheFile, Index, ErrorMsg, MsgSize)) {
-				FFMS_DestroyFrameIndex(Index);
-				Env->ThrowError("FFAudioSource: %s", ErrorMsg);
-			}
-	}
-
-	if (Track == -1)
-		Track = FFMS_GetFirstTrackOfType(Index, FFMS_TYPE_AUDIO, ErrorMsg, MsgSize);
-	if (Track < 0)
-		Env->ThrowError("FFAudioSource: No audio track found");
-
-	AvisynthAudioSource *Filter;
-
-	try {
-		Filter = new AvisynthAudioSource(Source, Track, Index, Env, ErrorMsg, MsgSize);
-	} catch (...) {
-		FFMS_DestroyFrameIndex(Index);	
-		throw;
-	}
-
-	FFMS_DestroyFrameIndex(Index);
-	return Filter;
-}
-
-AVSValue __cdecl CreateFFPP(AVSValue Args, void* UserData, IScriptEnvironment* Env) {
-	return new FFPP(Args[0].AsClip(), Args[1].AsString(""), Env);
-}
-
-AVSValue __cdecl CreateSWScale(AVSValue Args, void* UserData, IScriptEnvironment* Env) {
-	return new SWScale(Args[0].AsClip(), Args[1].AsInt(0), Args[2].AsInt(0), Args[3].AsString("BICUBIC"), Args[4].AsString(""), Env);
-}
-
-AVSValue __cdecl FFNoLog(AVSValue Args, void* UserData, IScriptEnvironment* Env) {
-	FFMS_NoLog();
-	return 0;
-}
-
-extern "C" __declspec(dllexport) const char* __stdcall AvisynthPluginInit2(IScriptEnvironment* Env) {
-    Env->AddFunction("FFIndex", "[source]s[cachefile]s[indexmask]i[dumpmask]i[audiofile]s[overwrite]b", CreateFFIndex, 0);
-	Env->AddFunction("FFVideoSource", "[source]s[track]i[cache]b[cachefile]s[fpsnum]i[fpsden]i[pp]s[threads]i[timecodes]s[seekmode]i", CreateFFVideoSource, 0);
-    Env->AddFunction("FFAudioSource", "[source]s[track]i[cache]b[cachefile]s", CreateFFAudioSource, 0);
-	Env->AddFunction("FFPP", "c[pp]s", CreateFFPP, 0);
-	Env->AddFunction("SWScale", "c[width]i[height]i[resizer]s[colorspace]s", CreateSWScale, 0);
-	Env->AddFunction("FFNoLog", "", FFNoLog, 0);
-
-    return "FFmpegSource - The Second Coming";
-}

FFmpegSource2/ffms.cpp

@@ -1,214 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "ffms.h"
-#include "ffvideosource.h"
-#include "ffaudiosource.h"
-#include "indexing.h"
-
-#ifdef __UNIX__
-#define _snprintf snprintf
-#endif
-
-FrameInfo::FrameInfo(int64_t DTS, bool KeyFrame) {
-	this->DTS = DTS;
-	this->SampleStart = 0;
-	this->FilePos = 0;
-	this->FrameSize = 0;
-	this->KeyFrame = KeyFrame;
-}
-
-FrameInfo::FrameInfo(int64_t DTS, int64_t SampleStart, bool KeyFrame) {
-	this->DTS = DTS;
-	this->SampleStart = SampleStart;
-	this->FilePos = 0;
-	this->FrameSize = 0;
-	this->KeyFrame = KeyFrame;
-}
-
-FrameInfo::FrameInfo(int64_t SampleStart, int64_t FilePos, unsigned int FrameSize, bool KeyFrame) {
-	this->DTS = 0;
-	this->SampleStart = SampleStart;
-	this->FilePos = FilePos;
-	this->FrameSize = FrameSize;
-	this->KeyFrame = KeyFrame;
-}
-
-FFMS_API(void) FFMS_Init() {
-	static bool InitDone = false;
-	if (!InitDone)
-		av_register_all();
-	InitDone = true;
-}
-
-FFMS_API(void) FFMS_NoLog() {
-	av_log_set_level(AV_LOG_QUIET);
-}
-
-FFMS_API(VideoBase *) FFMS_CreateVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, const char *PP, int Threads, int SeekMode, char *ErrorMsg, unsigned MsgSize) {
-	try {
-		switch (TrackIndices->Decoder) {
-			case 0: return new FFVideoSource(SourceFile, Track, TrackIndices, PP, Threads, SeekMode, ErrorMsg, MsgSize);
-			case 1: return new MatroskaVideoSource(SourceFile, Track, TrackIndices, PP, Threads, ErrorMsg, MsgSize);
-#ifdef HAALITS
-			case 2: return new HaaliTSVideoSource(SourceFile, Track, TrackIndices, PP, Threads, ErrorMsg, MsgSize);
-#endif
-			default: 
-				_snprintf(ErrorMsg, MsgSize, "Unsupported format");
-				return NULL;
-		}
-	} catch (...) {
-		return NULL;
-	}
-}
-
-FFMS_API(AudioBase *) FFMS_CreateAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize) {
-	try {
-		switch (TrackIndices->Decoder) {
-			case 0: return new FFAudioSource(SourceFile, Track, TrackIndices, ErrorMsg, MsgSize);
-			case 1: return new MatroskaAudioSource(SourceFile, Track, TrackIndices, ErrorMsg, MsgSize);
-			default: 
-				_snprintf(ErrorMsg, MsgSize, "Unsupported format");
-				return NULL;
-		}
-	} catch (...) {
-		return NULL;
-	}
-}
-
-FFMS_API(void) FFMS_DestroyVideoSource(VideoBase *VB) {
-	delete VB;
-}
-
-FFMS_API(void) FFMS_DestroyAudioSource(AudioBase *AB) {
-	delete AB;
-}
-
-FFMS_API(const VideoProperties *) FFMS_GetVideoProperties(VideoBase *VB) {
-	return &VB->GetVideoProperties();
-}
-
-FFMS_API(const AudioProperties *) FFMS_GetAudioProperties(AudioBase *AB) {
-	return &AB->GetAudioProperties();
-}
-
-FFMS_API(const AVFrameLite *) FFMS_GetFrame(VideoBase *VB, int n, char *ErrorMsg, unsigned MsgSize) {
-	return (AVFrameLite *)VB->GetFrame(n, ErrorMsg, MsgSize);
-}
-
-FFMS_API(const AVFrameLite *) FFMS_GetFrameByTime(VideoBase *VB, double Time, char *ErrorMsg, unsigned MsgSize) {
-	return (AVFrameLite *)VB->GetFrameByTime(Time, ErrorMsg, MsgSize);
-}
-
-FFMS_API(int) FFMS_GetAudio(AudioBase *AB, void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize) {
-	return AB->GetAudio(Buf, Start, Count, ErrorMsg, MsgSize);
-}
-
-FFMS_API(int) FFMS_SetOutputFormat(VideoBase *VB, int TargetFormat, int Width, int Height, char *ErrorMsg, unsigned MsgSize) {
-	return VB->SetOutputFormat(TargetFormat, Width, Height, ErrorMsg, MsgSize);
-}
-
-FFMS_API(void) FFMS_ResetOutputFormat(VideoBase *VB) {
-	VB->ResetOutputFormat();
-}
-
-FFMS_API(void) FFMS_DestroyFrameIndex(FrameIndex *FI) {
-	delete FI;
-}
-
-FFMS_API(int) FFMS_GetFirstTrackOfType(FrameIndex *TrackIndices, int TrackType, char *ErrorMsg, unsigned MsgSize) {
-	for (int i = 0; i < TrackIndices->size(); i++)
-		if ((*TrackIndices)[i].TT == TrackType)
-			return i;
-	_snprintf(ErrorMsg, MsgSize, "No suitable track found");
-	return -1;
-}
-
-FFMS_API(int) FFMS_GetNumTracks(FrameIndex *TrackIndices) {
-	return TrackIndices->size();
-}
-
-FFMS_API(int) FFMS_GetTrackType(FrameInfoVector *FIV) {
-	return FIV->TT;
-}
-
-FFMS_API(int) FFMS_GetNumFrames(FrameInfoVector *FIV) {
-	return FIV->size();
-}
-
-FFMS_API(const FrameInfo *) FFMS_GetFrameInfo(FrameInfoVector *FIV, int Frame, char *ErrorMsg, unsigned MsgSize) {
-	if (Frame < 0 || Frame >= FIV->size()) {
-		_snprintf(ErrorMsg, MsgSize, "Invalid frame specified");
-		return NULL;
-	} else {
-		return &(*FIV)[Frame];
-	}	
-}
-
-FFMS_API(FrameInfoVector *) FFMS_GetTITrackIndex(FrameIndex *TrackIndices, int Track, char *ErrorMsg, unsigned MsgSize) {
-	if (Track < 0 || Track >= TrackIndices->size()) {
-		_snprintf(ErrorMsg, MsgSize, "Invalid track specified");
-		return NULL;
-	} else {
-		return &(*TrackIndices)[Track];
-	}	
-}
-
-FFMS_API(FrameInfoVector *) FFMS_GetVSTrackIndex(VideoBase *VB) {
-	return VB->GetFrameInfoVector();
-}
-
-FFMS_API(int) FFMS_FindClosestKeyFrame(FrameInfoVector *FIV, int Frame, char *ErrorMsg, unsigned MsgSize) {
-	if (Frame < 0 || Frame >= FIV->size()) {
-		_snprintf(ErrorMsg, MsgSize, "Out of range frame specified");
-		return -1;
-	} else {
-		return FIV->FindClosestKeyFrame(Frame);
-	}
-}
-
-FFMS_API(int) FFMS_FrameFromDTS(FrameInfoVector *FIV, int64_t DTS) {
-	return FIV->FrameFromDTS(DTS);
-}
-
-FFMS_API(int) FFMS_ClosestFrameFromDTS(FrameInfoVector *FIV, int64_t DTS) {
-	return FIV->ClosestFrameFromDTS(DTS);
-}
-
-FFMS_API(const TrackTimeBase *) FFMS_GetTimeBase(FrameInfoVector *FIV) {
-	return &FIV->TB;
-}
-
-FFMS_API(int) FFMS_WriteTimecodes(FrameInfoVector *FIV, const char *TimecodeFile, char *ErrorMsg, unsigned MsgSize) {
-	return FIV->WriteTimecodes(TimecodeFile, ErrorMsg, MsgSize);
-}
-
-FFMS_API(FrameIndex *) FFMS_MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize) {
-	return MakeIndex(SourceFile, IndexMask, DumpMask, AudioFile, IgnoreDecodeErrors, IP, Private, ErrorMsg, MsgSize);
-}
-
-FFMS_API(FrameIndex *) FFMS_ReadIndex(const char *IndexFile, char *ErrorMsg, unsigned MsgSize) {
-	return ReadIndex(IndexFile, ErrorMsg, MsgSize);
-}
-
-FFMS_API(int) FFMS_WriteIndex(const char *IndexFile, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize) {
-	return WriteIndex(IndexFile, TrackIndices, ErrorMsg, MsgSize);
-}
-

FFmpegSource2/ffms.h

@@ -1,193 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef FFMS_H
-#define FFMS_H
-
-#include <stdint.h>
-
-#define FFMS_EXPORTS
-
-#ifdef __cplusplus
-#	define EXTERN_C extern "C"
-#else
-#	define EXTERN_C
-#endif
-
-#ifdef _WIN32
-#	define FFMS_CC __stdcall
-#	ifdef FFMS_EXPORTS
-#		define FFMS_API(ret) EXTERN_C __declspec(dllexport) ret FFMS_CC
-#	else
-#		define FFMS_API(ret) EXTERN_C __declspec(dllimport) ret FFMS_CC
-#	endif
-#else
-#	define FFMS_CC
-#	define FFMS_API(ret) EXTERN_C ret FFMS_CC
-#endif
-
-class VideoBase;
-class AudioBase;
-class FrameIndex;
-class FrameInfoVector;
-
-typedef int (FFMS_CC *IndexCallback)(int State, int64_t Current, int64_t Total, void *Private);
-
-enum TrackType {
-	FFMS_TYPE_VIDEO = 0,
-    FFMS_TYPE_AUDIO = 1,
-};
-
-// PixelFormat declarations from avutil.h so external libraries don't necessarily have to include ffmpeg headers
-enum FFMS_PixelFormat {
-    FFMS_PIX_FMT_NONE= -1,
-    FFMS_PIX_FMT_YUV420P,   ///< Planar YUV 4:2:0, 12bpp, (1 Cr & Cb sample per 2x2 Y samples)
-    FFMS_PIX_FMT_YUYV422,   ///< Packed YUV 4:2:2, 16bpp, Y0 Cb Y1 Cr
-    FFMS_PIX_FMT_RGB24,     ///< Packed RGB 8:8:8, 24bpp, RGBRGB...
-    FFMS_PIX_FMT_BGR24,     ///< Packed RGB 8:8:8, 24bpp, BGRBGR...
-    FFMS_PIX_FMT_YUV422P,   ///< Planar YUV 4:2:2, 16bpp, (1 Cr & Cb sample per 2x1 Y samples)
-    FFMS_PIX_FMT_YUV444P,   ///< Planar YUV 4:4:4, 24bpp, (1 Cr & Cb sample per 1x1 Y samples)
-    FFMS_PIX_FMT_RGB32,     ///< Packed RGB 8:8:8, 32bpp, (msb)8A 8R 8G 8B(lsb), in cpu endianness
-    FFMS_PIX_FMT_YUV410P,   ///< Planar YUV 4:1:0,  9bpp, (1 Cr & Cb sample per 4x4 Y samples)
-    FFMS_PIX_FMT_YUV411P,   ///< Planar YUV 4:1:1, 12bpp, (1 Cr & Cb sample per 4x1 Y samples)
-    FFMS_PIX_FMT_RGB565,    ///< Packed RGB 5:6:5, 16bpp, (msb)   5R 6G 5B(lsb), in cpu endianness
-    FFMS_PIX_FMT_RGB555,    ///< Packed RGB 5:5:5, 16bpp, (msb)1A 5R 5G 5B(lsb), in cpu endianness most significant bit to 0
-    FFMS_PIX_FMT_GRAY8,     ///<        Y        ,  8bpp
-    FFMS_PIX_FMT_MONOWHITE, ///<        Y        ,  1bpp, 0 is white, 1 is black
-    FFMS_PIX_FMT_MONOBLACK, ///<        Y        ,  1bpp, 0 is black, 1 is white
-    FFMS_PIX_FMT_PAL8,      ///< 8 bit with PIX_FMT_RGB32 palette
-    FFMS_PIX_FMT_YUVJ420P,  ///< Planar YUV 4:2:0, 12bpp, full scale (jpeg)
-    FFMS_PIX_FMT_YUVJ422P,  ///< Planar YUV 4:2:2, 16bpp, full scale (jpeg)
-    FFMS_PIX_FMT_YUVJ444P,  ///< Planar YUV 4:4:4, 24bpp, full scale (jpeg)
-    FFMS_PIX_FMT_XVMC_MPEG2_MC,///< XVideo Motion Acceleration via common packet passing(xvmc_render.h)
-    FFMS_PIX_FMT_XVMC_MPEG2_IDCT,
-    FFMS_PIX_FMT_UYVY422,   ///< Packed YUV 4:2:2, 16bpp, Cb Y0 Cr Y1
-    FFMS_PIX_FMT_UYYVYY411, ///< Packed YUV 4:1:1, 12bpp, Cb Y0 Y1 Cr Y2 Y3
-    FFMS_PIX_FMT_BGR32,     ///< Packed RGB 8:8:8, 32bpp, (msb)8A 8B 8G 8R(lsb), in cpu endianness
-    FFMS_PIX_FMT_BGR565,    ///< Packed RGB 5:6:5, 16bpp, (msb)   5B 6G 5R(lsb), in cpu endianness
-    FFMS_PIX_FMT_BGR555,    ///< Packed RGB 5:5:5, 16bpp, (msb)1A 5B 5G 5R(lsb), in cpu endianness most significant bit to 1
-    FFMS_PIX_FMT_BGR8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2B 3G 3R(lsb)
-    FFMS_PIX_FMT_BGR4,      ///< Packed RGB 1:2:1,  4bpp, (msb)1B 2G 1R(lsb)
-    FFMS_PIX_FMT_BGR4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)1B 2G 1R(lsb)
-    FFMS_PIX_FMT_RGB8,      ///< Packed RGB 3:3:2,  8bpp, (msb)2R 3G 3B(lsb)
-    FFMS_PIX_FMT_RGB4,      ///< Packed RGB 1:2:1,  4bpp, (msb)2R 3G 3B(lsb)
-    FFMS_PIX_FMT_RGB4_BYTE, ///< Packed RGB 1:2:1,  8bpp, (msb)2R 3G 3B(lsb)
-    FFMS_PIX_FMT_NV12,      ///< Planar YUV 4:2:0, 12bpp, 1 plane for Y and 1 for UV
-    FFMS_PIX_FMT_NV21,      ///< as above, but U and V bytes are swapped
-
-    FFMS_PIX_FMT_RGB32_1,   ///< Packed RGB 8:8:8, 32bpp, (msb)8R 8G 8B 8A(lsb), in cpu endianness
-    FFMS_PIX_FMT_BGR32_1,   ///< Packed RGB 8:8:8, 32bpp, (msb)8B 8G 8R 8A(lsb), in cpu endianness
-
-    FFMS_PIX_FMT_GRAY16BE,  ///<        Y        , 16bpp, big-endian
-    FFMS_PIX_FMT_GRAY16LE,  ///<        Y        , 16bpp, little-endian
-    FFMS_PIX_FMT_YUV440P,   ///< Planar YUV 4:4:0 (1 Cr & Cb sample per 1x2 Y samples)
-    FFMS_PIX_FMT_YUVJ440P,  ///< Planar YUV 4:4:0 full scale (jpeg)
-    FFMS_PIX_FMT_YUVA420P,  ///< Planar YUV 4:2:0, 20bpp, (1 Cr & Cb sample per 2x2 Y & A samples)
-};
-
-// This is a subset of the original AVFrame only containing the most used parts.
-// Even if it might seem like a good idea to cast it back to a full AVFrame to
-// access a few more values you really shouldn't do that. Only the values present
-// in AVFrameLite are actually updated when postprocessing is used.
-
-struct AVFrameLite {
-    uint8_t *Data[4];
-    int Linesize[4];
-    uint8_t *Base[4];
-    int KeyFrame;
-    int PictType;
-};
-
-struct TrackTimeBase {
-	int Num;
-	int Den;
-};
-
-class FrameInfo {
-public:
-	int64_t DTS;
-	int64_t SampleStart;
-	int64_t FilePos;
-	unsigned int FrameSize;
-	bool KeyFrame;
-	FrameInfo(int64_t DTS, bool KeyFrame);
-	FrameInfo(int64_t DTS, int64_t SampleStart, bool KeyFrame);
-	FrameInfo(int64_t SampleStart, int64_t FilePos, unsigned int FrameSize, bool KeyFrame);
-};
-
-struct VideoProperties {
-	int Width;
-	int Height;
-	int FPSDenominator;
-	int FPSNumerator;
-	int NumFrames;
-	int PixelFormat;
-	int SARNum;
-	int SARDen;
-	int CropTop;
-	int CropBottom;
-	int CropLeft;
-	int CropRight;
-	double FirstTime;
-	double LastTime;
-};
-
-struct AudioProperties {
-	int SampleRate;
-	int Channels;
-	int BitsPerSample;
-	bool Float;
-	int64_t NumSamples;
-};
-
-// Most functions return 0 on success
-// Functions without error message output can be assumed to never fail
-FFMS_API(void) FFMS_Init();
-FFMS_API(void) FFMS_NoLog();
-FFMS_API(VideoBase *) FFMS_CreateVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, const char *PP, int Threads, int SeekMode, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(AudioBase *) FFMS_CreateAudioSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(void) FFMS_DestroyVideoSource(VideoBase *VB);
-FFMS_API(void) FFMS_DestroyAudioSource(AudioBase *AB);
-FFMS_API(const VideoProperties *) FFMS_GetVideoProperties(VideoBase *VB);
-FFMS_API(const AudioProperties *) FFMS_GetAudioProperties(AudioBase *AB);
-FFMS_API(const AVFrameLite *) FFMS_GetFrame(VideoBase *VB, int n, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(const AVFrameLite *) FFMS_GetFrameByTime(VideoBase *VB, double Time, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(int) FFMS_GetAudio(AudioBase *AB, void *Buf, int64_t Start, int64_t Count, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(int) FFMS_SetOutputFormat(VideoBase *VB, int TargetFormat, int Width, int Height, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(void) FFMS_ResetOutputFormat(VideoBase *VB);
-FFMS_API(void) FFMS_DestroyFrameIndex(FrameIndex *FI);
-FFMS_API(int) FFMS_GetFirstTrackOfType(FrameIndex *TrackIndices, int TrackType, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(int) FFMS_GetNumTracks(FrameIndex *TrackIndices);
-FFMS_API(int) FFMS_GetTrackType(FrameInfoVector *FIV);
-FFMS_API(int) FFMS_GetNumFrames(FrameInfoVector *FIV);
-FFMS_API(const FrameInfo *) FFMS_GetFrameInfo(FrameInfoVector *FIV, int Frame, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(FrameInfoVector *) FFMS_GetTITrackIndex(FrameIndex *TrackIndices, int Track, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(FrameInfoVector *) FFMS_GetVSTrackIndex(VideoBase *VB);
-FFMS_API(FrameInfoVector *) FFMS_GetASTrackIndex(AudioBase *AB);
-FFMS_API(int) FFMS_FindClosestKeyFrame(FrameInfoVector *FIV, int Frame, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(int) FFMS_FrameFromDTS(FrameInfoVector *FIV, int64_t DTS);
-FFMS_API(int) FFMS_ClosestFrameFromDTS(FrameInfoVector *FIV, int64_t DTS);
-FFMS_API(const TrackTimeBase *) FFMS_GetTimeBase(FrameInfoVector *FIV);
-FFMS_API(int) FFMS_WriteTimecodes(FrameInfoVector *FIV, const char *TimecodeFile, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(FrameIndex *) FFMS_MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(FrameIndex *) FFMS_ReadIndex(const char *IndexFile, char *ErrorMsg, unsigned MsgSize);
-FFMS_API(int) FFMS_WriteIndex(const char *IndexFile, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize);
-
-#endif

FFmpegSource2/ffms2.html

@@ -1,238 +0,0 @@
-<html>
-<head>
-<title>
-FFmpegSource2 Documentation
-</title>
-</head>
-<body>
-<h1>FFmpegSource2 Documentation</h1>
-<p>
-Opens files using ffmpeg and nothing else. May be frame accurate on good days. The source is MIT licensed and can be obtained from https://spaceboyz.net/svn/aegisub/trunk/FFmpegSource2. The precompiled binary is GPL licensed. If you are religious you may consider this the second coming.
-</p>
-
-<h2>Compatibility - Video</h2>
-<ul>
-<li>AVI, MKV, MP4, FLV: Frame accurate</li>
-<li>WMV: Frame accurate(?) but avformat seems to pick keyframes relatively far away</li>
-<li>OGM: Messed up first frame and seeking produces smearing with seekmode=3, incredibly slow seeking without, remux to mkv or avi</li>
-<li>VOB: No rff flags applied, frame accurate?</li>
-<li>MPG: Seeking seems to be off by one or two frames now and then</li>
-<li>M2TS, TS: Linear access only (seekmode=-1)</li>
-<li>Image files: Most formats can be opened if seekmode=-1 is set</li>
-</ul>
-
-<h2>Compatibility - Audio</h2>
-<ul>
-<li>All formats are written to separate wave64 files</li>
-<li>No wave64 reader is provided</li>
-</ul>
-
-<h2>Usage</h2>
-<p>
-<b>FFIndex(string source, string cachefile = source + ".ffindex", int indexmask = 0, int dumpmask = 0, string audiofile = source, bool overwrite = false)</b><br />
- Used to invoke indexing separately and to write audio tracks to disk as wave64 files
-</p>
-
-<p>
-<b>FFVideoSource(string source, int track, bool cache = true, string cachefile = source + ".ffindex", int fpsnum = -1, int fpsden = 1, string pp, int threads = -1, string timecodes, int seekmode = 1)</b><br />
- Opens video, will invoke indexing with the defaults if no preexisting index is found
-</p>
-
-<p>
-<b>FFAudioSource(string source, int track, bool cache = true, string cachefile = source + ".ffindex")</b><br />
- Opens audio, <b>if an index already exists it needs to contain a suitable audio index or empty audio will be returned</b>, will invoke indexing with the defaults if no preexisting index is found
-</p>
-
-<p>
-<b>FFPP(clip, string pp)</b><br />
-  Separate postprocessing which also seems to include a few simple deinterlacers
-</p>
-
-<p>
-<b>SWScale(clip, width = -1, height = -1, resizer = "BICUBIC", colorspace = "")</b><br />
-  Separate postprocessing which also seems to include a few simple deinterlacers
-</p>
-
-<b>FFNoLog()</b><br />
-  Disable all logging output from FFmpeg
-</p>
-
-
-<p>
-<b>source:</b>
-  Source file.
-</p>
-
-<p>
-<b>indexmask &amp; dumpmask:</b>
-  Which audio tracks to index/write to disk. Dumping a track also implies indexing since the same work has to be done anyway. It is a binary mask meaning that 7 corresponds to writing tracks 1-3. Non-audio tracks are ignored. -1 writes all tracks.
-</p>
-
-<p>
-<b>audiofile:</b>
-  The base name to use for the decoded audio. Track number and delay is appended.
-</p>
-
-<p>
-<b>overwrite:</b>
-  Forces reindexing even if a valid index already exists. May be useful for trackmask changes or testing.
-</p>
-
-<p>
-<b>track:</b>
-  Track number as seen by the relevant demuxer, starts from 0, -1 means it will pick the first suitable track.
-</p>
-
-<p>
-<b>fpsnum &amp; fpsden:</b>
-  For VFR -> CFR conversion. Setting fpsnum <= 0 means a 1:1 relation with the encoded frames.
-</p>
-
-<p>
-<b>timecodes:</b>
-  File to output timecodes to, if the file exists it will be overwritten.
-</p>
-
-<p>
-<b>cache:</b>
-  Write indexing information to a file for later use. This setting does not control if The video index is loaded which it always is if it exists.
-</p>
-
-<p>
-<b>cachefile</b>
-  Where to write the cache information.
-</p>
-
-<p>
-<b>pp:</b>
-  See the table below for a full description, an empty string means no processing. It is recommended to avoid the autoq option since it's currently unknown what effect it will have on the processing.
-</p>
-
-<p>
-<b>threads:</b>
-  Sets the number of decoder threads used. Defaults to the number of cpus reported by windows. Ignored by lavc if the used decoder doesn't implement it.
-</p>
-
-<p>
-<b>seekmode:</b>
-  Force how seeking is handled, has no effect on matroska files which always use the equivalent of seekmode=1<br />
-    <b>-1:</b> linear access without rewind, will throw an error if each successive requested frame number isn't bigger than the last one, only intended for opening images but might work on well with some obscure video format<br />
-    <b>0:</b> linear access, the definition of slow but should make some formats "usable"<br />
-    <b>1:</b> safe normal, bases seeking decisions on the reported keyframe positions<br />
-    <b>2:</b> unsafe normal, same as 1 but no error will be thrown if the exact destination has to be guessed<br />
-    <b>3:</b> aggressive, seek in the forward direction even if no closer keyframe is known to exist, only useful for testing and containers where avformat doesn't report keyframes properly
-</p>
-
-<p>
-<b>width &amp; height:</b>
-  Width and height to resize to. Value below or equal to 0 is the same as specifying the input dimensions.
-</p>
-
-<p>
-<b>resizer:</b>
-  Selects the resizer used for resampling the chroma planes and normal resizing. The available methods are: FAST_BILINEAR, BILINEAR, BICUBIC, X, POINT, AREA, BICUBLIN, GAUSS, SINC, LANCZOS and SPLINE.
-</p>
-
-<p>
-<b>colorspace:</b>
-  The colorspace to convert to. The names are YV12, YUY2, RGB24, RGB32 and the empty string for same as input.
-</p>
-
-
-<h2>PP string format</h2>
-<pre>
-Available postprocessing filters:
-Filters                        Options
-short  long name       short   long option     Description
-*      *               a       autoq           CPU power dependent enabler
-                       c       chrom           chrominance filtering enabled
-                       y       nochrom         chrominance filtering disabled
-                       n       noluma          luma filtering disabled
-hb     hdeblock        (2 threshold)           horizontal deblocking filter
-       1. difference factor: default=32, higher -> more deblocking
-       2. flatness threshold: default=39, lower -> more deblocking
-                       the h & v deblocking filters share these
-                       so you can't set different thresholds for h / v
-vb     vdeblock        (2 threshold)           vertical deblocking filter
-ha     hadeblock       (2 threshold)           horizontal deblocking filter
-va     vadeblock       (2 threshold)           vertical deblocking filter
-h1     x1hdeblock                              experimental h deblock filter 1
-v1     x1vdeblock                              experimental v deblock filter 1
-dr     dering                                  deringing filter
-al     autolevels                              automatic brightness / contrast
-                       f        fullyrange     stretch luminance to (0..255)
-lb     linblenddeint                           linear blend deinterlacer
-li     linipoldeint                            linear interpolating deinterlace
-ci     cubicipoldeint                          cubic interpolating deinterlacer
-md     mediandeint                             median deinterlacer
-fd     ffmpegdeint                             ffmpeg deinterlacer
-l5     lowpass5                                FIR lowpass deinterlacer
-de     default                                 hb:a,vb:a,dr:a
-fa     fast                                    h1:a,v1:a,dr:a
-ac                                             ha:a:128:7,va:a,dr:a
-tn     tmpnoise        (3 threshold)           temporal noise reducer
-                     1. <= 2. <= 3.            larger -> stronger filtering
-fq     forceQuant      <quantizer>             force quantizer
-Usage:
-<filterName>[:<option>[:<option>...]][[,|/][-]<filterName>[:<option>...]]...
-long form example:
-vdeblock:autoq/hdeblock:autoq/linblenddeint    default,-vdeblock
-short form example:
-vb:a/hb:a/lb                                   de,-vb
-more examples:
-tn:64:128:256
-</pre>
-
-<h2>Compiling</h2>
-
-<p><b>zlib</b> from http://www.zlib.net/</p>
-
-<p><b>FFmpeg svn</b> from http://ffmpeg.mplayerhq.hu/</p>
-
-<p><b>Required FFmpeg Configuration:</b>
-./configure --enable-memalign-hack --enable-gpl --enable-swscale --enable-postproc
-
-<p><b>Suggested Additional Options:</b>
---enable-w32threads --disable-encoders --disable-muxers --disable-debug</p>
-
-<p>
-Note that --enable-w32threads is required for multithreaded decoding to work.
-</p>
-
-<h2>Changes</h2>
-<ul>
-<li>2.00 beta 4<ul>
-<li>Added the function FFNoLog which suppresses all messages from ffmpeg</li>
-<li>Experimental new TS parsing using Haali's splitter (with bugs)</li>
-<li>Everything is now compiled with VS2008 and GCC 4.3.2</li>
-<li>Updated FFmpeg to rev 16383 (no libfaad2 this time)</li>
-</ul></li>
-
-<li>2.00 beta 3<ul>
-<li>Compiled with libfaad2 again (has anyone seen a single aac file lavc can open right now?)</li>
-<li>More API changes (and even more are likely to come)</li>
-<li>Several access violations and memory leaks on opening and indexing files fixed</li>
-<li>Added a VFR to CFR mode</li>
-<li>Readded FFAudioSource support for other containers (glitches still present now and then but no separate raw cache is required and possibly less buggy)</li>
-<li>Renamed the dll to FFMS2.dll, FFMS2 is now the official short name of the project</li>
-<li>Updated FFmpeg to rev 15522</li>
-</ul></li>
-
-<li>2.00 beta 2<ul>
-<li>More API changes (and more are likely to come)</li>
-<li>Includes a simple CLI indexing application</li>
-<li>FFIndex now takes a few more arguments</li>
-<li>Readded FFAudioSource (only matroska supported for now)</li>
-<li>Updated FFmpeg to rev 15396</li>
-</ul></li>
-
-<li>2.00 beta 1<ul>
-<li>Can now be used as a stand alone library for making indices and retrieving frames</li>
-<li>Rewrote most things</li>
-<li>Updated FFmpeg to rev 15301</li>
-</ul></li>
-
-</ul>
-
-</body>
-</html>

FFmpegSource2/ffmsindex.cpp

@@ -1,201 +0,0 @@
-//  Copyright (c) 2008 Karl Blomster
-//
-//  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.
-
-
-#include <iostream> 
-#include <string>
-#include <stdlib.h>
-#include "ffms.h"
-
-int TrackMask;
-int DumpMask;
-bool Overwrite;
-bool IgnoreErrors;
-std::string InputFile;
-std::string CacheFile;
-std::string AudioFile;
-
-FrameIndex *Index;
-
-
-void PrintUsage () {
-	using namespace std;
-	cout << "FFmpegSource2 indexing app" << endl
-		<< "Usage: ffmsindex [options] inputfile [outputfile]" << endl
-		<< "If no output filename is specified, inputfile.ffindex will be used." << endl << endl
-		<< "Options:" << endl
-		<< "-f        Force overwriting of existing index file, if any (default: no)" << endl
-		<< "-s        Silently skip indexing of audio tracks that cannot be read (default: no)" << endl
-		<< "-t N      Set the audio indexing mask to N (-1 means index all tracks, 0 means index none, default: 0)" << endl
-		<< "-d N      Set the audio decoding mask to N (mask syntax same as -t, default: 0)" << endl
-		<< "-a NAME   Set the audio output base filename to NAME (default: input filename)";
-}
-
-
-void ParseCMDLine (int argc, char *argv[]) {
-	if (argc <= 1) {
-		PrintUsage();
-		throw "";
-	}
-
-	// defaults
-	InputFile = "";
-	CacheFile = "";
-	AudioFile = "";
-	TrackMask = 0;
-	DumpMask  = 0;
-	Overwrite = false;
-	IgnoreErrors = false;
-
-	// argv[0] = name of program
-	int i = 1;
-
-	while (i < argc) {
-		std::string Option = argv[i];
-		std::string OptionArg = "";
-		if (i+1 < argc)
-			OptionArg = argv[i+1];
-
-		if (!Option.compare("-f")) {
-			Overwrite = true;
-		} else if (!Option.compare("-s")) {
-			IgnoreErrors = true;
-		} else if (!Option.compare("-t")) {
-			TrackMask = atoi(OptionArg.c_str());
-			i++;
-		} else if (!Option.compare("-d")) {
-			DumpMask = atoi(OptionArg.c_str());
-			i++;
-		} else if (!Option.compare("-a")) {
-			AudioFile = OptionArg;
-			i++;
-		} else if (InputFile.empty()) {
-			InputFile = argv[i];
-		} else if (CacheFile.empty()) {
-			CacheFile = argv[i];
-		} else {
-			std::cout << "Warning: ignoring unknown option " << argv[i] << std::endl;
-		}
-
-		i++;
-	}
-
-	if (InputFile.empty()) {
-		throw "Error: no input file specified";
-	}
-	if (CacheFile.empty()) {
-		CacheFile = InputFile;
-		CacheFile.append(".ffindex");
-	}
-	if (AudioFile.empty()) {
-		AudioFile = InputFile;
-	}
-}
-
-
-static int FFMS_CC UpdateProgress(int State, int64_t Current, int64_t Total, void *Private) {
-	using namespace std;
-	int *LastPercentage = (int *)Private;
-	int Percentage = int((double(Current)/double(Total)) * 100);
-
-	if (Percentage <= *LastPercentage)
-		return 0;
-
-	*LastPercentage = Percentage;
-
-	/*if (Percentage < 10)
-		cout << "\b\b";
-	else
-		cout << "\b\b\b"; */
-
-	cout << "Indexing, please wait... " << Percentage << "% \r";
-	
-	return 0;
-}
-
-
-void DoIndexing () {
-	char FFMSErrMsg[1024];
-	int MsgSize = sizeof(FFMSErrMsg);
-	int Progress = 0;
-
-	Index = FFMS_ReadIndex(CacheFile.c_str(), FFMSErrMsg, MsgSize);
-	if (Overwrite || Index == NULL) {
-		std::cout << "Indexing, please wait... 0% \r";
-		Index = FFMS_MakeIndex(InputFile.c_str(), TrackMask, DumpMask, AudioFile.c_str(), IgnoreErrors, UpdateProgress, &Progress, FFMSErrMsg, MsgSize);
-		if (Index == NULL) {
-			std::string Err = "\nIndexing error: ";
-			Err.append(FFMSErrMsg);
-			throw Err;
-		}
-
-		if (Progress != 100)
-			std::cout << "Indexing, please wait... 100% \r";
-		
-		std::cout << std::endl << "Writing index... ";
-
-		if (FFMS_WriteIndex(CacheFile.c_str(), Index, FFMSErrMsg, MsgSize)) {
-			std::string Err = "Error writing index: ";
-			Err.append(FFMSErrMsg);
-			throw Err;
-		}
-
-		std::cout << "done." << std::endl;
-	} else {
-		throw "Error: index file already exists, use -f if you are sure you want to overwrite it.";
-	}
-}
-
-
-int main(int argc, char *argv[]) {
-	try {
-		ParseCMDLine(argc, argv);
-	} catch (const char *Error) {
-		std::cout << std::endl << Error << std::endl;
-		return 1;
-	} catch (std::string Error) {
-		std::cout << std::endl << Error << std::endl;
-		return 1;
-	} catch (...) {
-		std::cout << std::endl << "Unknown error" << std::endl;
-		return 1;
-	}
-
-	FFMS_Init();
-
-	try {
-		DoIndexing();
-	} catch (const char *Error) {
-		std::cout << Error << std::endl;
-		FFMS_DestroyFrameIndex(Index);
-		return 1;
-	} catch (std::string Error) {
-		std::cout << std::endl << Error << std::endl;
-		FFMS_DestroyFrameIndex(Index);
-		return 1;
-	} catch (...) {
-		std::cout << std::endl << "Unknown error" << std::endl;
-		FFMS_DestroyFrameIndex(Index);
-		return 1;
-	}
-
-	FFMS_DestroyFrameIndex(Index);
-	return 0;
-}

FFmpegSource2/ffpp.cpp

@@ -1,96 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "ffpp.h"
-#include "utils.h"
-
-FFPP::FFPP(PClip AChild, const char *PP, IScriptEnvironment *Env) : GenericVideoFilter(AChild) {
-	if (!strcmp(PP, ""))
-		Env->ThrowError("FFPP: PP argument is empty");
-
-	PPContext = NULL;
-	PPMode = NULL;
-	SWSTo422P = NULL;
-	SWSFrom422P = NULL;
-
-	memset(&InputPicture, 0, sizeof(InputPicture));
-	memset(&OutputPicture, 0, sizeof(OutputPicture));
-
-	PPMode = pp_get_mode_by_name_and_quality((char *)PP, PP_QUALITY_MAX);
-	if (!PPMode)
-		Env->ThrowError("FFPP: Invalid postprocesing settings");
-	
-	int Flags = GetCPUFlags();
-
-	if (vi.IsYV12()) {
-		Flags |= PP_FORMAT_420;
-	} else if (vi.IsYUY2()) {
-		Flags |= PP_FORMAT_422;
-		SWSTo422P = sws_getContext(vi.width, vi.height, PIX_FMT_YUV422, vi.width, vi.height, PIX_FMT_YUV422P, GetCPUFlags() | SWS_BICUBIC, NULL, NULL, NULL);
-		SWSFrom422P = sws_getContext(vi.width, vi.height, PIX_FMT_YUV422P, vi.width, vi.height, PIX_FMT_YUV422, GetCPUFlags() | SWS_BICUBIC, NULL, NULL, NULL);
-		avpicture_alloc(&InputPicture, PIX_FMT_YUV422P, vi.width, vi.height);
-		avpicture_alloc(&OutputPicture, PIX_FMT_YUV422P, vi.width, vi.height);
-	} else {
-		Env->ThrowError("FFPP: Only YV12 and YUY2 video supported");
-	}
-
-	PPContext = pp_get_context(vi.width, vi.height, Flags);
-	if (!PPContext)
-		Env->ThrowError("FFPP: Failed to create context");
-}
-
-FFPP::~FFPP() {
-	if (PPMode)
-		pp_free_mode(PPMode);
-	if (PPContext)
-		pp_free_context(PPContext);
-	if (SWSTo422P)
-		sws_freeContext(SWSTo422P);
-	if (SWSFrom422P)
-		sws_freeContext(SWSFrom422P);
-	avpicture_free(&InputPicture);
-	avpicture_free(&OutputPicture);
-}
-
-PVideoFrame FFPP::GetFrame(int n, IScriptEnvironment* Env) {
-	PVideoFrame Src = child->GetFrame(n, Env);
-	PVideoFrame Dst = Env->NewVideoFrame(vi);
-
-	if (vi.IsYV12()) {
-		const uint8_t *SrcData[3] = {(uint8_t *)Src->GetReadPtr(PLANAR_Y), (uint8_t *)Src->GetReadPtr(PLANAR_U), (uint8_t *)Src->GetReadPtr(PLANAR_V)};
-		int SrcStride[3] = {Src->GetPitch(PLANAR_Y), Src->GetPitch(PLANAR_U), Src->GetPitch(PLANAR_V)};
-		uint8_t *DstData[3] = {Dst->GetWritePtr(PLANAR_Y), Dst->GetWritePtr(PLANAR_U), Dst->GetWritePtr(PLANAR_V)};
-		int DstStride[3] = {Dst->GetPitch(PLANAR_Y), Dst->GetPitch(PLANAR_U), Dst->GetPitch(PLANAR_V)};
-
-		pp_postprocess(SrcData, SrcStride, DstData, DstStride, vi.width, vi.height, NULL, 0, PPMode, PPContext, 0);
-	} else if (vi.IsYUY2()) {
-		uint8_t *SrcData[1] = {(uint8_t *)Src->GetReadPtr()};
-		int SrcStride[1] = {Src->GetPitch()};
-		sws_scale(SWSTo422P, SrcData, SrcStride, 0, vi.height, InputPicture.data, InputPicture.linesize);
-		
-		pp_postprocess(const_cast<const uint8_t **>(InputPicture.data), InputPicture.linesize, OutputPicture.data, OutputPicture.linesize, vi.width, vi.height, NULL, 0, PPMode, PPContext, 0);
-
-		uint8_t *DstData[1] = {Dst->GetWritePtr()};
-		int DstStride[1] = {Dst->GetPitch()};
-		sws_scale(SWSFrom422P, OutputPicture.data, OutputPicture.linesize, 0, vi.height, DstData, DstStride);
-	}
-
-	return Dst;
-}

FFmpegSource2/ffpp.h

@@ -1,47 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef FFPP_H
-#define FFPP_H
-
-extern "C" {
-#include <libavcodec/avcodec.h>
-#include <libswscale/swscale.h>
-#include <libpostproc/postprocess.h>
-}
-
-#include <windows.h>
-#include "avisynth.h"
-
-class FFPP : public GenericVideoFilter {
-private:
-	pp_context_t *PPContext;
-	pp_mode_t *PPMode;
-	SwsContext *SWSTo422P;
-	SwsContext *SWSFrom422P;
-	AVPicture InputPicture;
-	AVPicture OutputPicture;
-public:
-	FFPP(PClip AChild, const char *PP, IScriptEnvironment *Env);
-	~FFPP();
-	PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment* Env);
-};
-
-#endif

FFmpegSource2/ffswscale.cpp

@@ -1,142 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "ffswscale.h"
-#include "utils.h"
-
-int CSNameToPIXFMT(const char * ACSName, int ADefault) {
-	if (!_stricmp(ACSName, ""))
-		return ADefault;
-	if (!_stricmp(ACSName, "YV12"))
-		return PIX_FMT_YUV420P;
-	if (!_stricmp(ACSName, "YUY2"))
-		return PIX_FMT_YUYV422;
-	if (!_stricmp(ACSName, "RGB24"))
-		return PIX_FMT_BGR24;
-	if (!_stricmp(ACSName, "RGB32"))
-		return PIX_FMT_RGB32;
-	return PIX_FMT_NONE;
-}
-
-int ResizerNameToSWSResizer(const char *AResizerName) {
-	if (!_stricmp(AResizerName, "FAST_BILINEAR"))
-		return SWS_FAST_BILINEAR;
-	if (!_stricmp(AResizerName, "BILINEAR"))
-		return SWS_BILINEAR;
-	if (!_stricmp(AResizerName, "BICUBIC"))
-		return SWS_BICUBIC;
-	if (!_stricmp(AResizerName, "X"))
-		return SWS_X;
-	if (!_stricmp(AResizerName, "POINT"))
-		return SWS_POINT;
-	if (!_stricmp(AResizerName, "AREA"))
-		return SWS_AREA;
-	if (!_stricmp(AResizerName, "BICUBLIN"))
-		return SWS_BICUBLIN;
-	if (!_stricmp(AResizerName, "GAUSS"))
-		return SWS_GAUSS;
-	if (!_stricmp(AResizerName, "SINC"))
-		return SWS_SINC;
-	if (!_stricmp(AResizerName, "LANCZOS"))
-		return SWS_LANCZOS;
-	if (!_stricmp(AResizerName, "SPLINE"))
-		return SWS_SPLINE;
-	return 0;
-}
-
-SWScale::SWScale(PClip Child, int ResizeToWidth, int ResizeToHeight, const char *ResizerName, const char *ConvertToFormatName, IScriptEnvironment *Env) : GenericVideoFilter(Child) {
-	Context = NULL;
-	OrigWidth = vi.width;
-	OrigHeight = vi.height;
-	FlipOutput = vi.IsYUV();
-	
-	int ConvertFromFormat = PIX_FMT_NONE;
-	if (vi.IsYV12())
-		ConvertFromFormat = PIX_FMT_YUV420P;
-	if (vi.IsYUY2())
-		ConvertFromFormat = PIX_FMT_YUYV422;
-	if (vi.IsRGB24())
-		ConvertFromFormat = PIX_FMT_BGR24;
-	if (vi.IsRGB32())
-		ConvertFromFormat = PIX_FMT_RGB32;
-
-	if (ResizeToHeight <= 0)
-		ResizeToHeight = OrigHeight;
-	else
-		vi.height = ResizeToHeight;
-
-	if (ResizeToWidth <= 0)
-		ResizeToWidth = OrigWidth;
-	else
-		vi.width = ResizeToWidth;
-
-	int ConvertToFormat = CSNameToPIXFMT(ConvertToFormatName, ConvertFromFormat);
-	if (ConvertToFormat == PIX_FMT_NONE)
-		Env->ThrowError("SWScale: Invalid colorspace specified (%s)", ConvertToFormatName);
-
-	switch (ConvertToFormat) {
-		case PIX_FMT_YUV420P: vi.pixel_type = VideoInfo::CS_I420; break;
-		case PIX_FMT_YUYV422: vi.pixel_type = VideoInfo::CS_YUY2; break;
-		case PIX_FMT_BGR24: vi.pixel_type = VideoInfo::CS_BGR24; break;
-		case PIX_FMT_RGB32: vi.pixel_type = VideoInfo::CS_BGR32; break;
-	}
-
-	FlipOutput ^= vi.IsYUV();
-
-	int Resizer = ResizerNameToSWSResizer(ResizerName);
-	if (Resizer == 0)
-		Env->ThrowError("SWScale: Invalid resizer specified (%s)", ResizerName);
-
-	if (ConvertToFormat == PIX_FMT_YUV420P && vi.height & 1)
-		Env->ThrowError("SWScale: mod 2 output height required");
-
-	if ((ConvertToFormat == PIX_FMT_YUV420P || ConvertToFormat == PIX_FMT_YUYV422) && vi.width & 1)
-		Env->ThrowError("SWScale: mod 2 output width required");
-
-	// may one day need a SWS_CS_DEFAULT in flags
-	Context = sws_getContext(OrigWidth, OrigHeight, ConvertFromFormat, vi.width, vi.height, ConvertToFormat, GetCPUFlags() | Resizer, NULL, NULL, NULL);
-	if (Context == NULL)
-		Env->ThrowError("SWScale: Context creation failed");
-}
-
-SWScale::~SWScale() {
-	if (Context)
-		sws_freeContext(Context);
-}
-
-PVideoFrame SWScale::GetFrame(int n, IScriptEnvironment *Env) {
-	PVideoFrame Src = child->GetFrame(n, Env);
-	PVideoFrame Dst = Env->NewVideoFrame(vi);
-
-	uint8_t *SrcData[3] = {(uint8_t *)Src->GetReadPtr(PLANAR_Y), (uint8_t *)Src->GetReadPtr(PLANAR_U), (uint8_t *)Src->GetReadPtr(PLANAR_V)};
-	int SrcStride[3] = {Src->GetPitch(PLANAR_Y), Src->GetPitch(PLANAR_U), Src->GetPitch(PLANAR_V)};
-
-	if (FlipOutput) {
-		uint8_t *DstData[3] = {Dst->GetWritePtr(PLANAR_Y) + Dst->GetPitch(PLANAR_Y) * (Dst->GetHeight(PLANAR_Y) - 1), Dst->GetWritePtr(PLANAR_U) + Dst->GetPitch(PLANAR_U) * (Dst->GetHeight(PLANAR_U) - 1), Dst->GetWritePtr(PLANAR_V) + Dst->GetPitch(PLANAR_V) * (Dst->GetHeight(PLANAR_V) - 1)};
-		int DstStride[3] = {-Dst->GetPitch(PLANAR_Y), -Dst->GetPitch(PLANAR_U), -Dst->GetPitch(PLANAR_V)};
-		sws_scale(Context, SrcData, SrcStride, 0, OrigHeight, DstData, DstStride);
-	} else {
-		uint8_t *DstData[3] = {Dst->GetWritePtr(PLANAR_Y), Dst->GetWritePtr(PLANAR_U), Dst->GetWritePtr(PLANAR_V)};
-		int DstStride[3] = {Dst->GetPitch(PLANAR_Y), Dst->GetPitch(PLANAR_U), Dst->GetPitch(PLANAR_V)};
-		sws_scale(Context, SrcData, SrcStride, 0, OrigHeight, DstData, DstStride);
-	}
-
-	return Dst;
-}

FFmpegSource2/ffswscale.h

@@ -1,43 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef FFSWSCALE_H
-#define FFSWSCALE_H
-
-extern "C" {
-#include <libswscale/swscale.h>
-}
-
-#include <windows.h>
-#include "avisynth.h"
-
-class SWScale : public GenericVideoFilter {
-private:
-	SwsContext *Context;
-	int OrigWidth;
-	int OrigHeight;
-	bool FlipOutput;
-public:
-	SWScale(PClip Child, int ResizeToWidth, int ResizeToHeight, const char *ResizerName, const char *ConvertToFormatName, IScriptEnvironment *Env);
-	~SWScale();
-    PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment *Env);
-};
-
-#endif

FFmpegSource2/ffvideosource.cpp

@@ -1,799 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "ffvideosource.h"
-#include <errno.h>
-
-#ifdef __UNIX__
-#define _snprintf snprintf
-#endif
-
-int VideoBase::InitPP(const char *PP, int PixelFormat, char *ErrorMsg, unsigned MsgSize) {
-	if (PP == NULL || !strcmp(PP, ""))
-		return 0;
-
-	PPMode = pp_get_mode_by_name_and_quality(PP, PP_QUALITY_MAX);
-	if (!PPMode) {
-		_snprintf(ErrorMsg, MsgSize, "Invalid postprocesing settings");
-		return 1;
-	}
-
-	int Flags =  GetCPUFlags();
-
-	switch (PixelFormat) {
-		case PIX_FMT_YUV420P: Flags |= PP_FORMAT_420; break;
-		case PIX_FMT_YUV422P: Flags |= PP_FORMAT_422; break;
-		case PIX_FMT_YUV411P: Flags |= PP_FORMAT_411; break;
-		case PIX_FMT_YUV444P: Flags |= PP_FORMAT_444; break;
-		default:
-			_snprintf(ErrorMsg, MsgSize, "Input format is not supported for postprocessing");
-			return 2;
-	}
-
-	PPContext = pp_get_context(VP.Width, VP.Height, Flags);
-
-	if (!(PPFrame = avcodec_alloc_frame())) {
-		_snprintf(ErrorMsg, MsgSize, "Failed to allocate temporary frame");
-		return 3;
-	}
-
-	if (avpicture_alloc((AVPicture *)PPFrame, PixelFormat, VP.Width, VP.Height) < 0) {
-		av_free(PPFrame);
-		PPFrame = NULL;
-		_snprintf(ErrorMsg, MsgSize, "Failed to allocate picture");
-		return 4;
-	}
-
-	FinalFrame = PPFrame;
-
-	return 0;
-}
-
-AVFrameLite *VideoBase::OutputFrame(AVFrame *Frame) {
-	if (PPContext) {
-		pp_postprocess(const_cast<const uint8_t **>(Frame->data), Frame->linesize, PPFrame->data, PPFrame->linesize, VP.Width, VP.Height, Frame->qscale_table, Frame->qstride, PPMode, PPContext, Frame->pict_type | (Frame->qscale_type ? PP_PICT_TYPE_QP2 : 0));
-		PPFrame->key_frame = Frame->key_frame;
-		PPFrame->pict_type = Frame->pict_type;
-	}
-
-	if (SWS) {
-		sws_scale(SWS, PPFrame->data, PPFrame->linesize, 0, VP.Height, FinalFrame->data, FinalFrame->linesize);
-		FinalFrame->key_frame = PPFrame->key_frame;
-		FinalFrame->pict_type = PPFrame->pict_type;
-	}
-
-	return reinterpret_cast<AVFrameLite *>(FinalFrame);
-}
-
-VideoBase::VideoBase() {
-	memset(&VP, 0, sizeof(VP));
-	PPContext = NULL;
-	PPMode = NULL;
-	SWS = NULL;
-	LastFrameNum = -1;
-	CurrentFrame = 0;
-	CodecContext = NULL;
-	DecodeFrame = avcodec_alloc_frame();
-	PPFrame = DecodeFrame;
-	FinalFrame = PPFrame;
-}
-
-VideoBase::~VideoBase() {
-	if (PPMode)
-		pp_free_mode(PPMode);
-	if (PPContext)
-		pp_free_context(PPContext);
-	if (SWS)
-		sws_freeContext(SWS);
-	if (FinalFrame != PPFrame) {
-		avpicture_free((AVPicture *)FinalFrame);
-		av_free(FinalFrame);
-	}
-	if (PPFrame != DecodeFrame) {
-		avpicture_free((AVPicture *)PPFrame);
-		av_free(PPFrame);
-	}
-	av_free(DecodeFrame);
-}
-
-AVFrameLite *VideoBase::GetFrameByTime(double Time, char *ErrorMsg, unsigned MsgSize) {
-	int Frame = Frames.ClosestFrameFromDTS((Time * 1000 * Frames.TB.Den) / Frames.TB.Num);
-	return GetFrame(Frame, ErrorMsg, MsgSize);
-}
-
-int VideoBase::SetOutputFormat(int TargetFormats, int Width, int Height, char *ErrorMsg, unsigned MsgSize) {
-//  FIXME: investigate the possible bug in avcodec_find_best_pix_fmt
-//	int Loss;
-//	int OutputFormat = avcodec_find_best_pix_fmt(TargetFormats,
-//		CodecContext->pix_fmt, 1 /* Required to prevent pointless RGB32 => RGB24 conversion */, &Loss);
-//	if (OutputFormat == -1)
-//		return -1;
-
-	int OutputFormat = TargetFormats;
-
-	SwsContext *NewSWS = NULL;
-	if (CodecContext->pix_fmt != OutputFormat || Width != CodecContext->width || Height != CodecContext->height) {
-		NewSWS = sws_getContext(CodecContext->width, CodecContext->height, CodecContext->pix_fmt, Width, Height,
-			OutputFormat, GetCPUFlags() | SWS_BICUBIC, NULL, NULL, NULL);
-		if (NewSWS == NULL) {
-			_snprintf(ErrorMsg, MsgSize, "Failed to allocate SWScale context");
-			return 1;
-		}
-	}
-
-	if (SWS)
-		sws_freeContext(SWS);
-	SWS = NewSWS;
-
-	VP.Height = Height;
-	VP.Width = Width;
-	VP.PixelFormat = OutputFormat;
-
-	// FIXME: In theory the allocations in this part could fail just like in InitPP but whatever
-	if (FinalFrame != PPFrame) {
-		avpicture_free((AVPicture *)FinalFrame);
-		av_free(FinalFrame);
-	}
-
-	if (SWS) {
-		FinalFrame = avcodec_alloc_frame();
-		avpicture_alloc((AVPicture *)FinalFrame, VP.PixelFormat, VP.Width, VP.Height);
-	} else {
-		FinalFrame = PPFrame;
-	}
-
-	return 0;
-}
-
-void VideoBase::ResetOutputFormat() {
-	if (SWS)
-		sws_freeContext(SWS);
-	SWS = NULL;
-	VP.Height = CodecContext->height;
-	VP.Width = CodecContext->width;
-	VP.PixelFormat = CodecContext->pix_fmt;
-}
-
-void FFVideoSource::Free(bool CloseCodec) {
-	if (CloseCodec)
-		avcodec_close(CodecContext);
-	av_close_input_file(FormatContext);
-	// how was it allocated? how was it deallocate? nobody knows
-	//av_free(FormatContext);
-}
-
-FFVideoSource::FFVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices,
-	const char *PP, int Threads, int SeekMode, char *ErrorMsg, unsigned MsgSize) {
-
-	FormatContext = NULL;
-	AVCodec *Codec = NULL;
-	this->SeekMode = SeekMode;
-	VideoTrack = Track;
-	Frames = (*TrackIndices)[VideoTrack];
-
-	if (Frames.size() == 0) {
-		_snprintf(ErrorMsg, MsgSize, "Video track contains no frames");
-		throw ErrorMsg;
-	}
-
-	if (av_open_input_file(&FormatContext, SourceFile, NULL, 0, NULL) != 0) {
-		_snprintf(ErrorMsg, MsgSize, "Couldn't open '%s'", SourceFile);
-		throw ErrorMsg;
-	}
-	
-	if (av_find_stream_info(FormatContext) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Couldn't find stream information");
-		throw ErrorMsg;
-	}
-
-	if (SeekMode >= 0 && av_seek_frame(FormatContext, VideoTrack, Frames[0].DTS, AVSEEK_FLAG_BACKWARD) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Video track is unseekable");
-		throw ErrorMsg;
-	}
-
-	CodecContext = FormatContext->streams[VideoTrack]->codec;
-	CodecContext->thread_count = Threads;
-
-	Codec = avcodec_find_decoder(CodecContext->codec_id);
-	if (Codec == NULL) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Video codec not found");
-		throw ErrorMsg;
-	}
-
-	if (avcodec_open(CodecContext, Codec) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Could not open video codec");
-		throw ErrorMsg;
-	}
-
-	// Always try to decode a frame to make sure all required parameters are known
-	int64_t Dummy;
-	if (DecodeNextFrame(DecodeFrame, &Dummy, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	//VP.image_type = VideoInfo::IT_TFF;
-	VP.Width = CodecContext->width;
-	VP.Height = CodecContext->height;
-	VP.FPSDenominator = FormatContext->streams[VideoTrack]->time_base.num;
-	VP.FPSNumerator = FormatContext->streams[VideoTrack]->time_base.den;
-	VP.NumFrames = Frames.size();
-	VP.PixelFormat = CodecContext->pix_fmt;
-	VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;
-	VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;
-
-	if (VP.Width <= 0 || VP.Height <= 0) {
-		Free(true);
-		_snprintf(ErrorMsg, MsgSize, "Codec returned zero size video");
-		throw ErrorMsg;
-	}
-
-	// sanity check framerate
-	if (VP.FPSDenominator > VP.FPSNumerator || VP.FPSDenominator <= 0 || VP.FPSNumerator <= 0) {
-		VP.FPSDenominator = 1;
-		VP.FPSNumerator = 30;
-	}
-
-	if (InitPP(PP, CodecContext->pix_fmt, ErrorMsg, MsgSize)) {
-			Free(true);
-			throw ErrorMsg;
-	}
-
-	// Adjust framerate to match the duration of the first frame
-	if (Frames.size() >= 2) {
-		unsigned int DTSDiff = (unsigned int)FFMAX(Frames[1].DTS - Frames[0].DTS, 1);
-		VP.FPSDenominator *= DTSDiff;
-	}
-
-	// Cannot "output" to PPFrame without doing all other initialization
-	// This is the additional mess required for seekmode=-1 to work in a reasonable way
-	OutputFrame(DecodeFrame);
-	LastFrameNum = 0;
-
-	// Set AR variables
-	VP.SARNum = CodecContext->sample_aspect_ratio.num;
-	VP.SARDen = CodecContext->sample_aspect_ratio.den;
-}
-
-FFVideoSource::~FFVideoSource() {
-	Free(true);
-}
-
-int FFVideoSource::DecodeNextFrame(AVFrame *AFrame, int64_t *AStartTime, char *ErrorMsg, unsigned MsgSize) {
-	AVPacket Packet;
-	int FrameFinished = 0;
-	*AStartTime = -1;
-
-	while (av_read_frame(FormatContext, &Packet) >= 0) {
-        if (Packet.stream_index == VideoTrack) {
-			if (*AStartTime < 0)
-				*AStartTime = Packet.dts;
-
-			avcodec_decode_video(CodecContext, AFrame, &FrameFinished, Packet.data, Packet.size);
-        }
-
-        av_free_packet(&Packet);
-
-		if (FrameFinished)
-			goto Done;
-	}
-
-	// Flush the last frames
-	if (CodecContext->has_b_frames)
-		avcodec_decode_video(CodecContext, AFrame, &FrameFinished, NULL, 0);
-
-	if (!FrameFinished)
-		goto Error;
-
-// Ignore errors for now
-Error:
-Done:
-	return 0;
-}
-
-AVFrameLite *FFVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSize) {
-	// PPFrame always holds frame LastFrameNum even if no PP is applied
-	if (LastFrameNum == n)
-		return OutputFrame(DecodeFrame);
-
-	bool HasSeeked = false;
-
-	if (SeekMode >= 0) {
-		int ClosestKF = Frames.FindClosestKeyFrame(n);
-
-		if (SeekMode == 0) {
-			if (n < CurrentFrame) {
-				av_seek_frame(FormatContext, VideoTrack, Frames[0].DTS, AVSEEK_FLAG_BACKWARD);
-				avcodec_flush_buffers(CodecContext);
-				CurrentFrame = 0;
-			}
-		} else {
-			// 10 frames is used as a margin to prevent excessive seeking since the predicted best keyframe isn't always selected by avformat
-			if (n < CurrentFrame || ClosestKF > CurrentFrame + 10 || (SeekMode == 3 && n > CurrentFrame + 10)) {
-				av_seek_frame(FormatContext, VideoTrack, (SeekMode == 3) ? Frames[n].DTS : Frames[ClosestKF].DTS, AVSEEK_FLAG_BACKWARD);
-				avcodec_flush_buffers(CodecContext);
-				HasSeeked = true;
-			}
-		}
-	} else if (n < CurrentFrame) {
-		_snprintf(ErrorMsg, MsgSize, "Non-linear access attempted");
-		return NULL;
-	}
-
-	do {
-		int64_t StartTime;
-		if (DecodeNextFrame(DecodeFrame, &StartTime, ErrorMsg, MsgSize))
-			return NULL;
-
-		if (HasSeeked) {
-			HasSeeked = false;
-
-			// Is the seek destination time known? Does it belong to a frame?
-			if (StartTime < 0 || (CurrentFrame = Frames.FrameFromDTS(StartTime)) < 0) {
-				switch (SeekMode) {
-					case 1:
-						_snprintf(ErrorMsg, MsgSize, "Frame accurate seeking is not possible in this file");
-						return NULL;
-					case 2:
-					case 3:
-						CurrentFrame = Frames.ClosestFrameFromDTS(StartTime);
-						break;
-					default:
-						_snprintf(ErrorMsg, MsgSize, "Failed assertion");
-						return NULL;
-				}	
-			}
-		}
-
-		CurrentFrame++;
-	} while (CurrentFrame <= n);
-
-	LastFrameNum = n;
-	return OutputFrame(DecodeFrame);
-}
-
-void MatroskaVideoSource::Free(bool CloseCodec) {
-	if (CS)
-		cs_Destroy(CS);
-	if (MC.ST.fp) {
-		mkv_Close(MF);
-		fclose(MC.ST.fp);
-	}
-	if (CloseCodec)
-		avcodec_close(CodecContext);
-	av_free(CodecContext);
-}
-
-MatroskaVideoSource::MatroskaVideoSource(const char *SourceFile, int Track,
-	FrameIndex *TrackIndices, const char *PP,
-	int Threads, char *ErrorMsg, unsigned MsgSize) {
-
-	AVCodec *Codec = NULL;
-	CodecContext = NULL;
-	TrackInfo *TI = NULL;
-	CS = NULL;
-	VideoTrack = Track;
-	Frames = (*TrackIndices)[VideoTrack];
-
-	if (Frames.size() == 0) {
-		_snprintf(ErrorMsg, MsgSize, "Video track contains no frames");
-		throw ErrorMsg;
-	}
-
-	MC.ST.fp = fopen(SourceFile, "rb");
-	if (MC.ST.fp == NULL) {
-		_snprintf(ErrorMsg, MsgSize, "Can't open '%s': %s", SourceFile, strerror(errno));
-		throw ErrorMsg;
-	}
-
-	setvbuf(MC.ST.fp, NULL, _IOFBF, CACHESIZE);
-
-	MF = mkv_OpenEx(&MC.ST.base, 0, 0, ErrorMessage, sizeof(ErrorMessage));
-	if (MF == NULL) {
-		fclose(MC.ST.fp);
-		_snprintf(ErrorMsg, MsgSize, "Can't parse Matroska file: %s", ErrorMessage);
-		throw ErrorMsg;
-	}
-
-	mkv_SetTrackMask(MF, ~(1 << VideoTrack));
-	TI = mkv_GetTrackInfo(MF, VideoTrack);
-
-	if (TI->CompEnabled) {
-		CS = cs_Create(MF, VideoTrack, ErrorMessage, sizeof(ErrorMessage));
-		if (CS == NULL) {
-			Free(false);
-			_snprintf(ErrorMsg, MsgSize, "Can't create decompressor: %s", ErrorMessage);
-			throw ErrorMsg;
-		}
-	}
-
-	CodecContext = avcodec_alloc_context();
-	CodecContext->extradata = (uint8_t *)TI->CodecPrivate;
-	CodecContext->extradata_size = TI->CodecPrivateSize;
-	CodecContext->thread_count = Threads;
-
-	Codec = avcodec_find_decoder(MatroskaToFFCodecID(TI->CodecID, TI->CodecPrivate));
-	if (Codec == NULL) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Video codec not found");
-		throw ErrorMsg;
-	}
-
-	if (avcodec_open(CodecContext, Codec) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Could not open video codec");
-		throw ErrorMsg;
-	}
-
-	// Always try to decode a frame to make sure all required parameters are known
-	int64_t Dummy;
-	if (DecodeNextFrame(DecodeFrame, &Dummy, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	VP.Width = CodecContext->width;
-	VP.Height = CodecContext->height;;
-	VP.FPSDenominator = 1;
-	VP.FPSNumerator = 30;
-	VP.NumFrames = Frames.size();
-	VP.PixelFormat = CodecContext->pix_fmt;
-	VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;
-	VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;
-
-	if (VP.Width <= 0 || VP.Height <= 0) {
-		Free(true);
-		_snprintf(ErrorMsg, MsgSize, "Codec returned zero size video");
-		throw ErrorMsg;
-	}
-
-	if (InitPP(PP, CodecContext->pix_fmt, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	// Calculate the average framerate
-	if (Frames.size() >= 2) {
-		double DTSDiff = (double)(Frames.back().DTS - Frames.front().DTS);
-		VP.FPSDenominator = (unsigned int)(DTSDiff * mkv_TruncFloat(TI->TimecodeScale) / (double)1000 / (double)(VP.NumFrames - 1) + 0.5);
-		VP.FPSNumerator = 1000000; 
-	}
-
-	// Output the already decoded frame so it isn't wasted
-	OutputFrame(DecodeFrame);
-	LastFrameNum = 0;
-
-	// Set AR variables
-	VP.SARNum = TI->AV.Video.DisplayWidth * TI->AV.Video.PixelHeight;
-	VP.SARDen = TI->AV.Video.DisplayHeight * TI->AV.Video.PixelWidth;
-
-	// Set crop variables
-	VP.CropLeft = TI->AV.Video.CropL;
-	VP.CropRight = TI->AV.Video.CropR;
-	VP.CropTop = TI->AV.Video.CropT;
-	VP.CropBottom = TI->AV.Video.CropB;
-}
-
-MatroskaVideoSource::~MatroskaVideoSource() {
-	Free(true);
-}
-
-int MatroskaVideoSource::DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTime, char *ErrorMsg, unsigned MsgSize) {
-	int FrameFinished = 0;
-	*AFirstStartTime = -1;
-
-	ulonglong StartTime, EndTime, FilePos;
-	unsigned int Track, FrameFlags, FrameSize;
-	
-	while (mkv_ReadFrame(MF, 0, &Track, &StartTime, &EndTime, &FilePos, &FrameSize, &FrameFlags) == 0) {
-		if (*AFirstStartTime < 0)
-			*AFirstStartTime = StartTime;
-
-		if (ReadFrame(FilePos, FrameSize, CS, MC, ErrorMsg, MsgSize))
-			return 1;
-
-		avcodec_decode_video(CodecContext, AFrame, &FrameFinished, MC.Buffer, FrameSize);
-
-		if (FrameFinished)
-			goto Done;
-	}
-
-	// Flush the last frames
-	if (CodecContext->has_b_frames)
-		 avcodec_decode_video(CodecContext, AFrame, &FrameFinished, NULL, 0);
-
-	if (!FrameFinished)
-		goto Error;
-
-Error:
-Done:
-	return 0;
-}
-
-AVFrameLite *MatroskaVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSize) {
-	// PPFrame always holds frame LastFrameNum even if no PP is applied
-	if (LastFrameNum == n)
-		return OutputFrame(DecodeFrame);
-
-	bool HasSeeked = false;
-
-	if (n < CurrentFrame || Frames.FindClosestKeyFrame(n) > CurrentFrame) {
-		mkv_Seek(MF, Frames[n].DTS, MKVF_SEEK_TO_PREV_KEYFRAME);
-		avcodec_flush_buffers(CodecContext);
-		HasSeeked = true;
-	}
-
-	do {
-		int64_t StartTime;
-		if (DecodeNextFrame(DecodeFrame, &StartTime, ErrorMsg, MsgSize))
-				return NULL;
-
-		if (HasSeeked) {
-			HasSeeked = false;
-
-			if (StartTime < 0 || (CurrentFrame = Frames.FrameFromDTS(StartTime)) < 0) {
-				_snprintf(ErrorMsg, MsgSize, "Frame accurate seeking is not possible in this file");
-				return NULL;
-			}
-		}
-
-		CurrentFrame++;
-	} while (CurrentFrame <= n);
-
-	LastFrameNum = n;
-	return OutputFrame(DecodeFrame);
-}
-
-#ifdef HAALITS
-
-void HaaliTSVideoSource::Free(bool CloseCodec) {
-	if (CloseCodec)
-		avcodec_close(CodecContext);
-	av_free(CodecContext);
-}
-
-HaaliTSVideoSource::HaaliTSVideoSource(const char *SourceFile, int Track,
-	FrameIndex *TrackIndices, const char *PP,
-	int Threads, char *ErrorMsg, unsigned MsgSize) {
-
-	AVCodec *Codec = NULL;
-	CodecContext = NULL;
-	VideoTrack = Track;
-	Frames = (*TrackIndices)[VideoTrack];
-
-	if (Frames.size() == 0) {
-		_snprintf(ErrorMsg, MsgSize, "Video track contains no frames");
-		throw ErrorMsg;
-	}
-
-	::CoInitializeEx(NULL, COINIT_MULTITHREADED);
-
-	CLSID clsid = Haali_TS_Parser;
-
-	if (FAILED(pMMC.CoCreateInstance(clsid))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't create parser");
-		throw ErrorMsg;
-	}
-
-	CComPtr<IMemAlloc>    pMA;
-	if (FAILED(pMA.CoCreateInstance(CLSID_MemAlloc))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't create memory allocator");
-		throw ErrorMsg;
-	}
-
-	CComPtr<IMMStream>    pMS;
-	if (FAILED(pMS.CoCreateInstance(CLSID_DiskFile))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't create disk file reader");
-		throw ErrorMsg;
-	}
-
-	WCHAR WSourceFile[2048];
-	mbstowcs(WSourceFile, SourceFile, 2000);
-	CComQIPtr<IMMStreamOpen> pMSO(pMS);
-	if (FAILED(pMSO->Open(WSourceFile))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't open file");
-		throw ErrorMsg;
-	}
-
-	if (FAILED(pMMC->Open(pMS, 0, NULL, pMA))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't parse file");
-		throw ErrorMsg;
-	}
-
-	BSTR CodecID = NULL;
-	uint8_t * CodecPrivate = NULL;
-	int CodecPrivateSize = 0;
-	int CurrentTrack = 0;
-	CComPtr<IEnumUnknown> pEU;
-	if (SUCCEEDED(pMMC->EnumTracks(&pEU))) {
-		CComPtr<IUnknown> pU;
-		while (pEU->Next(1, &pU, NULL) == S_OK) {
-			if (CurrentTrack++ == Track) {
-				CComQIPtr<IPropertyBag> pBag = pU;
-				if (pBag) {
-					VARIANT pV;
-
-					pV.vt = VT_EMPTY;
-					if (pBag->Read(L"CodecID", &pV, NULL) == S_OK)
-						CodecID = pV.bstrVal;
-
-					pV.vt = VT_EMPTY;
-					if (pBag->Read(L"CodecPrivate", &pV, NULL) == S_OK) {
-						CodecPrivate = (uint8_t *)pV.parray->pvData;
-						CodecPrivateSize = pV.parray->cbElements;
-					}
-				}
-			}
-			pU = NULL;
-		}
-	}
-
-	CodecContext = avcodec_alloc_context();
-	CodecContext->extradata = CodecPrivate;
-	CodecContext->extradata_size = CodecPrivateSize;
-	CodecContext->thread_count = Threads;
-
-	char ACodecID[2048];
-	wcstombs(ACodecID, CodecID, 2000);
-	Codec = avcodec_find_decoder(MatroskaToFFCodecID(ACodecID, CodecPrivate));
-	if (Codec == NULL) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Video codec not found");
-		throw ErrorMsg;
-	}
-
-	if (avcodec_open(CodecContext, Codec) < 0) {
-		Free(false);
-		_snprintf(ErrorMsg, MsgSize, "Could not open video codec");
-		throw ErrorMsg;
-	}
-
-	// Always try to decode a frame to make sure all required parameters are known
-	int64_t Dummy;
-	if (DecodeNextFrame(DecodeFrame, &Dummy, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	VP.Width = CodecContext->width;
-	VP.Height = CodecContext->height;;
-	VP.FPSDenominator = 1;
-	VP.FPSNumerator = 30;
-	VP.NumFrames = Frames.size();
-	VP.PixelFormat = CodecContext->pix_fmt;
-	VP.FirstTime = ((Frames.front().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;
-	VP.LastTime = ((Frames.back().DTS * Frames.TB.Num) / (double)Frames.TB.Den) / 1000;
-
-	if (VP.Width <= 0 || VP.Height <= 0) {
-		Free(true);
-		_snprintf(ErrorMsg, MsgSize, "Codec returned zero size video");
-		throw ErrorMsg;
-	}
-
-	if (InitPP(PP, CodecContext->pix_fmt, ErrorMsg, MsgSize)) {
-		Free(true);
-		throw ErrorMsg;
-	}
-
-	// Calculate the average framerate
-	if (Frames.size() >= 2) {
-		double DTSDiff = (double)(Frames.back().DTS - Frames.front().DTS);
-		// FIXME
-		VP.FPSDenominator = (unsigned int)((DTSDiff * 1000000000) / (double)1000 / (double)(VP.NumFrames - 1) + 0.5);
-		VP.FPSNumerator = 1000000; 
-	}
-
-	// Output the already decoded frame so it isn't wasted
-	OutputFrame(DecodeFrame);
-	LastFrameNum = 0;
-
-	// Set AR variables
-//	VP.SARNum = TI->AV.Video.DisplayWidth * TI->AV.Video.PixelHeight;
-//	VP.SARDen = TI->AV.Video.DisplayHeight * TI->AV.Video.PixelWidth;
-
-	// Set crop variables
-//	VP.CropLeft = TI->AV.Video.CropL;
-//	VP.CropRight = TI->AV.Video.CropR;
-//	VP.CropTop = TI->AV.Video.CropT;
-//	VP.CropBottom = TI->AV.Video.CropB;
-}
-
-HaaliTSVideoSource::~HaaliTSVideoSource() {
-	Free(true);
-}
-
-int HaaliTSVideoSource::DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTime, char *ErrorMsg, unsigned MsgSize) {
-	int FrameFinished = 0;
-	*AFirstStartTime = -1;
-
-	for (;;) {
-		CComPtr<IMMFrame> pMMF;
-		if (pMMC->ReadFrame(NULL, &pMMF) != S_OK)
-			break;
-
-		REFERENCE_TIME  Ts, Te;
-		if (*AFirstStartTime < 0 && SUCCEEDED(pMMF->GetTime(&Ts, &Te)))
-			*AFirstStartTime = Ts;
-
-		if (pMMF->GetTrack() == VideoTrack) {
-			BYTE *Data = NULL;
-			if (FAILED(pMMF->GetPointer(&Data)))
-				goto Error;
-
-			avcodec_decode_video(CodecContext, AFrame, &FrameFinished, Data, pMMF->GetActualDataLength());
-
-			if (FrameFinished)
-				goto Done;
-		}
-	}
-
-	// Flush the last frames
-	if (CodecContext->has_b_frames)
-		 avcodec_decode_video(CodecContext, AFrame, &FrameFinished, NULL, 0);
-
-	if (!FrameFinished)
-		goto Error;
-
-Error:
-Done:
-	return 0;
-}
-
-AVFrameLite *HaaliTSVideoSource::GetFrame(int n, char *ErrorMsg, unsigned MsgSize) {
-	// PPFrame always holds frame LastFrameNum even if no PP is applied
-	if (LastFrameNum == n)
-		return OutputFrame(DecodeFrame);
-
-	bool HasSeeked = false;
-
-	if (n < CurrentFrame || Frames.FindClosestKeyFrame(n) > CurrentFrame) {
-		int64_t dtsp = Frames[n].DTS;
-		pMMC->Seek(Frames[n].DTS, MMSF_PREV_KF);
-		// FIXME for some reason required to make it seek properly
-		//avcodec_flush_buffers(CodecContext);
-		HasSeeked = true;
-	}
-
-	do {
-		int64_t StartTime;
-		if (DecodeNextFrame(DecodeFrame, &StartTime, ErrorMsg, MsgSize))
-				return NULL;
-
-		if (HasSeeked) {
-			HasSeeked = false;
-
-			if (StartTime < 0 || (CurrentFrame = Frames.FrameFromDTS(StartTime)) < 0) {
-				_snprintf(ErrorMsg, MsgSize, "Frame accurate seeking is not possible in this file\n");
-				return NULL;
-			}
-		}
-
-		CurrentFrame++;
-	} while (CurrentFrame <= n);
-
-	LastFrameNum = n;
-	return OutputFrame(DecodeFrame);
-}
-
-#endif // HAALITS

FFmpegSource2/ffvideosource.h

@@ -1,120 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef FFVIDEOSOURCE_H
-#define FFVIDEOSOURCE_H
-
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-#include <libswscale/swscale.h>
-#include <libpostproc/postprocess.h>
-}
-
-#include <vector>
-#include "indexing.h"
-#include "utils.h"
-#include "ffms.h"
-
-#ifdef HAALITS
-#	define _WIN32_DCOM
-#	include <windows.h>
-#	include <tchar.h>
-#	include <atlbase.h>
-#	include <dshow.h>
-#	include "CoParser.h"
-#	include <initguid.h>
-#	include "guids.h"
-#endif
-
-class VideoBase {
-private:
-	pp_context_t *PPContext;
-	pp_mode_t *PPMode;
-	SwsContext *SWS;
-protected:
-	VideoProperties VP;
-	AVFrame *DecodeFrame;
-	AVFrame *PPFrame;
-	AVFrame *FinalFrame;
-	int LastFrameNum;
-	FrameInfoVector Frames;
-	int VideoTrack;
-	int	CurrentFrame;
-	AVCodecContext *CodecContext;
-
-	VideoBase();
-	int InitPP(const char *PP, int PixelFormat, char *ErrorMsg, unsigned MsgSize);
-	AVFrameLite *OutputFrame(AVFrame *Frame);
-public:
-	virtual ~VideoBase();
-	const VideoProperties& GetVideoProperties() { return VP; }
-	FrameInfoVector *GetFrameInfoVector() { return &Frames; }
-	virtual AVFrameLite *GetFrame(int n, char *ErrorMsg, unsigned MsgSize) = 0;
-	AVFrameLite *GetFrameByTime(double Time, char *ErrorMsg, unsigned MsgSize);
-	int SetOutputFormat(int TargetFormats, int Width, int Height, char *ErrorMsg, unsigned MsgSize);
-	void ResetOutputFormat();
-};
-
-class FFVideoSource : public VideoBase {
-private:
-	AVFormatContext *FormatContext;
-	int SeekMode;
-
-	void Free(bool CloseCodec);
-	int DecodeNextFrame(AVFrame *Frame, int64_t *DTS, char *ErrorMsg, unsigned MsgSize);
-public:
-	FFVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, const char *PP, int Threads, int SeekMode, char *ErrorMsg, unsigned MsgSize);
-	~FFVideoSource();
-	AVFrameLite *GetFrame(int n, char *ErrorMsg, unsigned MsgSize);
-};
-
-class MatroskaVideoSource : public VideoBase {
-private:
-	MatroskaFile *MF;
-	MatroskaReaderContext MC;
-    CompressedStream *CS;
-	char ErrorMessage[256];
-
-	void Free(bool CloseCodec);
-	int DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTime, char *ErrorMsg, unsigned MsgSize);
-public:
-	MatroskaVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, const char *PP, int Threads, char *ErrorMsg, unsigned MsgSize);
-	~MatroskaVideoSource();
-    AVFrameLite *GetFrame(int n, char *ErrorMsg, unsigned MsgSize);
-};
-
-#ifdef HAALITS
-
-class HaaliTSVideoSource : public VideoBase {
-private:
-	CComPtr<IMMContainer> pMMC;
-
-	void Free(bool CloseCodec);
-	int DecodeNextFrame(AVFrame *AFrame, int64_t *AFirstStartTime, char *ErrorMsg, unsigned MsgSize);
-public:
-	HaaliTSVideoSource(const char *SourceFile, int Track, FrameIndex *TrackIndices, const char *PP, int Threads, char *ErrorMsg, unsigned MsgSize);
-	~HaaliTSVideoSource();
-    AVFrameLite *GetFrame(int n, char *ErrorMsg, unsigned MsgSize);
-};
-
-#endif // HAALITS
-
-#endif

FFmpegSource2/guids.h

@@ -1,138 +0,0 @@
-/*
- * Copyright (c) 2004-2008 Mike Matsnev.  All Rights Reserved.
- * 
- * $Id: guids.h,v 1.16 2008/03/29 15:41:30 mike Exp $
- * 
- */
-
-#ifndef GUIDS_H
-#define	GUIDS_H
-
-// {941A4793-A705-4312-8DFC-C11CA05F397E}
-DEFINE_GUID(CLSID_RealAudioDecoder,
-0x941A4793, 0xA705, 0x4312, 0x8D, 0xFC, 0xC1, 0x1C, 0xA0, 0x5F, 0x39, 0x7E);
-
-// {B8CBBAD8-AA1A-4cea-B95E-730041A55EF0}
-DEFINE_GUID(MEDIASUBTYPE_WavpackHybrid, 
-0xb8cbbad8, 0xaa1a, 0x4cea, 0xb9, 0x5e, 0x73, 0x0, 0x41, 0xa5, 0x5e, 0xf0);
-
-// {1541C5C0-CDDF-477d-BC0A-86F8AE7F8354}
-DEFINE_GUID(MEDIASUBTYPE_FLAC_FRAMED,
-0x1541c5c0, 0xcddf, 0x477d, 0xbc, 0xa, 0x86, 0xf8, 0xae, 0x7f, 0x83, 0x54);
-
-// {8D2FD10B-5841-4a6b-8905-588FEC1ADED9}
-DEFINE_GUID(MEDIASUBTYPE_Vorbis2,
-0x8d2fd10b, 0x5841, 0x4a6b, 0x89, 0x5, 0x58, 0x8f, 0xec, 0x1a, 0xde, 0xd9);
-
-// {B36E107F-A938-4387-93C7-55E966757473}
-DEFINE_GUID(FORMAT_VorbisFormat2,
-0xb36e107f, 0xa938, 0x4387, 0x93, 0xc7, 0x55, 0xe9, 0x66, 0x75, 0x74, 0x73);
-
-// {E487EB08-6B26-4be9-9DD3-993434D313FD}
-DEFINE_GUID(MEDIATYPE_Subtitle,
-0xe487eb08, 0x6b26, 0x4be9, 0x9d, 0xd3, 0x99, 0x34, 0x34, 0xd3, 0x13, 0xfd);
-
-// {87C0B230-03A8-4fdf-8010-B27A5848200D}
-DEFINE_GUID(MEDIASUBTYPE_UTF8,
-0x87c0b230, 0x3a8, 0x4fdf, 0x80, 0x10, 0xb2, 0x7a, 0x58, 0x48, 0x20, 0xd);
-
-// {3020560F-255A-4ddc-806E-6C5CC6DCD70A}
-DEFINE_GUID(MEDIASUBTYPE_SSA,
-0x3020560f, 0x255a, 0x4ddc, 0x80, 0x6e, 0x6c, 0x5c, 0xc6, 0xdc, 0xd7, 0xa);
-
-// {326444F7-686F-47ff-A4B2-C8C96307B4C2}
-DEFINE_GUID(MEDIASUBTYPE_ASS,
-0x326444f7, 0x686f, 0x47ff, 0xa4, 0xb2, 0xc8, 0xc9, 0x63, 0x7, 0xb4, 0xc2);
-
-// {370689E7-B226-4f67-978D-F10BC1A9C6AE}
-DEFINE_GUID(MEDIASUBTYPE_ASS2, 
-0x370689e7, 0xb226, 0x4f67, 0x97, 0x8d, 0xf1, 0xb, 0xc1, 0xa9, 0xc6, 0xae);
-
-// {B753B29A-0A96-45be-985F-68351D9CAB90}
-DEFINE_GUID(MEDIASUBTYPE_USF,
-0xb753b29a, 0xa96, 0x45be, 0x98, 0x5f, 0x68, 0x35, 0x1d, 0x9c, 0xab, 0x90);
-
-// {F7239E31-9599-4e43-8DD5-FBAF75CF37F1}
-DEFINE_GUID(MEDIASUBTYPE_VOBSUB,
-0xf7239e31, 0x9599, 0x4e43, 0x8d, 0xd5, 0xfb, 0xaf, 0x75, 0xcf, 0x37, 0xf1);
-
-// {0B10E53F-ABF9-4581-BE9C-2C9A5EC6F2E0}
-DEFINE_GUID(MEDIASUBTYPE_VOBSUB2,
-0xb10e53f, 0xabf9, 0x4581, 0xbe, 0x9c, 0x2c, 0x9a, 0x5e, 0xc6, 0xf2, 0xe0);
-
-// {5965E924-63F9-4a64-B71E-F75188FD6384}
-DEFINE_GUID(MEDIASUBTYPE_DXRSub,
-0x5965e924, 0x63f9, 0x4a64, 0xb7, 0x1e, 0xf7, 0x51, 0x88, 0xfd, 0x63, 0x84);
-
-// {A33D2F7D-96BC-4337-B23B-A8B9FBC295E9}
-DEFINE_GUID(FORMAT_SubtitleInfo,
-0xa33d2f7d, 0x96bc, 0x4337, 0xb2, 0x3b, 0xa8, 0xb9, 0xfb, 0xc2, 0x95, 0xe9);
-
-DEFINE_GUID(MEDIASUBTYPE_AC3,
-0x00002000, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-
-DEFINE_GUID(MEDIASUBTYPE_EAC3,
-0x0000EAC3, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-
-DEFINE_GUID(MEDIASUBTYPE_DTS,
-0x00002001, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-
-// {B855F837-194F-4d9a-9358-E31ED6B49D03}
-DEFINE_GUID(MEDIASUBTYPE_VC1,
-0xb855f837, 0x194f, 0x4d9a, 0x93, 0x58, 0xe3, 0x1e, 0xd6, 0xb4, 0x9d, 0x3);
-
-// {93A22E7A-5091-45ef-BA61-6DA26156A5D0}
-DEFINE_GUID(CLSID_DirectVobSubFilter, 
-0x93a22e7a, 0x5091, 0x45ef, 0xba, 0x61, 0x6d, 0xa2, 0x61, 0x56, 0xa5, 0xd0);
-
-// {9852A670-F845-491b-9BE6-EBD841B8A613}
-DEFINE_GUID(CLSID_DirectVobSubFilter2, 
-0x9852a670, 0xf845, 0x491b, 0x9b, 0xe6, 0xeb, 0xd8, 0x41, 0xb8, 0xa6, 0x13);
-
-// {F6D90F11-9C73-11D3-B32E-00C04F990BB4}
-DEFINE_GUID(CLSID_MSXML2,
-0xF6D90F11, 0x9C73, 0x11D3, 0xB3, 0x2E, 0x00, 0xC0, 0x4F, 0x99, 0x0B, 0xB4);
-
-// {9F062738-CD84-4F54-A3C4-BD5EB44F416B}
-DEFINE_GUID(CLSID_SonicAudioDec,
-0x9F062738, 0xCD84, 0x4F54, 0xA3, 0xC4, 0xBD, 0x5E, 0xB4, 0x4F, 0x41, 0x6B);
-
-// {53D9DE0B-FC61-4650-9773-74D13CC7E582}
-DEFINE_GUID(CLSID_DiskFile,
-0x53d9de0b, 0xfc61, 0x4650, 0x97, 0x73, 0x74, 0xd1, 0x3c, 0xc7, 0xe5, 0x82);
-
-// {BD4FB4BE-809D-487b-ADD6-F7D164247E52}
-DEFINE_GUID(CLSID_HTTPStream,
-0xbd4fb4be, 0x809d, 0x487b, 0xad, 0xd6, 0xf7, 0xd1, 0x64, 0x24, 0x7e, 0x52);
-
-// {90C7D10E-CE9A-479b-A238-1A0F2396DE43}
-DEFINE_GUID(CLSID_MemAlloc,
-0x90c7d10e, 0xce9a, 0x479b, 0xa2, 0x38, 0x1a, 0xf, 0x23, 0x96, 0xde, 0x43);
-
-DEFINE_GUID(MEDIASUBTYPE_WVC1,
-0x31435657, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-
-DEFINE_GUID(MEDIASUBTYPE_WMV3,
-0x33564d57, 0x0000, 0x0010, 0x80, 0x00, 0x00, 0xAA, 0x00, 0x38, 0x9B, 0x71);
-
-// FIXME: move somewhere else?
-DEFINE_GUID(Haali_TS_Parser,
-0xB841F346, 0x4835, 0x4de8, 0xAA, 0x5E, 0x2E, 0x7C, 0xD2, 0xD4, 0xC4, 0x35);
-
-typedef struct tagVORBISFORMAT2
-{
-	DWORD Channels;
-	DWORD SamplesPerSec;
-	DWORD BitsPerSample;	
-	DWORD HeaderSize[3]; // 0: Identification, 1: Comment, 2: Setup
-} VORBISFORMAT2, *PVORBISFORMAT2, FAR *LPVORBISFORMAT2;
-
-#pragma pack(push, 1)
-typedef struct {
-	DWORD dwOffset;	
-	CHAR IsoLang[4]; // three letter lang code + terminating zero
-	WCHAR TrackName[256]; // 256 bytes ought to be enough for everyone :)
-} SUBTITLEINFO;
-#pragma pack(pop)
-
-#endif

FFmpegSource2/indexing.cpp

@@ -1,798 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include <iostream>
-#include <fstream>
-#include <set>
-#include <algorithm>
-#include <memory>
-#include <errno.h>
-#include "indexing.h"
-#include "wave64writer.h"
-
-#ifdef __UNIX__
-#define _fseeki64 fseeko
-#define _ftelli64 ftello
-#define _snprintf snprintf
-#endif
-
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-#include "MatroskaParser.h"
-#include "stdiostream.h"
-}
-
-#ifdef _WIN32
-#	define _WIN32_DCOM
-#	include <windows.h>
-#	include <tchar.h>
-#	include <atlbase.h>
-#	include <dshow.h>
-#	include "CoParser.h"
-#	include <initguid.h>
-#	include "guids.h"
-#endif
-
-class MatroskaAudioContext {
-public:
-	Wave64Writer *W64W;
-	AVCodecContext *CTX;
-	CompressedStream *CS;
-	int64_t CurrentSample;
-
-	MatroskaAudioContext() {
-		W64W = NULL;
-		CTX = NULL;
-		CS = NULL;
-		CurrentSample = 0;
-	}
-
-	~MatroskaAudioContext() {
-		delete W64W;
-		if (CTX) {
-			avcodec_close(CTX);
-			av_free(CTX);
-		}
-		if (CS)
-			cs_Destroy(CS);
-	}
-};
-
-class FFAudioContext {
-public:
-	Wave64Writer *W64W;
-	AVCodecContext *CTX;
-	int64_t CurrentSample;
-
-	FFAudioContext() {
-		W64W = NULL;
-		CTX = NULL;
-		CurrentSample = 0;
-	}
-
-	~FFAudioContext() {
-		delete W64W;
-		if (CTX)
-			avcodec_close(CTX);
-	}
-};
-
-#ifdef HAALITS
-class HaaliTSIndexMemory {
-private:
-	int16_t *DecodingBuffer;
-	MatroskaAudioContext *AudioContexts;
-public:
-	HaaliTSIndexMemory(int Tracks, int16_t *&DecodingBuffer, MatroskaAudioContext *&AudioContexts) {
-		DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10];
-		AudioContexts = new MatroskaAudioContext[Tracks];
-		this->DecodingBuffer = DecodingBuffer;
-		this->AudioContexts = AudioContexts;
-	}
-
-	~HaaliTSIndexMemory() {
-		delete [] DecodingBuffer;
-		delete [] AudioContexts;
-	}
-};
-#endif
-
-class MatroskaIndexMemory {
-private:
-	int16_t *DecodingBuffer;
-	MatroskaAudioContext *AudioContexts;
-	MatroskaFile *MF;
-	MatroskaReaderContext *MC;
-public:
-	MatroskaIndexMemory(int Tracks, int16_t *&DecodingBuffer, MatroskaAudioContext *&AudioContexts, MatroskaFile *MF, MatroskaReaderContext *MC) {
-		DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10];
-		AudioContexts = new MatroskaAudioContext[Tracks];
-		this->DecodingBuffer = DecodingBuffer;
-		this->AudioContexts = AudioContexts;
-		this->MF = MF;
-		this->MC = MC;
-	}
-
-	~MatroskaIndexMemory() {
-		delete [] DecodingBuffer;
-		delete [] AudioContexts;
-		mkv_Close(MF);
-		fclose(MC->ST.fp);
-	}
-};
-
-class FFIndexMemory {
-private:
-	int16_t *DecodingBuffer;
-	FFAudioContext *AudioContexts;
-	AVFormatContext *FormatContext;
-public:
-	FFIndexMemory(int Tracks, int16_t *&DecodingBuffer, FFAudioContext *&AudioContexts, AVFormatContext *&FormatContext) {
-		DecodingBuffer = new int16_t[AVCODEC_MAX_AUDIO_FRAME_SIZE*10];
-		AudioContexts = new FFAudioContext[Tracks];
-		this->DecodingBuffer = DecodingBuffer;
-		this->AudioContexts = AudioContexts;
-		this->FormatContext = FormatContext;
-	}
-
-	~FFIndexMemory() {
-		delete [] DecodingBuffer;
-		delete [] AudioContexts;
-		av_close_input_file(FormatContext);
-	}
-};
-
-static bool DTSComparison(FrameInfo FI1, FrameInfo FI2) {
-	return FI1.DTS < FI2.DTS;
-}
-
-static void SortTrackIndices(FrameIndex *TrackIndices) {
-	for (FrameIndex::iterator Cur=TrackIndices->begin(); Cur!=TrackIndices->end(); Cur++)
-		std::sort(Cur->begin(), Cur->end(), DTSComparison);
-}
-
-int WriteIndex(const char *IndexFile, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize) {
-	std::ofstream Index(IndexFile, std::ios::out | std::ios::binary | std::ios::trunc);
-
-	if (!Index.is_open()) {
-		_snprintf(ErrorMsg, MsgSize, "Failed to open '%s' for writing", IndexFile);
-		return 1;
-	}
-
-	// Write the index file header
-	IndexHeader IH;
-	IH.Id = INDEXID;
-	IH.Version = INDEXVERSION;
-	IH.Tracks = TrackIndices->size();
-	IH.Decoder = TrackIndices->Decoder;
-	Index.write(reinterpret_cast<char *>(&IH), sizeof(IH));
-	
-	for (unsigned int i = 0; i < IH.Tracks; i++) {
-		int TT = (*TrackIndices)[i].TT;
-		Index.write(reinterpret_cast<char *>(&TT), sizeof(TT));
-		int Num = (*TrackIndices)[i].TB.Num;
-		Index.write(reinterpret_cast<char *>(&Num), sizeof(Num));
-		int Den = (*TrackIndices)[i].TB.Den;
-		Index.write(reinterpret_cast<char *>(&Den), sizeof(Den));
-		size_t Frames = (*TrackIndices)[i].size();
-		Index.write(reinterpret_cast<char *>(&Frames), sizeof(Frames));
-
-		for (size_t j = 0; j < Frames; j++)
-			Index.write(reinterpret_cast<char *>(&(TrackIndices->at(i)[j])), sizeof(FrameInfo));
-	}
-
-	return 0;
-}
-
-#ifdef HAALITS
-static FrameIndex *MakeHaaliTSIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize) {
-	::CoInitializeEx(NULL, COINIT_MULTITHREADED);
-
-	CLSID clsid = Haali_TS_Parser;
-
-	CComPtr<IMMContainer> pMMC;
-	if (FAILED(pMMC.CoCreateInstance(clsid))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't create parser");
-		return NULL;
-	}
-
-	CComPtr<IMemAlloc>    pMA;
-	if (FAILED(pMA.CoCreateInstance(CLSID_MemAlloc))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't create memory allocator");
-		return NULL;
-	}
-
-	CComPtr<IMMStream>    pMS;
-	if (FAILED(pMS.CoCreateInstance(CLSID_DiskFile))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't create disk file reader");
-		return NULL;
-	}
-
-	WCHAR WSourceFile[2048];
-	mbstowcs(WSourceFile, SourceFile, 2000);
-	CComQIPtr<IMMStreamOpen> pMSO(pMS);
-	if (FAILED(pMSO->Open(WSourceFile))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't open file");
-		return NULL;
-	}
-
-	if (FAILED(pMMC->Open(pMS, 0, NULL, pMA))) {
-		_snprintf(ErrorMsg, MsgSize, "Can't parse file");
-		return NULL;
-	}
-
-	int NumTracks = 0;
-	CComPtr<IEnumUnknown> pEU;
-	if (SUCCEEDED(pMMC->EnumTracks(&pEU))) {
-		CComPtr<IUnknown> pU;
-		while (pEU->Next(1, &pU, NULL) == S_OK) {
-			NumTracks++;
-			pU = NULL;
-		}
-	}
-
-	// Audio stuff
-
-	int16_t *db;
-	MatroskaAudioContext *AudioContexts;
-	HaaliTSIndexMemory IM = HaaliTSIndexMemory(NumTracks, db, AudioContexts);
-
-	FrameIndex *TrackIndices = new FrameIndex();
-	TrackIndices->Decoder = 2;
-
-	int TrackTypes[32];
-	int CurrentTrack = 0;
-	pEU = NULL;
-	if (SUCCEEDED(pMMC->EnumTracks(&pEU))) {
-		CComPtr<IUnknown> pU;
-		while (pEU->Next(1, &pU, NULL) == S_OK) {
-			CComQIPtr<IPropertyBag> pBag = pU;
-			BSTR CodecID = NULL;
-			TrackTypes[CurrentTrack] = -200;
-			uint8_t * CodecPrivate = NULL;
-			int CodecPrivateSize = 0;
-
-			if (pBag) {
-				VARIANT pV;
-
-				pV.vt = VT_EMPTY;
-				if (pBag->Read(L"CodecID", &pV, NULL) == S_OK)
-					CodecID = pV.bstrVal;
-
-				pV.vt = VT_EMPTY;
-				if (pBag->Read(L"Type", &pV, NULL) == S_OK)
-					TrackTypes[CurrentTrack] = pV.uintVal;
-
-				pV.vt = VT_EMPTY;
-				if (pBag->Read(L"CodecPrivate", &pV, NULL) == S_OK) {
-					CodecPrivate = (uint8_t *)pV.parray->pvData;
-					CodecPrivateSize = pV.parray->cbElements;
-				}
-			}
-
-			TrackIndices->push_back(FrameInfoVector(1, 1000000000, TrackTypes[CurrentTrack] - 1));
-
-			if (IndexMask & (1 << CurrentTrack) && TrackTypes[CurrentTrack] == TT_AUDIO) {
-				AVCodecContext *AudioCodecContext = avcodec_alloc_context();
-				AudioCodecContext->extradata = CodecPrivate;
-				AudioCodecContext->extradata_size = CodecPrivateSize;
-				AudioContexts[CurrentTrack].CTX = AudioCodecContext;
-
-				char ACodecID[2048];
-				wcstombs(ACodecID, CodecID, 2000);
-				AVCodec *AudioCodec = avcodec_find_decoder(MatroskaToFFCodecID(ACodecID, NULL));
-				if (AudioCodec == NULL) {
-					av_free(AudioCodecContext);
-					AudioContexts[CurrentTrack].CTX = NULL;
-					_snprintf(ErrorMsg, MsgSize, "Audio codec not found");
-					return NULL;
-				}
-
-				if (avcodec_open(AudioCodecContext, AudioCodec) < 0) {
-					av_free(AudioCodecContext);
-					AudioContexts[CurrentTrack].CTX = NULL;
-					_snprintf(ErrorMsg, MsgSize, "Could not open audio codec");
-					return NULL;
-				}
-			} else {
-				IndexMask &= ~(1 << CurrentTrack);
-			}
-
-			pU = NULL;
-			CurrentTrack++;
-		}
-	}
-//
-
-	for (;;) {
-		if (IP) {
-			if ((*IP)(0, 0, 1, Private)) {
-				_snprintf(ErrorMsg, MsgSize, "Cancelled by user");
-				delete TrackIndices;
-				return NULL;
-			}
-		}
-
-		CComPtr<IMMFrame> pMMF;
-		if (pMMC->ReadFrame(NULL, &pMMF) != S_OK)
-			break;
-
-		REFERENCE_TIME  Ts, Te;
-		HRESULT hr = pMMF->GetTime(&Ts, &Te);
-
-		unsigned int CurrentTrack = pMMF->GetTrack();
-
-		// Only create index entries for video for now to save space
-		if (TrackTypes[CurrentTrack] == TT_VIDEO) {
-			(*TrackIndices)[CurrentTrack].push_back(FrameInfo(Ts, pMMF->IsSyncPoint() == S_OK));
-		} else if (TrackTypes[CurrentTrack] == TT_AUDIO && (IndexMask & (1 << CurrentTrack))) {
-/*			(*TrackIndices)[Track].push_back(FrameInfo(AudioContexts[Track].CurrentSample, FilePos, FrameSize, (FrameFlags & FRAME_KF) != 0));
-			ReadFrame(FilePos, FrameSize, AudioContexts[Track].CS, MC, ErrorMsg, MsgSize);
-
-			int Size = FrameSize;
-			uint8_t *Data = MC.Buffer;		
-			AVCodecContext *AudioCodecContext = AudioContexts[Track].CTX;
-
-			while (Size > 0) {
-				int dbsize = AVCODEC_MAX_AUDIO_FRAME_SIZE*10;
-				int Ret = avcodec_decode_audio2(AudioCodecContext, db, &dbsize, Data, Size);
-				if (Ret < 0) {
-					if (IgnoreDecodeErrors) {
-						(*TrackIndices)[Track].clear();
-						IndexMask &= ~(1 << Track);					
-						break;
-					} else {
-						_snprintf(ErrorMsg, MsgSize, "Audio decoding error");
-						delete TrackIndices;
-						return NULL;
-					}
-				}
-
-				if (Ret > 0) {
-					Size -= Ret;
-					Data += Ret;
-				}
-
-				if (dbsize > 0)
-					AudioContexts[Track].CurrentSample += (dbsize * 8) / (av_get_bits_per_sample_format(AudioCodecContext->sample_fmt) * AudioCodecContext->channels);
-
-				if (dbsize > 0 && (DumpMask & (1 << Track))) {
-					// Delay writer creation until after an audio frame has been decoded. This ensures that all parameters are known when writing the headers.
-					if (!AudioContexts[Track].W64W) {
-						char ABuf[50];
-						std::string WN(AudioFile);
-						int Offset = StartTime * mkv_TruncFloat(mkv_GetTrackInfo(MF, Track)->TimecodeScale) / (double)1000000;
-						_snprintf(ABuf, sizeof(ABuf), ".%02d.delay.%d.w64", Track, Offset);
-						WN += ABuf;
-						
-						AudioContexts[Track].W64W = new Wave64Writer(WN.c_str(), av_get_bits_per_sample_format(AudioCodecContext->sample_fmt),
-							AudioCodecContext->channels, AudioCodecContext->sample_rate, AudioFMTIsFloat(AudioCodecContext->sample_fmt));
-					}
-
-					AudioContexts[Track].W64W->WriteData(db, dbsize);
-				}
-			}
-			*/
-		}
-	}
-
-	SortTrackIndices(TrackIndices);
-	return TrackIndices;
-}
-#endif
-
-static FrameIndex *MakeMatroskaIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize) {
-	MatroskaFile *MF;
-	char ErrorMessage[256];
-	MatroskaReaderContext MC;
-	MC.Buffer = NULL;
-	MC.BufferSize = 0;
-
-	InitStdIoStream(&MC.ST);
-	MC.ST.fp = fopen(SourceFile, "rb");
-	if (MC.ST.fp == NULL) {
-		_snprintf(ErrorMsg, MsgSize, "Can't open '%s': %s", SourceFile, strerror(errno));
-		return NULL;
-	}
-
-	setvbuf(MC.ST.fp, NULL, _IOFBF, CACHESIZE);
-
-	MF = mkv_OpenEx(&MC.ST.base, 0, 0, ErrorMessage, sizeof(ErrorMessage));
-	if (MF == NULL) {
-		fclose(MC.ST.fp);
-		_snprintf(ErrorMsg, MsgSize, "Can't parse Matroska file: %s", ErrorMessage);
-		return NULL;
-	}
-
-	// Audio stuff
-
-	int16_t *db;
-	MatroskaAudioContext *AudioContexts;
-	MatroskaIndexMemory IM = MatroskaIndexMemory(mkv_GetNumTracks(MF), db, AudioContexts, MF, &MC);
-
-	for (unsigned int i = 0; i < mkv_GetNumTracks(MF); i++) {
-		TrackInfo *TI = mkv_GetTrackInfo(MF, i);
-		if (IndexMask & (1 << i) && TI->Type == TT_AUDIO) {
-			AVCodecContext *AudioCodecContext = avcodec_alloc_context();
-			AudioCodecContext->extradata = (uint8_t *)TI->CodecPrivate;
-			AudioCodecContext->extradata_size = TI->CodecPrivateSize;
-			AudioContexts[i].CTX = AudioCodecContext;
-
-			if (TI->CompEnabled) {
-				AudioContexts[i].CS = cs_Create(MF, i, ErrorMessage, sizeof(ErrorMessage));
-				if (AudioContexts[i].CS == NULL) {
-					av_free(AudioCodecContext);
-					AudioContexts[i].CTX = NULL;
-					_snprintf(ErrorMsg, MsgSize, "Can't create decompressor: %s", ErrorMessage);
-					return NULL;
-				}
-			}
-
-			AVCodec *AudioCodec = avcodec_find_decoder(MatroskaToFFCodecID(TI->CodecID, TI->CodecPrivate));
-			if (AudioCodec == NULL) {
-				av_free(AudioCodecContext);
-				AudioContexts[i].CTX = NULL;
-				_snprintf(ErrorMsg, MsgSize, "Audio codec not found");
-				return NULL;
-			}
-
-			if (avcodec_open(AudioCodecContext, AudioCodec) < 0) {
-				av_free(AudioCodecContext);
-				AudioContexts[i].CTX = NULL;
-				_snprintf(ErrorMsg, MsgSize, "Could not open audio codec");
-				return NULL;
-			}
-		} else {
-			IndexMask &= ~(1 << i);
-		}
-	}
-
-	//
-
-	int64_t CurrentPos = _ftelli64(MC.ST.fp);
-	_fseeki64(MC.ST.fp, 0, SEEK_END);
-	int64_t SourceSize = _ftelli64(MC.ST.fp);
-	_fseeki64(MC.ST.fp, CurrentPos, SEEK_SET);
-
-	FrameIndex *TrackIndices = new FrameIndex();
-	TrackIndices->Decoder = 1;
-
-	for (unsigned int i = 0; i < mkv_GetNumTracks(MF); i++)
-		TrackIndices->push_back(FrameInfoVector(mkv_TruncFloat(mkv_GetTrackInfo(MF, i)->TimecodeScale), 1000000, mkv_GetTrackInfo(MF, i)->Type - 1));
-
-	ulonglong StartTime, EndTime, FilePos;
-	unsigned int Track, FrameFlags, FrameSize;
-
-	while (mkv_ReadFrame(MF, 0, &Track, &StartTime, &EndTime, &FilePos, &FrameSize, &FrameFlags) == 0) {
-		// Update progress
-		if (IP) {
-			if ((*IP)(0, _ftelli64(MC.ST.fp), SourceSize, Private)) {
-				_snprintf(ErrorMsg, MsgSize, "Cancelled by user");
-				delete TrackIndices;
-				return NULL;
-			}
-		}
-
-		// Only create index entries for video for now to save space
-		if (mkv_GetTrackInfo(MF, Track)->Type == TT_VIDEO) {
-			(*TrackIndices)[Track].push_back(FrameInfo(StartTime, (FrameFlags & FRAME_KF) != 0));
-		} else if (mkv_GetTrackInfo(MF, Track)->Type == TT_AUDIO && (IndexMask & (1 << Track))) {
-			(*TrackIndices)[Track].push_back(FrameInfo(AudioContexts[Track].CurrentSample, FilePos, FrameSize, (FrameFlags & FRAME_KF) != 0));
-			ReadFrame(FilePos, FrameSize, AudioContexts[Track].CS, MC, ErrorMsg, MsgSize);
-
-			int Size = FrameSize;
-			uint8_t *Data = MC.Buffer;		
-			AVCodecContext *AudioCodecContext = AudioContexts[Track].CTX;
-
-			while (Size > 0) {
-				int dbsize = AVCODEC_MAX_AUDIO_FRAME_SIZE*10;
-				int Ret = avcodec_decode_audio2(AudioCodecContext, db, &dbsize, Data, Size);
-				if (Ret < 0) {
-					if (IgnoreDecodeErrors) {
-						(*TrackIndices)[Track].clear();
-						IndexMask &= ~(1 << Track);					
-						break;
-					} else {
-						_snprintf(ErrorMsg, MsgSize, "Audio decoding error");
-						delete TrackIndices;
-						return NULL;
-					}
-				}
-
-				if (Ret > 0) {
-					Size -= Ret;
-					Data += Ret;
-				}
-
-				if (dbsize > 0)
-					AudioContexts[Track].CurrentSample += (dbsize * 8) / (av_get_bits_per_sample_format(AudioCodecContext->sample_fmt) * AudioCodecContext->channels);
-
-				if (dbsize > 0 && (DumpMask & (1 << Track))) {
-					// Delay writer creation until after an audio frame has been decoded. This ensures that all parameters are known when writing the headers.
-					if (!AudioContexts[Track].W64W) {
-						char ABuf[50];
-						std::string WN(AudioFile);
-						int Offset = StartTime * mkv_TruncFloat(mkv_GetTrackInfo(MF, Track)->TimecodeScale) / (double)1000000;
-						_snprintf(ABuf, sizeof(ABuf), ".%02d.delay.%d.w64", Track, Offset);
-						WN += ABuf;
-						
-						AudioContexts[Track].W64W = new Wave64Writer(WN.c_str(), av_get_bits_per_sample_format(AudioCodecContext->sample_fmt),
-							AudioCodecContext->channels, AudioCodecContext->sample_rate, AudioFMTIsFloat(AudioCodecContext->sample_fmt));
-					}
-
-					AudioContexts[Track].W64W->WriteData(db, dbsize);
-				}
-			}
-		}
-	}
-
-	SortTrackIndices(TrackIndices);
-	return TrackIndices;
-}
-
-FrameIndex *MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize) {
-	AVFormatContext *FormatContext = NULL;
-	IndexMask |= DumpMask;
-
-	if (av_open_input_file(&FormatContext, SourceFile, NULL, 0, NULL) != 0) {
-		_snprintf(ErrorMsg, MsgSize, "Can't open '%s'", SourceFile);
-		return NULL;
-	}
-
-	// Do matroska indexing instead?
-	if (!strcmp(FormatContext->iformat->name, "matroska")) {
-		av_close_input_file(FormatContext);
-		return MakeMatroskaIndex(SourceFile, IndexMask, DumpMask, AudioFile, IgnoreDecodeErrors, IP, Private, ErrorMsg, MsgSize);
-	}
-
-#ifdef HAALITS
-	// Do haali ts indexing instead?
-	if (!strcmp(FormatContext->iformat->name, "mpegts")) {
-		av_close_input_file(FormatContext);
-		return MakeHaaliTSIndex(SourceFile, IndexMask, DumpMask, AudioFile, IgnoreDecodeErrors, IP, Private, ErrorMsg, MsgSize);
-	}
-#endif
-	
-	if (av_find_stream_info(FormatContext) < 0) {
-		av_close_input_file(FormatContext);
-		_snprintf(ErrorMsg, MsgSize, "Couldn't find stream information");
-		return NULL;
-	}
-
-	// Audio stuff
-
-	int16_t *db;
-	FFAudioContext *AudioContexts;
-	FFIndexMemory IM = FFIndexMemory(FormatContext->nb_streams, db, AudioContexts, FormatContext);
-
-	for (unsigned int i = 0; i < FormatContext->nb_streams; i++) {
-		if (IndexMask & (1 << i) && FormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO) {
-			AVCodecContext *AudioCodecContext = FormatContext->streams[i]->codec;
-
-			AVCodec *AudioCodec = avcodec_find_decoder(AudioCodecContext->codec_id);
-			if (AudioCodec == NULL) {
-				_snprintf(ErrorMsg, MsgSize, "Audio codec not found");
-				return NULL;
-			}
-
-			if (avcodec_open(AudioCodecContext, AudioCodec) < 0) {
-				_snprintf(ErrorMsg, MsgSize, "Could not open audio codec");
-				return NULL;
-			}
-
-			AudioContexts[i].CTX = AudioCodecContext;
-		} else {
-			IndexMask &= ~(1 << i);
-		}
-	}
-
-	//
-
-	FrameIndex *TrackIndices = new FrameIndex();
-	TrackIndices->Decoder = 0;
-
-	for (unsigned int i = 0; i < FormatContext->nb_streams; i++)
-		TrackIndices->push_back(FrameInfoVector(FormatContext->streams[i]->time_base.num * 1000, 
-		FormatContext->streams[i]->time_base.den,
-		FormatContext->streams[i]->codec->codec_type));
-
-	AVPacket Packet;
-	while (av_read_frame(FormatContext, &Packet) >= 0) {
-		// Update progress
-		if (IP) {
-			if ((*IP)(0, FormatContext->pb->pos, FormatContext->file_size, Private)) {
-				_snprintf(ErrorMsg, MsgSize, "Cancelled by user");
-				delete TrackIndices;
-				return NULL;
-			}
-		}
-
-		// Only create index entries for video for now to save space
-		if (FormatContext->streams[Packet.stream_index]->codec->codec_type == CODEC_TYPE_VIDEO) {
-			(*TrackIndices)[Packet.stream_index].push_back(FrameInfo(Packet.dts, (Packet.flags & PKT_FLAG_KEY) ? 1 : 0));
-		} else if (FormatContext->streams[Packet.stream_index]->codec->codec_type == CODEC_TYPE_AUDIO && (IndexMask & (1 << Packet.stream_index))) {
-			(*TrackIndices)[Packet.stream_index].push_back(FrameInfo(Packet.dts, AudioContexts[Packet.stream_index].CurrentSample, (Packet.flags & PKT_FLAG_KEY) ? 1 : 0));
-			AVCodecContext *AudioCodecContext = FormatContext->streams[Packet.stream_index]->codec;
-			int Size = Packet.size;
-			uint8_t *Data = Packet.data;
-
-			while (Size > 0) {
-				int dbsize = AVCODEC_MAX_AUDIO_FRAME_SIZE*10;
-				int Ret = avcodec_decode_audio2(AudioCodecContext, db, &dbsize, Data, Size);
-				if (Ret < 0) {
-					if (IgnoreDecodeErrors) {
-						(*TrackIndices)[Packet.stream_index].clear();
-						IndexMask &= ~(1 << Packet.stream_index);					
-						break;
-					} else {
-						_snprintf(ErrorMsg, MsgSize, "Audio decoding error");
-						delete TrackIndices;
-						return NULL;
-					}
-				}
-
-				if (Ret > 0) {
-					Size -= Ret;
-					Data += Ret;
-				}
-
-				if (dbsize > 0)
-					AudioContexts[Packet.stream_index].CurrentSample += (dbsize * 8) / (av_get_bits_per_sample_format(AudioCodecContext->sample_fmt) * AudioCodecContext->channels);
-
-				if (dbsize > 0 && (DumpMask & (1 << Packet.stream_index))) {
-					// Delay writer creation until after an audio frame has been decoded. This ensures that all parameters are known when writing the headers.
-					if (!AudioContexts[Packet.stream_index].W64W) {
-						char ABuf[50];
-						std::string WN(AudioFile);
-						int Offset = (Packet.dts * FormatContext->streams[Packet.stream_index]->time_base.num)
-							/ (double)(FormatContext->streams[Packet.stream_index]->time_base.den * 1000);
-						_snprintf(ABuf, sizeof(ABuf), ".%02d.delay.%d.w64", Packet.stream_index, Offset);
-						WN += ABuf;
-						
-						AudioContexts[Packet.stream_index].W64W = new Wave64Writer(WN.c_str(), av_get_bits_per_sample_format(AudioCodecContext->sample_fmt),
-							AudioCodecContext->channels, AudioCodecContext->sample_rate, AudioFMTIsFloat(AudioCodecContext->sample_fmt));
-					}
-
-					AudioContexts[Packet.stream_index].W64W->WriteData(db, dbsize);
-				}
-			}
-		}
-
-		av_free_packet(&Packet);
-	}
-
-	SortTrackIndices(TrackIndices);
-	return TrackIndices;
-}
-
-FrameIndex *ReadIndex(const char *IndexFile, char *ErrorMsg, unsigned MsgSize) {
-	std::ifstream Index(IndexFile, std::ios::in | std::ios::binary);
-
-	if (!Index.is_open()) {
-		_snprintf(ErrorMsg, MsgSize, "Failed to open '%s' for reading", IndexFile);
-		return NULL;
-	}
-	
-	// Read the index file header
-	IndexHeader IH;
-	Index.read(reinterpret_cast<char *>(&IH), sizeof(IH));
-	if (IH.Id != INDEXID) {
-		_snprintf(ErrorMsg, MsgSize, "'%s' is not a valid index file", IndexFile);
-		return NULL;
-	}
-
-	if (IH.Version != INDEXVERSION) {
-		_snprintf(ErrorMsg, MsgSize, "'%s' is not the expected index version", IndexFile);
-		return NULL;
-	}
-
-	FrameIndex *TrackIndices = new FrameIndex();
-
-	try {
-
-		TrackIndices->Decoder = IH.Decoder;
-
-		for (unsigned int i = 0; i < IH.Tracks; i++) {
-			// Read how many records belong to the current stream
-			int TT;
-			Index.read(reinterpret_cast<char *>(&TT), sizeof(TT));
-			int Num;
-			Index.read(reinterpret_cast<char *>(&Num), sizeof(Num));
-			int Den;
-			Index.read(reinterpret_cast<char *>(&Den), sizeof(Den));
-			size_t Frames;
-			Index.read(reinterpret_cast<char *>(&Frames), sizeof(Frames));
-			TrackIndices->push_back(FrameInfoVector(Num, Den, TT));
-
-			FrameInfo FI(0, false);
-			for (size_t j = 0; j < Frames; j++) {
-				Index.read(reinterpret_cast<char *>(&FI), sizeof(FrameInfo));
-				TrackIndices->at(i).push_back(FI);
-			}
-		}
-
-	} catch (...) {
-		delete TrackIndices;
-		_snprintf(ErrorMsg, MsgSize, "Unknown error while reading index information in '%s'", IndexFile);	
-		return NULL;
-	}
-
-	return TrackIndices;
-}
-
-int FrameInfoVector::WriteTimecodes(const char *TimecodeFile, char *ErrorMsg, unsigned MsgSize) {
-	std::ofstream Timecodes(TimecodeFile, std::ios::out | std::ios::trunc);
-
-	if (!Timecodes.is_open()) {
-		_snprintf(ErrorMsg, MsgSize, "Failed to open '%s' for writing", TimecodeFile);
-		return 1;
-	}
-
-	Timecodes << "# timecode format v2\n";
-
-	for (iterator Cur=begin(); Cur!=end(); Cur++)
-		Timecodes << (int64_t)((Cur->DTS * TB.Num) / (double)TB.Den) << "\n";
-
-	return 0;
-}
-
-int FrameInfoVector::FrameFromDTS(int64_t DTS) {
-	for (int i = 0; i < static_cast<int>(size()); i++)
-		if (at(i).DTS == DTS)
-			return i;
-	return -1;
-}
-
-int FrameInfoVector::ClosestFrameFromDTS(int64_t DTS) {
-	int Frame = 0; 
-	int64_t BestDiff = 0xFFFFFFFFFFFFFFLL; // big number
-	for (int i = 0; i < static_cast<int>(size()); i++) {
-		int64_t CurrentDiff = FFABS(at(i).DTS - DTS);
-		if (CurrentDiff < BestDiff) {
-			BestDiff = CurrentDiff;
-			Frame = i;
-		}
-	}
-
-	//int64_t tmp = at(2).DTS -  at(1).DTS;
-	//ATLASSERT(BestDiff == 0);
-	return Frame;
-}
-
-int FrameInfoVector::FindClosestKeyFrame(int Frame) {
-	Frame = FFMIN(FFMAX(Frame, 0), size() - 1);
-	for (int i = Frame; i > 0; i--)
-		if (at(i).KeyFrame)
-			return i;
-	return 0;
-}
-
-FrameInfoVector::FrameInfoVector() {
-	this->TT = 0;
-	this->TB.Num = 0; 
-	this->TB.Den = 0;
-}
-
-FrameInfoVector::FrameInfoVector(int Num, int Den, int TT) {
-	this->TT = TT;
-	this->TB.Num = Num; 
-	this->TB.Den = Den;
-}

FFmpegSource2/indexing.h

@@ -1,61 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef INDEXING_H
-#define	INDEXING_H
-
-#include <vector>
-#include "utils.h"
-#include "ffms.h"
-
-#define INDEXVERSION 11
-#define INDEXID 0x53920873
-
-struct IndexHeader {
-	uint32_t Id;
-	uint32_t Version;
-	uint32_t Tracks;
-	uint32_t Decoder;
-};
-
-class FrameInfoVector : public std::vector<FrameInfo> {
-public:
-	int TT;
-	TrackTimeBase TB;
-
-	int FindClosestKeyFrame(int Frame);
-	int FrameFromDTS(int64_t DTS);
-	int ClosestFrameFromDTS(int64_t DTS);
-	int WriteTimecodes(const char *TimecodeFile, char *ErrorMsg, unsigned MsgSize);
-
-	FrameInfoVector();
-	FrameInfoVector(int Num, int Den, int TT);
-};
-
-class FrameIndex : public std::vector<FrameInfoVector> {
-public:
-	int Decoder;
-};
-
-FrameIndex *MakeIndex(const char *SourceFile, int IndexMask, int DumpMask, const char *AudioFile, bool IgnoreDecodeErrors, IndexCallback IP, void *Private, char *ErrorMsg, unsigned MsgSize);
-FrameIndex *ReadIndex(const char *IndexFile, char *ErrorMsg, unsigned MsgSize);
-int WriteIndex(const char *IndexFile, FrameIndex *TrackIndices, char *ErrorMsg, unsigned MsgSize);
-
-#endif

FFmpegSource2/stdiostream.c

@@ -1,111 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "stdiostream.h"
-#include <errno.h>
-
-#ifdef __UNIX__
-#define _fseeki64 fseeko
-#define _ftelli64 ftello
-#endif
-
-
-/* StdIoStream methods */
-
-/* read count bytes into buffer starting at file position pos
- * return the number of bytes read, -1 on error or 0 on EOF
- */
-int StdIoRead(StdIoStream *st, ulonglong pos, void *buffer, int count) {
-  size_t  rd;
-  if (_fseeki64(st->fp, pos, SEEK_SET)) {
-    st->error = errno;
-    return -1;
-  }
-  rd = fread(buffer, 1, count, st->fp);
-  if (rd == 0) {
-    if (feof(st->fp))
-      return 0;
-    st->error = errno;
-    return -1;
-  }
-  return rd;
-}
-
-/* scan for a signature sig(big-endian) starting at file position pos
- * return position of the first byte of signature or -1 if error/not found
- */
-longlong StdIoScan(StdIoStream *st, ulonglong start, unsigned signature) {
-  int	      c;
-  unsigned    cmp = 0;
-  FILE	      *fp = st->fp;
-
-  if (_fseeki64(fp, start, SEEK_SET))
-    return -1;
-
-  while ((c = getc(fp)) != EOF) {
-    cmp = ((cmp << 8) | c) & 0xffffffff;
-    if (cmp == signature)
-      return _ftelli64(fp) - 4;
-  }
-
-  return -1;
-}
-
-/* return cache size, this is used to limit readahead */
-unsigned StdIoGetCacheSize(StdIoStream *st) {
-  return CACHESIZE;
-}
-
-/* return last error message */
-const char *StdIoGetLastError(StdIoStream *st) {
-  return strerror(st->error);
-}
-
-/* memory allocation, this is done via stdlib */
-void *StdIoMalloc(StdIoStream *st, size_t size) {
-  return malloc(size);
-}
-
-void *StdIoRealloc(StdIoStream *st, void *mem, size_t size) {
-  return realloc(mem,size);
-}
-
-void StdIoFree(StdIoStream *st, void *mem) {
-  free(mem);
-}
-
-/* progress report handler for lengthy operations
- * returns 0 to abort operation, nonzero to continue
- */
-int StdIoProgress(StdIoStream *st, ulonglong cur, ulonglong max) {
-  return 1;
-}
-
-void InitStdIoStream(StdIoStream *st) {
-	memset(st,0,sizeof(st));
-	st->base.read = StdIoRead;
-	st->base.scan = StdIoScan;
-	st->base.getcachesize = StdIoGetCacheSize;
-	st->base.geterror = StdIoGetLastError;
-	st->base.memalloc = StdIoMalloc;
-	st->base.memrealloc = StdIoRealloc;
-	st->base.memfree = StdIoFree;
-	st->base.progress = StdIoProgress;
-}

FFmpegSource2/stdiostream.h

@@ -1,80 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef STDIOSTREAM_H
-#define STDIOSTREAM_H
-
-#include <stdlib.h>
-#include <stdio.h>
-#include <string.h>
-#include "MatroskaParser.h"
-
-#define	CACHESIZE 65536
-
-/************\
-* Structures *
-\************/
-
-/* first we need to create an I/O object that the parser will use to read the
- * source file
- */
-struct StdIoStream {
-  struct InputStream  base;
-  FILE		      *fp;
-  int		      error;
-};
-
-typedef struct StdIoStream StdIoStream;
-
-/***********\
-* Functions *
-\***********/
-
-/* read count bytes into buffer starting at file position pos
- * return the number of bytes read, -1 on error or 0 on EOF
- */
-int StdIoRead(StdIoStream *st, ulonglong pos, void *buffer, int count);
-
-/* scan for a signature sig(big-endian) starting at file position pos
- * return position of the first byte of signature or -1 if error/not found
- */
-longlong StdIoScan(StdIoStream *st, ulonglong start, unsigned signature);
-
-/* return cache size, this is used to limit readahead */
-unsigned StdIoGetCacheSize(StdIoStream *st);
-
-/* return last error message */
-const char *StdIoGetLastError(StdIoStream *st);
-
-/* memory allocation, this is done via stdlib */
-void  *StdIoMalloc(StdIoStream *st, size_t size);
-
-void  *StdIoRealloc(StdIoStream *st, void *mem, size_t size);
-
-void  StdIoFree(StdIoStream *st, void *mem);
-
-/* progress report handler for lengthy operations
- * returns 0 to abort operation, nonzero to continue
- */
-int   StdIoProgress(StdIoStream *st, ulonglong cur, ulonglong max);
-
-void InitStdIoStream(StdIoStream *st);
-
-#endif /* #ifndef STDIOSTREAM_H */

FFmpegSource2/utils.cpp

@@ -1,444 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "utils.h"
-#include <string.h>
-#include <errno.h>
-#ifdef _MSC_VER
-#	include <intrin.h>
-#endif
-
-#ifdef __UNIX__
-#define _fseeki64 fseeko
-#define _ftelli64 ftello
-#define _snprintf snprintf
-#endif
-
-int GetCPUFlags() {
-// FIXME Add proper feature detection when msvc isn't used
-	int Flags = PP_CPU_CAPS_MMX | PP_CPU_CAPS_MMX2;
-
-#ifdef _MSC_VER
-	Flags = 0;
-	int CPUInfo[4];
-	__cpuid(CPUInfo, 0);
-
-	// PP and SWS defines have the same values for their defines so this actually works
-	if (CPUInfo[3] & (1 << 23))
-		Flags |= PP_CPU_CAPS_MMX;
-	if (CPUInfo[3] & (1 << 25))
-		Flags |= PP_CPU_CAPS_MMX2;
-#endif
-
-	return Flags;
-}
-
-int ReadFrame(uint64_t FilePos, unsigned int &FrameSize, CompressedStream *CS, MatroskaReaderContext &Context, char *ErrorMsg, unsigned MsgSize) {
-	if (CS) {
-		char CSBuffer[4096];
-
-		unsigned int DecompressedFrameSize = 0;
-
-		cs_NextFrame(CS, FilePos, FrameSize);
-
-		for (;;) {
-			int ReadBytes = cs_ReadData(CS, CSBuffer, sizeof(CSBuffer));
-			if (ReadBytes < 0) {
-				_snprintf(ErrorMsg, MsgSize, "Error decompressing data: %s", cs_GetLastError(CS));
-				return 1;
-			}
-			if (ReadBytes == 0) {
-				FrameSize = DecompressedFrameSize;
-				return 0;
-			}
-
-			if (Context.BufferSize < DecompressedFrameSize + ReadBytes) {
-				Context.BufferSize = FrameSize;
-				Context.Buffer = (uint8_t *)realloc(Context.Buffer, Context.BufferSize + 16);
-				if (Context.Buffer == NULL)  {
-					_snprintf(ErrorMsg, MsgSize, "Out of memory");
-					return 2;
-				}
-			}
-
-			memcpy(Context.Buffer + DecompressedFrameSize, CSBuffer, ReadBytes);
-			DecompressedFrameSize += ReadBytes;
-		}
-	} else {
-		if (_fseeki64(Context.ST.fp, FilePos, SEEK_SET)) {
-			_snprintf(ErrorMsg, MsgSize, "fseek(): %s", strerror(errno));
-			return 3;
-		}
-
-		if (Context.BufferSize < FrameSize) {
-			Context.BufferSize = FrameSize;
-			Context.Buffer = (uint8_t *)realloc(Context.Buffer, Context.BufferSize + 16);
-			if (Context.Buffer == NULL) {
-				_snprintf(ErrorMsg, MsgSize, "Out of memory");
-				return 4;
-			}
-		}
-
-		size_t ReadBytes = fread(Context.Buffer, 1, FrameSize, Context.ST.fp);
-		if (ReadBytes != FrameSize) {
-			if (ReadBytes == 0) {
-				if (feof(Context.ST.fp)) {
-					_snprintf(ErrorMsg, MsgSize, "Unexpected EOF while reading frame");
-					return 5;
-				} else {
-					_snprintf(ErrorMsg, MsgSize, "Error reading frame: %s", strerror(errno));
-					return 6;
-				}
-			} else {
-				_snprintf(ErrorMsg, MsgSize, "Short read while reading frame");
-				return 7;
-			}
-			_snprintf(ErrorMsg, MsgSize, "Unknown read error");
-			return 8;
-		}
-
-		return 0;
-	}
-
-	FrameSize = 0;
-	return 0;
-}
-
-bool AudioFMTIsFloat(SampleFormat FMT){
-	switch (FMT) {
-		case SAMPLE_FMT_FLT:
-		case SAMPLE_FMT_DBL:
-			  return true;
-		default:
-			return false;
-	}
-}
-
-// used for matroska<->ffmpeg codec ID mapping to avoid Win32 dependency
-typedef struct BITMAPINFOHEADER {
-        uint32_t      biSize;
-        int32_t       biWidth;
-        int32_t       biHeight;
-        uint16_t      biPlanes;
-        uint16_t      biBitCount;
-        uint32_t      biCompression;
-        uint32_t      biSizeImage;
-        int32_t       biXPelsPerMeter;
-        int32_t       biYPelsPerMeter;
-        uint32_t      biClrUsed;
-        uint32_t      biClrImportant;
-} BITMAPINFOHEADER;
-
-#define MAKEFOURCC(ch0, ch1, ch2, ch3)\
-	((uint32_t)(uint8_t)(ch0) | ((uint32_t)(uint8_t)(ch1) << 8) |\
-	((uint32_t)(uint8_t)(ch2) << 16) | ((uint32_t)(uint8_t)(ch3) << 24 ))
-
-CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate) {
-/* Video Codecs */
-	if (!strcmp(Codec, "V_MS/VFW/FOURCC")) {
-		// fourcc list from ffdshow
-		switch (((BITMAPINFOHEADER *)CodecPrivate)->biCompression) {
-			case MAKEFOURCC('F', 'F', 'D', 'S'):
-			case MAKEFOURCC('F', 'V', 'F', 'W'):
-			case MAKEFOURCC('X', 'V', 'I', 'D'):
-			case MAKEFOURCC('D', 'I', 'V', 'X'):
-			case MAKEFOURCC('D', 'X', '5', '0'):
-			case MAKEFOURCC('M', 'P', '4', 'V'):
-			case MAKEFOURCC('m', 'p', '4', 'v'): // This one may be my fault
-			case MAKEFOURCC('3', 'I', 'V', 'X'):
-			case MAKEFOURCC('W', 'V', '1', 'F'):
-			case MAKEFOURCC('F', 'M', 'P', '4'):
-			case MAKEFOURCC('S', 'M', 'P', '4'):
-				return CODEC_ID_MPEG4;
-			case MAKEFOURCC('D', 'I', 'V', '3'):
-			case MAKEFOURCC('D', 'V', 'X', '3'):
-			case MAKEFOURCC('M', 'P', '4', '3'):
-				return CODEC_ID_MSMPEG4V3;
-			case MAKEFOURCC('M', 'P', '4', '2'):
-				return CODEC_ID_MSMPEG4V2;
-			case MAKEFOURCC('M', 'P', '4', '1'):
-				return CODEC_ID_MSMPEG4V1;
-			case MAKEFOURCC('W', 'M', 'V', '1'):
-				return CODEC_ID_WMV1;
-			case MAKEFOURCC('W', 'M', 'V', '2'):
-				return CODEC_ID_WMV2;
-			case MAKEFOURCC('W', 'M', 'V', '3'):
-				return CODEC_ID_WMV3;
-/*
-			case MAKEFOURCC('M', 'S', 'S', '1'):
-			case MAKEFOURCC('M', 'S', 'S', '2'):
-			case MAKEFOURCC('W', 'V', 'P', '2'):
-			case MAKEFOURCC('W', 'M', 'V', 'P'):
-				return CODEC_ID_WMV9_LIB;
-*/
-			case MAKEFOURCC('W', 'V', 'C', '1'):
-				return CODEC_ID_VC1;
-			case MAKEFOURCC('V', 'P', '5', '0'):
-				return CODEC_ID_VP5;
-			case MAKEFOURCC('V', 'P', '6', '0'):
-			case MAKEFOURCC('V', 'P', '6', '1'):
-			case MAKEFOURCC('V', 'P', '6', '2'):
-				return CODEC_ID_VP6;
-			case MAKEFOURCC('V', 'P', '6', 'F'):
-			case MAKEFOURCC('F', 'L', 'V', '4'):
-				return CODEC_ID_VP6F;	
-			case MAKEFOURCC('C', 'A', 'V', 'S'):
-				return CODEC_ID_CAVS;	
-			case MAKEFOURCC('M', 'P', 'G', '1'):
-			case MAKEFOURCC('M', 'P', 'E', 'G'):
-				return CODEC_ID_MPEG2VIDEO;	// not a typo
-			case MAKEFOURCC('M', 'P', 'G', '2'):
-			case MAKEFOURCC('E', 'M', '2', 'V'):
-			case MAKEFOURCC('M', 'M', 'E', 'S'):
-				return CODEC_ID_MPEG2VIDEO;
-			case MAKEFOURCC('H', '2', '6', '3'):
-			case MAKEFOURCC('S', '2', '6', '3'):
-			case MAKEFOURCC('L', '2', '6', '3'):
-			case MAKEFOURCC('M', '2', '6', '3'):
-			case MAKEFOURCC('U', '2', '6', '3'):
-			case MAKEFOURCC('X', '2', '6', '3'):
-				return CODEC_ID_H263;
-			case MAKEFOURCC('H', '2', '6', '4'):
-			case MAKEFOURCC('X', '2', '6', '4'):
-			case MAKEFOURCC('V', 'S', 'S', 'H'):
-			case MAKEFOURCC('D', 'A', 'V', 'C'):
-			case MAKEFOURCC('P', 'A', 'V', 'C'):
-			case MAKEFOURCC('A', 'V', 'C', '1'):
-				return CODEC_ID_H264;
-			case MAKEFOURCC('M', 'J', 'P', 'G'):
-			case MAKEFOURCC('L', 'J', 'P', 'G'):
-			case MAKEFOURCC('M', 'J', 'L', 'S'):
-			case MAKEFOURCC('J', 'P', 'E', 'G'): // questionable fourcc?
-			case MAKEFOURCC('A', 'V', 'R', 'N'):
-			case MAKEFOURCC('M', 'J', 'P', 'A'):
-				return CODEC_ID_MJPEG;
-			case MAKEFOURCC('D', 'V', 'S', 'D'):
-			case MAKEFOURCC('D', 'V', '2', '5'):
-			case MAKEFOURCC('D', 'V', '5', '0'):
-			case MAKEFOURCC('C', 'D', 'V', 'C'):
-			case MAKEFOURCC('C', 'D', 'V', '5'):
-			case MAKEFOURCC('D', 'V', 'I', 'S'):
-			case MAKEFOURCC('P', 'D', 'V', 'C'):
-				return CODEC_ID_DVVIDEO;
-			case MAKEFOURCC('H', 'F', 'Y', 'U'):
-				return CODEC_ID_HUFFYUV;
-			case MAKEFOURCC('F', 'F', 'V', 'H'):
-				return CODEC_ID_FFVHUFF;
-			case MAKEFOURCC('C', 'Y', 'U', 'V'):
-				return CODEC_ID_CYUV;
-			case MAKEFOURCC('A', 'S', 'V', '1'):
-				return CODEC_ID_ASV1;
-			case MAKEFOURCC('A', 'S', 'V', '2'):
-				return CODEC_ID_ASV2;
-			case MAKEFOURCC('V', 'C', 'R', '1'):
-				return CODEC_ID_VCR1;
-			case MAKEFOURCC('T', 'H', 'E', 'O'):
-				return CODEC_ID_THEORA;
-			case MAKEFOURCC('S', 'V', 'Q', '1'):
-				return CODEC_ID_SVQ1;
-			case MAKEFOURCC('S', 'V', 'Q', '3'):
-				return CODEC_ID_SVQ3;
-			case MAKEFOURCC('R', 'P', 'Z', 'A'):
-				return CODEC_ID_RPZA;
-			case MAKEFOURCC('F', 'F', 'V', '1'):
-				return CODEC_ID_FFV1;
-			case MAKEFOURCC('V', 'P', '3', '1'):
-				return CODEC_ID_VP3;
-			case MAKEFOURCC('R', 'L', 'E', '8'):
-				return CODEC_ID_MSRLE;
-			case MAKEFOURCC('M', 'S', 'Z', 'H'):
-				return CODEC_ID_MSZH;
-			case MAKEFOURCC('Z', 'L', 'I', 'B'):
-				return CODEC_ID_ZLIB;
-			case MAKEFOURCC('F', 'L', 'V', '1'):
-				return CODEC_ID_FLV1;
-/*
-			case MAKEFOURCC('P', 'N', 'G', '1'):
-				return CODEC_ID_COREPNG;
-*/
-			case MAKEFOURCC('M', 'P', 'N', 'G'):
-				return CODEC_ID_PNG;
-/*
-			case MAKEFOURCC('A', 'V', 'I', 'S'):
-				return CODEC_ID_AVISYNTH;
-*/
-			case MAKEFOURCC('C', 'R', 'A', 'M'):
-				return CODEC_ID_MSVIDEO1;
-			case MAKEFOURCC('R', 'T', '2', '1'):
-				return CODEC_ID_INDEO2;
-			case MAKEFOURCC('I', 'V', '3', '2'):
-			case MAKEFOURCC('I', 'V', '3', '1'):
-				return CODEC_ID_INDEO3;
-			case MAKEFOURCC('C', 'V', 'I', 'D'):
-				return CODEC_ID_CINEPAK;
-			case MAKEFOURCC('R', 'V', '1', '0'):
-				return CODEC_ID_RV10;
-			case MAKEFOURCC('R', 'V', '2', '0'):
-				return CODEC_ID_RV20;
-			case MAKEFOURCC('8', 'B', 'P', 'S'):
-				return CODEC_ID_8BPS;
-			case MAKEFOURCC('Q', 'R', 'L', 'E'):
-				return CODEC_ID_QTRLE;
-			case MAKEFOURCC('D', 'U', 'C', 'K'):
-				return CODEC_ID_TRUEMOTION1;
-			case MAKEFOURCC('T', 'M', '2', '0'):
-				return CODEC_ID_TRUEMOTION2;
-			case MAKEFOURCC('T', 'S', 'C', 'C'):
-				return CODEC_ID_TSCC;
-			case MAKEFOURCC('S', 'N', 'O', 'W'):
-				return CODEC_ID_SNOW;
-			case MAKEFOURCC('Q', 'P', 'E', 'G'):
-			case MAKEFOURCC('Q', '1', '_', '0'):
-			case MAKEFOURCC('Q', '1', '_', '1'):
-				return CODEC_ID_QPEG;
-			case MAKEFOURCC('H', '2', '6', '1'):
-			case MAKEFOURCC('M', '2', '6', '1'):
-				return CODEC_ID_H261;
-			case MAKEFOURCC('L', 'O', 'C', 'O'):
-				return CODEC_ID_LOCO;
-			case MAKEFOURCC('W', 'N', 'V', '1'):
-				return CODEC_ID_WNV1;
-			case MAKEFOURCC('C', 'S', 'C', 'D'):
-				return CODEC_ID_CSCD;
-			case MAKEFOURCC('Z', 'M', 'B', 'V'):
-				return CODEC_ID_ZMBV;
-			case MAKEFOURCC('U', 'L', 'T', 'I'):
-				return CODEC_ID_ULTI;
-			case MAKEFOURCC('V', 'I', 'X', 'L'):
-				return CODEC_ID_VIXL;
-			case MAKEFOURCC('A', 'A', 'S', 'C'):
-				return CODEC_ID_AASC;
-			case MAKEFOURCC('F', 'P', 'S', '1'):
-				return CODEC_ID_FRAPS;
-			default:
-				return CODEC_ID_NONE;
-		}
-
-	} else if (!strcmp(Codec, "V_MPEG4/ISO/AVC"))
-		return CODEC_ID_H264;
-	else if (!strcmp(Codec, "V_MPEG4/ISO/AP"))
-		return CODEC_ID_MPEG4;
-	else if (!strcmp(Codec, "V_MPEG4/ISO/ASP"))
-		return CODEC_ID_MPEG4;
-	else if (!strcmp(Codec, "V_MPEG4/ISO/SP"))
-		return CODEC_ID_MPEG4;
-	else if (!strcmp(Codec, "V_MPEG4/MS/V3"))
-		return CODEC_ID_MSMPEG4V3;
-	else if (!strcmp(Codec, "V_MPEG2"))
-		return CODEC_ID_MPEG2VIDEO;
-	else if (!strcmp(Codec, "V_MPEG1"))
-		return CODEC_ID_MPEG2VIDEO; // still not a typo
-	else if (!strcmp(Codec, "V_VC1"))
-		return CODEC_ID_VC1;
-	else if (!strcmp(Codec, "V_SNOW"))
-		return CODEC_ID_SNOW;
-	else if (!strcmp(Codec, "V_THEORA"))
-		return CODEC_ID_THEORA;
-	else if (!strcmp(Codec, "V_UNCOMPRESSED"))
-		return CODEC_ID_NONE; // bleh
-	else if (!strcmp(Codec, "V_QUICKTIME"))
-		return CODEC_ID_SVQ3; // no idea if this is right
-	else if (!strcmp(Codec, "V_CIPC"))
-		return CODEC_ID_NONE; // don't know, don't care
-	else if (!strncmp(Codec, "V_REAL/RV", 9)) {
-		switch (Codec[9]) {
-			case '1': 
-				return CODEC_ID_RV10;
-			case '2': 
-				return CODEC_ID_RV20;
-			case '3': 
-				return CODEC_ID_RV30;
-			case '4': 
-				return CODEC_ID_RV40;
-			default:
-				return CODEC_ID_NONE;
-		}
-/* Audio Codecs */
-	} else if (!strcmp(Codec, "A_AC3"))
-		return CODEC_ID_AC3;
-	else if (!strcmp(Codec, "A_EAC3"))
-		return CODEC_ID_AC3;
-	else if (!strcmp(Codec, "A_MPEG/L3"))
-		return CODEC_ID_MP3;
-	else if (!strcmp(Codec, "A_MPEG/L2"))
-		return CODEC_ID_MP2;
-	else if (!strcmp(Codec, "A_MPEG/L1"))
-		return CODEC_ID_MP2; // correct?
-	else if (!strcmp(Codec, "A_DTS"))
-		return CODEC_ID_DTS;
-	else if (!strcmp(Codec, "A_PCM/INT/LIT")) {
-/* FIXME
-		switch (TI->AV.Audio.BitDepth) {
-			case 8: return CODEC_ID_PCM_S8;
-			case 16: return CODEC_ID_PCM_S16LE;
-			case 24: return CODEC_ID_PCM_S24LE;
-			case 32: return CODEC_ID_PCM_S32LE;
-			default: return CODEC_ID_NONE;
-		}
-*/
-		return CODEC_ID_NONE;
-	} else if (!strcmp(Codec, "A_PCM/INT/BIG")) {
-/* FIXME
-		switch (TI->AV.Audio.BitDepth) {
-			case 8: return CODEC_ID_PCM_S8;
-			case 16: return CODEC_ID_PCM_S16BE;
-			case 24: return CODEC_ID_PCM_S24BE;
-			case 32: return CODEC_ID_PCM_S32BE;
-			default: return CODEC_ID_NONE;
-		}
-*/
-		return CODEC_ID_NONE;
-	} else if (!strcmp(Codec, "A_PCM/FLOAT/IEEE"))
-		return CODEC_ID_PCM_F32LE; // only a most likely guess, may do bad things
-	else if (!strcmp(Codec, "A_FLAC"))
-		return CODEC_ID_FLAC;
-	else if (!strcmp(Codec, "A_MPC"))
-		return CODEC_ID_MUSEPACK8; // or is it CODEC_ID_MUSEPACK7? both?
-	else if (!strcmp(Codec, "A_TTA1"))
-		return CODEC_ID_TTA;
-	else if (!strcmp(Codec, "A_WAVPACK4"))
-		return CODEC_ID_WAVPACK;
-	else if (!strcmp(Codec, "A_VORBIS"))
-		return CODEC_ID_VORBIS;
-	else if (!strcmp(Codec, "A_REAL/14_4"))
-		return CODEC_ID_RA_144;
-	else if (!strcmp(Codec, "A_REAL/28_8"))
-		return CODEC_ID_RA_288;
-	else if (!strcmp(Codec, "A_REAL/COOK"))
-		return CODEC_ID_COOK;
-	else if (!strcmp(Codec, "A_REAL/SIPR"))
-		return CODEC_ID_NONE; // no sipr codec id?
-	else if (!strcmp(Codec, "A_REAL/ATRC"))
-		return CODEC_ID_ATRAC3;
-	else if (!strncmp(Codec, "A_AAC", 5))
-		return CODEC_ID_AAC;
-	else if (!strcmp(Codec, "A_SPEEX"))
-		return CODEC_ID_SPEEX;
-	else if (!strcmp(Codec, "A_QUICKTIME"))
-		return CODEC_ID_NONE; // no
-	else if (!strcmp(Codec, "A_MS/ACM")) {
-		// nothing useful here anyway?
-		//#include "Mmreg.h"
-		//((WAVEFORMATEX *)TI->CodecPrivate)->wFormatTag
-		return CODEC_ID_NONE;
-	} else {
-		return CODEC_ID_NONE;
-	}
-}

FFmpegSource2/utils.h

@@ -1,56 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef UTILS_H
-#define UTILS_H
-
-extern "C" {
-#include <libavformat/avformat.h>
-#include <libavcodec/avcodec.h>
-#include <libswscale/swscale.h>
-#include <libpostproc/postprocess.h>
-#include <libavutil/sha1.h>
-#include "MatroskaParser.h"
-#include "stdiostream.h"
-}
-
-struct MatroskaReaderContext {
-public:
-	StdIoStream ST;
-	uint8_t *Buffer;
-	unsigned int BufferSize;
-
-	MatroskaReaderContext() {
-		InitStdIoStream(&ST);
-		Buffer = NULL;
-		BufferSize = 0;
-	}
-
-	~MatroskaReaderContext() {
-		free(Buffer);
-	}
-};
-
-int GetCPUFlags();
-int ReadFrame(uint64_t FilePos, unsigned int &FrameSize, CompressedStream *CS, MatroskaReaderContext &Context, char *ErrorMsg, unsigned MsgSize);
-bool AudioFMTIsFloat(SampleFormat FMT);
-CodecID MatroskaToFFCodecID(char *Codec, void *CodecPrivate);
-
-#endif

FFmpegSource2/wave64writer.cpp

@@ -1,112 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#include "wave64writer.h"
-#include <string.h>
-
-#define WAVE_FORMAT_IEEE_FLOAT 0x0003
-#define WAVE_FORMAT_PCM 1
-
-static const uint8_t GuidRIFF[16]={
-	// {66666972-912E-11CF-A5D6-28DB04C10000}
-	0x72, 0x69, 0x66, 0x66, 0x2E, 0x91, 0xCF, 0x11, 0xA5, 0xD6, 0x28, 0xDB, 0x04, 0xC1, 0x00, 0x00
-};
-
-static const uint8_t GuidWAVE[16]={
-	// {65766177-ACF3-11D3-8CD1-00C04F8EDB8A}
-	0x77, 0x61, 0x76, 0x65, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A
-};
-
-static const uint8_t Guidfmt[16]={
-	// {20746D66-ACF3-11D3-8CD1-00C04F8EDB8A}
-	0x66, 0x6D, 0x74, 0x20, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A
-};
-
-static const uint8_t Guiddata[16]={
-	// {61746164-ACF3-11D3-8CD1-00C04F8EDB8A}
-	0x64, 0x61, 0x74, 0x61, 0xF3, 0xAC, 0xD3, 0x11, 0x8C, 0xD1, 0x00, 0xC0, 0x4F, 0x8E, 0xDB, 0x8A
-};
-
-Wave64Writer::Wave64Writer(const char *Filename, uint16_t BitsPerSample, uint16_t Channels, uint32_t SamplesPerSec, bool IsFloat) : std::ofstream(Filename, std::ios::out | std::ios::binary | std::ios::trunc) {
-	BytesWritten = 0;
-	this->BitsPerSample = BitsPerSample;
-	this->Channels = Channels;
-	this->SamplesPerSec = SamplesPerSec;
-	this->IsFloat = IsFloat;
-
-	if (!is_open())
-		throw "Failed to open destination file for writing";
-
-	WriteHeader(true, IsFloat);
-}
-
-Wave64Writer::~Wave64Writer() {
-	WriteHeader(false, IsFloat);
-	close();
-}
-
-void Wave64Writer::WriteHeader(bool Initial, bool IsFloat) {
-	FFMS_WAVEFORMATEX WFEX;
-	if (IsFloat)
-		WFEX.wFormatTag = WAVE_FORMAT_IEEE_FLOAT;
-	else
-		WFEX.wFormatTag = WAVE_FORMAT_PCM;
-	WFEX.nChannels = Channels;
-	WFEX.nSamplesPerSec = SamplesPerSec;
-	WFEX.nAvgBytesPerSec = (BitsPerSample * Channels * SamplesPerSec) / 8;
-	WFEX.nBlockAlign = (BitsPerSample * Channels) / 8;
-	WFEX.wBitsPerSample = BitsPerSample;
-	WFEX.cbSize = 0;
-
-	uint64_t Header[14];
-
-	memset(Header, 0, sizeof(Header));
-
-	memcpy(Header + 0, GuidRIFF, 16);
-	if (Initial) {
-		Header[2] = 0x7F00000000000000ull;
-	} else {
-		Header[2] = BytesWritten + sizeof(Header);
-	}
-
-	memcpy(Header + 3, GuidWAVE, 16);
-	memcpy(Header + 5, Guidfmt, 16);
-
-	Header[7] = 48;
-
-	memcpy(Header + 8, &WFEX, sizeof(WFEX));
-	memcpy(Header + 11, Guiddata, 16);
-
-	if (Initial)
-		Header[13] = 0x7E00000000000000ull;
-	else
-		Header[13] = BytesWritten + 24;
-
-	std::ios::streampos CPos = tellp();
-	seekp(0, std::ios::beg);
-	write(reinterpret_cast<const char *>(Header), sizeof(Header));
-	if (!Initial)
-		seekp(CPos, std::ios::beg);
-}
-
-void Wave64Writer::WriteData(void *Data, std::streamsize Length) {
-	write(reinterpret_cast<char *>(Data), Length);
-	BytesWritten += Length;
-}

FFmpegSource2/wave64writer.h

@@ -1,55 +0,0 @@
-//  Copyright (c) 2007-2008 Fredrik Mellbin
-//
-//  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.
-
-#ifndef WAVE64WRITER_H
-#define	WAVE64WRITER_H
-
-#include <stdint.h>
-#include <iostream>
-#include <fstream>
-
-// this is to avoid depending on windows.h etc.
-typedef struct FFMS_WAVEFORMATEX { 
-	uint16_t wFormatTag; 
-	uint16_t nChannels; 
-	uint32_t nSamplesPerSec; 
-	uint32_t nAvgBytesPerSec; 
-	uint16_t nBlockAlign; 
-	uint16_t wBitsPerSample; 
-	uint16_t cbSize; 
-} FFMS_WAVEFORMATEX;
-
-class Wave64Writer : private std::ofstream {
-public:
-	Wave64Writer(const char *Filename, uint16_t BitsPerSample, uint16_t Channels, uint32_t SamplesPerSec, bool IsFloat);
-	~Wave64Writer();
-	void WriteData(void *Data, std::streamsize Length);
-private:
-	int32_t BitsPerSample;
-	int32_t Channels;
-	uint32_t SamplesPerSec;
-	uint64_t BytesWritten;
-	uint32_t HeaderSize;
-	bool IsFloat;
-
-	void WriteHeader(bool Initial, bool IsFloat);
-};
-
-#endif

INSTALL

@@ -1,2 +0,0 @@
-* To be written.
-

LICENCE

@@ -0,0 +1,44 @@
+Copyright (c) 2004-2012, Aegisub Project
+All rights reserved.
+
+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.
+  * Neither the name of the Aegisub Group nor the names of its contributors
+    may be used to endorse or promote products derived from this software
+    without specific prior written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS 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 COPYRIGHT OWNER 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.
+--- END AEGISUB LICENSE --
+
+Any file that does not have a license in the header is covered by the above
+license with exception to any directories that contain a license file, or are
+covered by another license in the file itself.
+
+The following directories and file are covered by their respective licenses as
+follows:
+
+src/gl/
+ - MIT license. See src/gl/glext.h
+
+src/MatroskaParser.(c|h)
+ - Licensed to BSDL with permission from the author.
+
+universalchardet/
+ - MPL 1.1
+

Makefile.am

@@ -1,63 +0,0 @@
-AUTOMAKE_OPTIONS = foreign
-
-
-if HAVE_UNIVCHARDET
-univchardet = universalchardet
-endif
-
-if HAVE_AUTO3_LUA
-auto3 = auto3
-endif
-
-if WITH_LIBASS
-libass = libass
-endif
-
-if HAVE_PROVIDER_FFMPEGSOURCE
-ffmpegsource = FFmpegSource2
-endif
-
-SUBDIRS = \
-	$(univchardet) \
-	$(auto3) \
-    $(libass) \
-	$(ffmpegsource) \
-	aegisub \
-	automation \
-	po \
-	desktop
-
-osx-bundle:
-	@SHELL@ scripts/osx-bundle.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@ @AEGISUB_VERSION_DATA@
-
-osx-dmg:
-	@SHELL@ scripts/osx-dmg.sh @PACKAGE_TARNAME@-@PACKAGE_VERSION@ "@PACKAGE_TARNAME@ @PACKAGE_VERSION@"
-
-EXTRA_DIST = \
-	intltool-extract.in \
-	intltool-merge.in   \
-	intltool-update.in  \
-	config.guess \
-	config.sub \
-	depcomp \
-	install-sh \
-	missing \
-	INSTALL \
-	README \
-	svn_revision
-
-# m4macros/
-EXTRA_DIST += \
-	m4macros/check_gnu_make.m4 \
-	m4macros/acx_pthread.m4 \
-	m4macros/ac_agi.m4 \
-	m4macros/ax_lang_compiler_ms.m4 \
-	m4macros/ac_agi_mdcpucfg.m4 \
-	m4macros/ax_openmp.m4 \
-	m4macros/ax_check_gl.m4 \
-	m4macros/ac_flag.m4
-
-CLEANFILES= \
-	intltool-extract \
-	intltool-merge \
-	intltool-update

OverLua/GPLv2.txt

@@ -1,339 +0,0 @@
-		    GNU GENERAL PUBLIC LICENSE
-		       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-			    Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-		    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-			    NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-		     END OF TERMS AND CONDITIONS
-
-	    How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.

OverLua/avisynth.cpp

@@ -1,138 +0,0 @@
-/*
- * Avisynth interface for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-// Must be included before <windows.h>, otherwise some macros from <windows.h> get in the way
-#include "image.h"
-
-#include <windows.h>
-#include <string.h>
-#include <memory.h>
-
-#include "avisynth.h"
-
-#include "overlua.h"
-#include "vfr.h"
-
-// Lots of code lifted from the CSRI avisynth.cpp
-
-class OverLuaAvisynth : public GenericVideoFilter {
-private:
-	OverLuaScript *script;
-	double spf; // seconds per frame - for frame/timestamp conversion
-	VFRTranslator *vfr;
-
-public:
-	OverLuaAvisynth(PClip _child, IScriptEnvironment *env, const char *file, const char *datastring, const char *vfrfile)
-		: GenericVideoFilter(_child)
-	{
-		switch (vi.pixel_type) {
-			case VideoInfo::CS_BGR24:
-			case VideoInfo::CS_BGR32:
-				// safe
-				break;
-			default:
-				env->ThrowError("OverLua: Unsupported pixel format, only RGB formats supported");
-		}
-
-		try {
-			script = new OverLuaScript(file, datastring);
-			spf = (double)vi.fps_denominator / (double)vi.fps_numerator;
-			if (vfrfile)
-				vfr = GetVFRTranslator(vfrfile);
-			else
-				vfr = 0;
-		}
-		catch (const char *e) {
-			env->ThrowError(e);
-		}
-		catch (...) {
-			env->ThrowError("Unknown exception in OverLua");
-		}
-	}
-
-	~OverLuaAvisynth()
-	{
-		if (vfr)
-			delete vfr;
-		delete script;
-	}
-
-	PVideoFrame __stdcall GetFrame(int n, IScriptEnvironment *env)
-	{
-		OutputDebugStringW(L"Entering OverLua GetFrame\n");
-		PVideoFrame avsframe = child->GetFrame(n, env);
-		env->MakeWritable(&avsframe);
-
-		double frametime = n * spf;
-		if (vfr)
-			frametime = vfr->TimeStampFromFrameNumber(n);
-		ptrdiff_t stride = avsframe->GetPitch();
-		unsigned char *plane = avsframe->GetWritePtr();
-
-		plane += (vi.height - 1) * stride;
-		stride = -stride;
-
-		try {
-			switch (vi.pixel_type) {
-				case VideoInfo::CS_BGR24: {
-					ImageBGR *frame = new ImageBGR(vi.width, vi.height, stride, plane);
-					script->RenderFrameRGB(*frame, frametime);
-					} break;
-				case VideoInfo::CS_BGR32: {
-					ImageBGRX *frame = new ImageBGRX(vi.width, vi.height, stride, plane);
-					script->RenderFrameRGB(*frame, frametime);
-					} break;
-			}
-		}
-		catch (const char *e) {
-			wchar_t *ew = new wchar_t[2048];
-			MultiByteToWideChar(CP_UTF8, 0, e, -1, ew, 2048);
-			MessageBoxW(0, ew, L"OverLua execution error", MB_ICONERROR);
-			delete[] ew;
-			env->ThrowError(e);
-		}
-		catch (...) {
-			MessageBoxW(0, L"Unknown error", L"OverLua execution error", MB_ICONERROR);
-			env->ThrowError("OverLua: unknown execution error");
-		}
-
-		OutputDebugStringW(L"Leaving OverLua GetFrame\n");
-		return avsframe;
-	}
-
-	static AVSValue __cdecl Create(AVSValue args, void* user_data, IScriptEnvironment* env)
-	{
-		return new OverLuaAvisynth(args[0].AsClip(), env, args[1].AsString(), args[2].AsString(0), args[3].AsString(0));
-	}
-};
-
-
-extern "C" __declspec(dllexport) const char* __stdcall AvisynthPluginInit2(IScriptEnvironment* env)
-{
-	env->AddFunction("OverLua", "cs[data]s[vfr]s", OverLuaAvisynth::Create, 0);
-	return "OverLua";
-}
-

OverLua/cairo_wrap.h

@@ -1,653 +0,0 @@
-/*
- * Lua interface for the cairo graphics library
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#ifndef CAIRO_WRAP_H
-#define CAIRO_WRAP_H
-
-#include "../lua51/src/lua.h"
-#include <cairo.h>
-#include <string>
-#include <map>
-
-
-int luaopen_cairo(lua_State *L);
-
-
-template <class ChildClass>
-class LuaCairoBase {
-private:
-	// Default handlers for metatable stuff
-	static int lua_index(lua_State *L)
-	{
-		LuaCairoBase **obj = (LuaCairoBase**)lua_touserdata(L, 1);
-		return (*obj)->internal_lua_index(L);
-	}
-
-	static int lua_newindex(lua_State *L)
-	{
-		LuaCairoBase **obj = (LuaCairoBase**)lua_touserdata(L, 1);
-		return (*obj)->internal_lua_newindex(L);
-	}
-
-	static int lua_callobj(lua_State *L)
-	{
-		LuaCairoBase **obj = (LuaCairoBase**)lua_touserdata(L, 1);
-		return (*obj)->internal_lua_callobj(L);
-	}
-
-	static int lua_gc(lua_State *L)
-	{
-		LuaCairoBase **obj = (LuaCairoBase**)lua_touserdata(L, 1);
-		delete *obj;
-		return 0;
-	}
-
-	// Hidden constructors
-	LuaCairoBase() { }
-	LuaCairoBase(const LuaCairoBase &obj) { }
-
-	// List of callables
-	typedef std::map<std::string, lua_CFunction> CallableMap;
-	CallableMap callables;
-
-	// "Magic" value - used to test that pointers are really valid
-	lua_CFunction magic;
-
-protected:
-	virtual int internal_lua_index(lua_State *L)
-	{
-		if (lua_type(L, 2) == LUA_TSTRING) {
-			const char *field = lua_tostring(L, 2);
-
-			CallableMap::iterator func = callables.find(field);
-			if (func != callables.end()) {
-				lua_pushvalue(L, 1);
-				lua_pushcclosure(L, func->second, 1);
-				return 1;
-			}
-
-			if (strcmp("_type", lua_tostring(L, 2))) {
-				lua_pushstring(L, GetTypeName());
-				return 1;
-			}
-		}
-
-		return 0;
-	}
-	virtual int internal_lua_newindex(lua_State *L)
-	{
-		lua_pushfstring(L, "Cairo object of type '%s' can not have field set", GetTypeName());
-		lua_error(L);
-		return 0;
-	}
-	virtual int internal_lua_callobj(lua_State *L)
-	{
-		lua_pushfstring(L, "Cairo objct of type '%s' can not be called", GetTypeName());
-		lua_error(L);
-		return 0;
-	}
-
-	virtual const char *GetTypeName() { return "_base"; }
-
-	virtual void CreateMetaTable(lua_State *L)
-	{
-		lua_newtable(L);
-		lua_pushcclosure(L, lua_index, 0);
-		lua_setfield(L, -2, "__index");
-		lua_pushcclosure(L, lua_newindex, 0);
-		lua_setfield(L, -2, "__newindex");
-		lua_pushcclosure(L, lua_callobj, 0);
-		lua_setfield(L, -2, "__call");
-		lua_pushcclosure(L, lua_gc, 0);
-		lua_setfield(L, -2, "__gc");
-	}
-
-	void AddCallable(lua_CFunction func, const char *name)
-	{
-		callables[name] = func;
-	}
-
-	// Primary constructor for use with inherited stuff
-	LuaCairoBase(lua_State *L)
-	{
-		LuaCairoBase **ud = (LuaCairoBase**)lua_newuserdata(L, sizeof(ChildClass*));
-		*ud = this;
-		CreateMetaTable(L);
-		lua_setmetatable(L, -2);
-		magic = luaopen_cairo;
-	}
-
-public:
-	virtual ~LuaCairoBase() { }
-
-	// Helper: Get the object pointer from a callback
-	static ChildClass *GetObjPointer(lua_State *L, int index)
-	{
-		if (!lua_isuserdata(L, index)) {
-			lua_pushliteral(L, "Passed non-userdata where one expected");
-			lua_error(L);
-		}
-		ChildClass *obj = CheckPointer(*(void**)lua_touserdata(L, index));
-		return obj;
-	}
-
-	// Check whether a pointer plausibly points to an object of this class
-	static ChildClass *CheckPointer(void *ptr)
-	{
-		ChildClass *testptr = (ChildClass*)ptr;
-		if (testptr->magic == luaopen_cairo)
-			return testptr;
-		else
-			return 0;
-	}
-};
-
-
-#define CALLABLE(name) static int lua_ ## name (lua_State *L)
-
-
-class LuaCairoContext : public LuaCairoBase<LuaCairoContext> {
-private:
-	cairo_t *context;
-
-	CALLABLE(reference);
-	CALLABLE(status);
-
-	CALLABLE(save);
-	CALLABLE(restore);
-
-	CALLABLE(get_target);
-
-	CALLABLE(push_group);
-	CALLABLE(push_group_with_content);
-	CALLABLE(pop_group);
-	CALLABLE(pop_group_to_source);
-	CALLABLE(get_group_target);
-
-	CALLABLE(set_source_rgb);
-	CALLABLE(set_source_rgba);
-	CALLABLE(set_source);
-	CALLABLE(set_source_surface);
-	CALLABLE(get_source);
-
-	CALLABLE(set_antialias);
-	CALLABLE(get_antialias);
-
-	CALLABLE(set_dash);
-	CALLABLE(get_dash_count);
-	CALLABLE(get_dash);
-
-	CALLABLE(set_fill_rule);
-	CALLABLE(get_fill_rule);
-
-	CALLABLE(set_line_cap);
-	CALLABLE(get_line_cap);
-
-	CALLABLE(set_line_join);
-	CALLABLE(get_line_join);
-
-	CALLABLE(set_line_width);
-	CALLABLE(get_line_width);
-
-	CALLABLE(set_miter_limit);
-	CALLABLE(get_miter_limit);
-
-	CALLABLE(set_operator);
-	CALLABLE(get_operator);
-
-	CALLABLE(set_tolerance);
-	CALLABLE(get_tolerance);
-
-	CALLABLE(clip);
-	CALLABLE(clip_preserve);
-	CALLABLE(clip_extents);
-	CALLABLE(reset_clip);
-
-	// rectangle_list_destroy is not needed,
-	// copy_clip_rectangle_list will convert the rect list into a pure Lua structure
-	CALLABLE(copy_clip_rectangle_list);
-
-	CALLABLE(fill);
-	CALLABLE(fill_preserve);
-	CALLABLE(fill_extents);
-	CALLABLE(in_fill);
-
-	CALLABLE(mask);
-	CALLABLE(mask_surface);
-
-	CALLABLE(paint);
-	CALLABLE(paint_with_alpha);
-
-	CALLABLE(stroke);
-	CALLABLE(stroke_preserve);
-	CALLABLE(stroke_extents);
-	CALLABLE(in_stroke);
-
-	CALLABLE(copy_page);
-	CALLABLE(show_page);
-
-	// Path operations
-
-	CALLABLE(copy_path);
-	CALLABLE(copy_path_flat);
-
-	CALLABLE(append_path);
-
-	CALLABLE(get_current_point);
-
-	CALLABLE(new_path);
-	CALLABLE(new_sub_path);
-	CALLABLE(close_path);
-
-	CALLABLE(arc);
-	CALLABLE(arc_negative);
-	CALLABLE(curve_to);
-	CALLABLE(line_to);
-	CALLABLE(move_to);
-	CALLABLE(rectangle);
-	CALLABLE(glyph_path);
-	CALLABLE(text_path);
-	CALLABLE(rel_curve_to);
-	CALLABLE(rel_line_to);
-	CALLABLE(rel_move_to);
-
-	// Transformations
-
-	CALLABLE(translate);
-	CALLABLE(scale);
-	CALLABLE(rotate);
-
-	CALLABLE(transform);
-	CALLABLE(set_matrix);
-	CALLABLE(get_matrix);
-	CALLABLE(identity_matrix);
-
-	CALLABLE(user_to_device);
-	CALLABLE(user_to_device_distance);
-	CALLABLE(device_to_user);
-	CALLABLE(device_to_user_distance);
-
-	// Text/font operations
-
-	CALLABLE(select_font_face);
-
-	CALLABLE(set_font_size);
-	CALLABLE(set_font_matrix);
-	CALLABLE(get_font_matrix);
-
-	CALLABLE(set_font_options);
-	CALLABLE(get_font_options);
-
-	CALLABLE(set_font_face);
-	CALLABLE(get_font_face);
-
-	CALLABLE(set_scaled_font);
-	CALLABLE(get_scaled_font);
-
-	CALLABLE(show_text);
-	CALLABLE(show_glyphs);
-
-	CALLABLE(font_extents);
-	CALLABLE(text_extents);
-	CALLABLE(glyph_extents);
-
-protected:
-	const char *GetTypeName();
-
-public:
-	// Create another reference for a context
-	LuaCairoContext(lua_State *L, cairo_t *_context);
-	// Destructor
-	virtual ~LuaCairoContext();
-};
-
-
-class LuaCairoSurface : public LuaCairoBase<LuaCairoSurface> {
-private:
-	CALLABLE(create_similar);
-	CALLABLE(reference);
-	CALLABLE(status);
-
-	// Create cairo context for this surface
-	// This deviates from the regular cairo API
-	CALLABLE(create_context);
-
-	CALLABLE(finish);
-	CALLABLE(flush);
-
-	CALLABLE(get_font_options);
-
-	CALLABLE(get_content);
-
-	CALLABLE(mark_dirty);
-	CALLABLE(mark_dirty_rectangle);
-
-	CALLABLE(set_device_offset);
-	CALLABLE(get_device_offset);
-
-	CALLABLE(set_fallback_resolution);
-
-	CALLABLE(get_type);
-
-	// Image surface functions
-
-	CALLABLE(image_get_format);
-	CALLABLE(image_get_width);
-	CALLABLE(image_get_height);
-
-	// These replace the get_data and get_stride functions
-	CALLABLE(image_set_pixel);
-	CALLABLE(image_get_pixel);
-
-protected:
-	// Protected because inheriting classes might want it too
-	cairo_surface_t *surface;
-
-	const char *GetTypeName();
-
-	// For child classes that will set surface themselves
-	LuaCairoSurface(lua_State *L);
-
-public:
-	// Create another reference for a surface
-	LuaCairoSurface(lua_State *L, cairo_surface_t *_surface);
-	// Destructor
-	virtual ~LuaCairoSurface();
-
-	cairo_surface_t *GetSurface() { return surface; }
-
-	// Creation functions - these aren't in image surface objects but in a global table
-	CALLABLE(image_surface_create);
-};
-
-
-class LuaCairoFontFace : public LuaCairoBase<LuaCairoFontFace> {
-private:
-	cairo_font_face_t *font_face;
-
-	CALLABLE(create_scaled_font);
-
-	CALLABLE(reference);
-	CALLABLE(status);
-	CALLABLE(get_type);
-
-protected:
-	const char *GetTypeName();
-
-public:
-	// Create another reference for a font face
-	LuaCairoFontFace(lua_State *L, cairo_font_face_t *_font_face);
-	// Destructor
-	virtual ~LuaCairoFontFace();
-
-	cairo_font_face_t *GetFontFace() { return font_face; }
-};
-
-
-class LuaCairoScaledFont : public LuaCairoBase<LuaCairoScaledFont> {
-private:
-	cairo_scaled_font_t *scaled_font;
-
-	CALLABLE(reference);
-	CALLABLE(status);
-
-	CALLABLE(extents);
-	CALLABLE(text_extents);
-	CALLABLE(glyph_extents);
-
-	CALLABLE(get_font_face);
-	CALLABLE(get_font_options);
-	CALLABLE(get_font_matrix);
-	CALLABLE(get_ctm);
-
-	CALLABLE(get_type);
-
-protected:
-	const char *GetTypeName();
-
-public:
-	// Create another reference for a scaled font
-	LuaCairoScaledFont(lua_State *L, cairo_scaled_font_t *_scaled_font);
-	// Destructor
-	virtual ~LuaCairoScaledFont();
-
-	cairo_scaled_font_t *GetScaledFont() { return scaled_font; }
-};
-
-
-class LuaCairoFontOptions : public LuaCairoBase<LuaCairoFontOptions> {
-private:
-	cairo_font_options_t *font_options;
-	bool owned;
-
-	CALLABLE(copy);
-	CALLABLE(status);
-
-	CALLABLE(merge);
-	CALLABLE(hash);
-	CALLABLE(equal);
-
-	CALLABLE(set_antialias);
-	CALLABLE(get_antialias);
-
-	CALLABLE(set_subpixel_order);
-	CALLABLE(get_subpixel_order);
-
-	CALLABLE(set_hint_style);
-	CALLABLE(get_hint_style);
-
-	CALLABLE(set_hint_metrics);
-	CALLABLE(get_hint_metrics);
-
-	void RegFontOptionsCallables();
-
-protected:
-	const char *GetTypeName();
-
-public:
-	// Create a new font options object - will be owned
-	LuaCairoFontOptions(lua_State *L);
-	// Wrap an existing font options object - will not be owned
-	LuaCairoFontOptions(lua_State *L, cairo_font_options_t *_font_options);
-	// Destructor - only destroy font_options if owned
-	virtual ~LuaCairoFontOptions();
-
-	cairo_font_options_t *GetFontOptions() { return font_options; }
-
-	// Creation function - global
-	CALLABLE(create);
-};
-
-
-class LuaCairoMatrix : public LuaCairoBase<LuaCairoMatrix> {
-private:
-	cairo_matrix_t matrix;
-
-	CALLABLE(init);
-	CALLABLE(init_identity);
-	CALLABLE(init_translate);
-	CALLABLE(init_scale);
-	CALLABLE(init_rotate);
-
-	CALLABLE(translate);
-	CALLABLE(scale);
-	CALLABLE(rotate);
-
-	// Matrix inversion
-	CALLABLE(invert);
-	// Matrix multiplication
-	CALLABLE(multiply);
-
-	CALLABLE(transform_distance);
-	CALLABLE(transform_point);
-
-	// Pointwise arithmetic on matrices - not part of cairo API
-	CALLABLE(op_add);
-	CALLABLE(op_sub);
-	CALLABLE(op_mul);
-	CALLABLE(op_div);
-	CALLABLE(op_unm);
-	// Equality operator
-	CALLABLE(op_eq);
-
-	// Not in cairo API
-	CALLABLE(copy);
-
-	void RegMatrixCallables(lua_State *L);
-
-protected:
-	virtual int internal_lua_index(lua_State *L);
-	virtual int internal_lua_newindex(lua_State *L);
-	const char *GetTypeName();
-
-	// Extend the meta table with various operators
-	void CreateMetaTable(lua_State *L);
-
-public:
-	// Create new matrix, inited to identity matrix
-	LuaCairoMatrix(lua_State *L);
-	// Duplicate exixting matrix
-	LuaCairoMatrix(lua_State *L, const cairo_matrix_t *_matrix);
-	// Destructor
-	virtual ~LuaCairoMatrix();
-
-	cairo_matrix_t *GetMatrix();
-
-	// Creation function - global
-	CALLABLE(create);
-};
-
-
-class LuaCairoPath : public LuaCairoBase<LuaCairoPath> {
-private:
-	cairo_path_t *path;
-
-	// Specifies whether the memory for the cairo_path_t object is owned by the cairo library.
-	// If cairo owns it we cannot add/remove elements from the path.
-	bool cairo_owns_memory;
-
-	// Number of path elemts we have allocated memory for. Undefined if cairo_owns_memory.
-	// This is different from path->length because that specifies the number of elements in use.
-	size_t path_elements_allocated;
-
-	// Management
-	void EnsurePathOwned(); // ensure that we own the path memory
-	void EnsureSpaceFor(size_t n); // ensure we own the path memory and there's space to add at least n more elements
-
-	// TODO: figure out what methods are needed
-	// Something to iterate over the parts at least
-	// Support for creating/modifying paths?
-
-	CALLABLE(clear);
-	CALLABLE(move_to);
-	CALLABLE(line_to);
-	CALLABLE(curve_to);
-	CALLABLE(close);
-
-	// Functional programming support
-	CALLABLE(map); // transform each path segment with a function
-	CALLABLE(map_coords); // transform each coordinate pair with a function
-	CALLABLE(fold); // fold path segments into a single result value
-	CALLABLE(fold_coords); // fold coordinate pairs into a single result value
-
-	void RegPathCallables(lua_State *L);
-
-protected:
-	virtual int internal_lua_index(lua_State *L);
-	const char *GetTypeName();
-
-public:
-	// Create object with new path - we will own the memory
-	LuaCairoPath(lua_State *L);
-	// Create object based on path - does not copy path, and lets cairo own the memory
-	LuaCairoPath(lua_State *L, cairo_path_t *_path);
-	// Destructor
-	virtual ~LuaCairoPath();
-
-	cairo_path_t *GetPath() { return path; }
-
-	// Modifying the path
-	void ClearPath();
-	void MoveTo(double x, double y);
-	void LineTo(double x, double y);
-	void CurveTo(double x0, double y0, double x1, double y1, double x2, double y2);
-	void ClosePath();
-};
-
-
-class LuaCairoPattern : public LuaCairoBase<LuaCairoPattern> {
-private:
-	cairo_pattern_t *pattern;
-
-	CALLABLE(add_color_stop_rgb);
-	CALLABLE(add_color_stop_rgba);
-	CALLABLE(get_color_stop_count);
-	CALLABLE(get_color_stop_rgba);
-
-	CALLABLE(get_rgba);
-
-	CALLABLE(get_surface);
-
-	CALLABLE(get_linear_points);
-	CALLABLE(get_radial_circles);
-
-	CALLABLE(reference);
-	CALLABLE(status);
-
-	CALLABLE(set_extend);
-	CALLABLE(get_extend);
-
-	CALLABLE(set_filter);
-	CALLABLE(get_filter);
-
-	CALLABLE(set_matrix);
-	CALLABLE(get_matrix);
-
-	CALLABLE(get_type);
-
-protected:
-	const char *GetTypeName();
-
-public:
-	// Create another reference for a pattern object
-	LuaCairoPattern(lua_State *L, cairo_pattern_t *_pattern);
-	// Destructor
-	virtual ~LuaCairoPattern();
-
-	cairo_pattern_t *GetPattern() { return pattern; }
-
-	// Creation functions - these aren't in pattern objects but in a global table
-	CALLABLE(create_rgb);
-	CALLABLE(create_rgba);
-	CALLABLE(create_for_surface);
-	CALLABLE(create_linear);
-	CALLABLE(create_radial);
-};
-
-
-#undef CALLABLE
-
-#endif

OverLua/csri.cpp

@@ -1,207 +0,0 @@
-/*
- * CSRI interface for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
- 
-// CSRI interface is unmaintained for now
-#if 0
-
-#include <string.h>
-#include <memory.h>
-
-#define CSRI_OWN_HANDLES
-#define CSRIAPI extern "C" __declspec(dllexport)
-
-// Nothing special required here
-typedef int csri_rend;
-
-// Forward instance data
-struct csri_inst;
-
-#include "../csri/include/csri/csri.h"
-#include "../csri/include/csri/logging.h"
-
-#include "overlua.h"
-
-// Instance data
-struct csri_inst {
-	csri_fmt frame_format;
-	OverLuaScript *script;
-};
-
-// Renderer information definition
-static const csri_info overlua_csri_info = {
-	"overlua",
-	"overlua-001",
-	"OverLua Lua-based advanced effects renderer",
-	"Niels Martin Hansen",
-	"Copyright 2007 Niels Martin Hansen (GPLv2)"
-};
-// Just something we can pass a pointer to
-static const csri_rend overlua_csri_rend = 0;
-
-// Name of the "overlua" extension format
-static const char *overlua_format_ext_name = "jfs.overlua";
-
-
-CSRIAPI csri_inst *csri_open_file(csri_rend *renderer,
-	const char *filename, struct csri_openflag *flags)
-{
-	if (renderer != &overlua_csri_rend) return 0;
-	
-	csri_inst *inst = new csri_inst;
-	inst->script = new OverLuaScript(filename);
-	
-	return inst;
-}
-
-
-CSRIAPI csri_inst *csri_open_mem(csri_rend *renderer,
-	const void *data, size_t length, struct csri_openflag *flags)
-{
-	if (renderer != &overlua_csri_rend) return 0;
-	
-	csri_inst *inst = new csri_inst;
-	inst->script = new OverLuaScript(data, length);
-	
-	return inst;
-}
-
-
-CSRIAPI void csri_close(csri_inst *inst)
-{
-	delete inst->script;
-	delete inst;
-	return;
-}
-
-
-CSRIAPI int csri_request_fmt(csri_inst *inst, const struct csri_fmt *fmt)
-{
-	// only support RGB formats
-	if (!csri_is_rgb(fmt->pixfmt))
-		return 0;
-
-	// get a private copy of it
-	memcpy(&inst->frame_format, fmt, sizeof(csri_fmt));
-
-	return 1;
-}
-
-
-CSRIAPI void csri_render(csri_inst *inst, struct csri_frame *frame, double time)
-{
-	// check for correct pixfmt
-	if (frame->pixfmt != inst->frame_format.pixfmt) return;
-
-	BaseImageAggregate *olframe = 0;
-	switch (frame->pixfmt) {
-#define HANDLE_RGB_FORMAT(fmtname, PixFmt) \
-	case fmtname: \
-		olframe = new BaseImageAggregateImpl<PixelFormat:: ## PixFmt>(inst->frame_format.width, inst->frame_format.height, frame->strides[0], frame->planes[0]); \
-		break;
-		HANDLE_RGB_FORMAT(CSRI_F_RGBA, RGBA)
-		HANDLE_RGB_FORMAT(CSRI_F_ARGB, ARGB)
-		HANDLE_RGB_FORMAT(CSRI_F_BGRA, BGRA)
-		HANDLE_RGB_FORMAT(CSRI_F_ABGR, ABGR)
-		HANDLE_RGB_FORMAT(CSRI_F_RGB_, RGBX)
-		HANDLE_RGB_FORMAT(CSRI_F__RGB, XRGB)
-		HANDLE_RGB_FORMAT(CSRI_F_BGR_, BGRX)
-		HANDLE_RGB_FORMAT(CSRI_F__BGR, XBGR)
-		HANDLE_RGB_FORMAT(CSRI_F_RGB, RGB)
-		HANDLE_RGB_FORMAT(CSRI_F_BGR, BGR)
-		default: break; // what, we don't support this!
-#undef HANDLE_RGB_FORMAT
-	}
-
-	if (olframe) {
-		inst->script->RenderFrameRGB(*olframe, time);
-	}
-
-}
-
-
-CSRIAPI void *csri_query_ext(csri_rend *rend, csri_ext_id extname)
-{
-	if (rend != &overlua_csri_rend)
-		return 0;
-	
-	// Check for the OverLua format extension
-	if (strcmp(extname, overlua_format_ext_name) == 0)
-		// Nonsense return
-		return &overlua_format_ext_name;
-	
-	// TODO: support logging
-	if (strcmp(extname, CSRI_EXT_LOGGING) == 0)
-		return 0;
-	
-	return 0;
-}
-
-
-CSRIAPI struct csri_info *csri_renderer_info(csri_rend *rend)
-{
-	if (rend == &overlua_csri_rend)
-		return (csri_info*)&overlua_csri_info;
-	return 0;
-}
-
-
-CSRIAPI csri_rend *csri_renderer_byname(const char *name,
-	const char *specific)
-{
-	if (strcmp(name, overlua_csri_info.name) == 0)
-		if (!specific || strcmp(specific, overlua_csri_info.specific) == 0)
-			return (csri_rend*)&overlua_csri_rend;
-	return 0;
-}
-
-
-CSRIAPI csri_rend *csri_renderer_byext(unsigned n_ext, csri_ext_id *ext)
-{
-	// Check if every extension is supported
-	while (n_ext-- > 0) {
-		if (!csri_query_ext((csri_rend*)&overlua_csri_rend, *ext))
-			return 0;
-		ext++;
-	}
-	return (csri_rend*)&overlua_csri_rend;
-}
-
-
-CSRIAPI csri_rend *csri_renderer_default()
-{
-	return (csri_rend*)&overlua_csri_rend;
-}
-
-
-CSRIAPI csri_rend *csri_renderer_next(csri_rend *prev)
-{
-	if (prev == 0)
-		return (csri_rend*)&overlua_csri_rend;
-	else
-		return 0;
-}
-
-#endif

OverLua/docs/expression-evaluator.txt

@@ -1,232 +0,0 @@
-Documentation for the RPN expression engine in OverLua
-======================================================
-
-For some graphics processing operationg, OverLua provides an RPN (Reverse
-Polish Notation) to do fast calculations. This expression engine is designed
-primarily to have very fast execution and be multithreading-safe in the
-runtime.
-
-The language is meant to support multi-variable calculations, so apart from
-the usual arithmetic operators there is also an assignment operator. Finally
-there is a limited number of temporary registers.
-
-There is no explicit Lua interface to the expression engine, rather it is
-implicitly used by some image processing functions. In those cases, a
-program is passed as a string to the image processing function.
-
-
-Stack machine execution model
------------------------------
-
-The expression evaluator is implemented as a stack machine with a number
-of registers. Some of these registers are used for input and/or output
-values and some are freely usable for temporary storage.
-
-The stack holds numbers in 'double' precision, this is the only data type
-supported by the machine. There are no practical limits on stack depth.
-
-The registers also hold numbers in 'double' precision. Depending on the
-function using the expression evaluator, different input/output registers
-will be available. The input/output registers will usually be single-letter
-names using uppercase letters. There are always exactly ten temporary
-registers available, named "t0" to "t9", ie. lowercase "t" followed by
-a digit. The contents of the temporary registers are undefined at the start
-of program execution.
-
-
-The program consists of a number of instructions executed sequentially. There
-are three basic types of instructions:
- - push
- - call
- - store
-
-A 'push' instruction pushes a single number to the top of the stack. The
-source of the number can either be a constant or a register.
-
-A 'call' instruction pops some numbers from the stack, performs an operation
-on them and pushes a single number back onto the stack. This includes basic
-arithmetic operations such as addition, mulitiplication, but also functions
-such as sinus, rounding and logarithms. How many numbers are popped from the
-stack depends on the function.
-
-The 'store' instruction pops one number from the stack and stores it into
-a register, overwriting the previous number in the register.
-
-
-After every instruction in the program has been executed, any remaining numbers
-on the stack are discarded, and the numbers in the output registers are passed
-to the function using the expression evaluator.
-
-
-If a program operation attempt to pop a number from the stack when the stack
-is empty, the machine halts with an error state, and the result of the program
-is undefined.
-
-
-Expression syntax
------------------
-
-The syntax used to specify programs is very straightforward.
-
-The program consists of a number of tokens separated by whitespace. Each token
-translates into one instruction.
-
-
-A token can be a number. This translates into a 'push' instruction, pushing
-that number as a constant. The format for numbers is the same as in C.
-
-Examples: "1", "-5", "3.14", ".5" "2.998e8"
-
-
-A token can be a register name. This translates into a 'push' instruction,
-pushing the number in the register.
-
-Examples: "X", "Y", "t0", "t6"
-
-
-A token can be a basic arithmetic operator. These translate into 'call'
-instructions. Each of these represent a function that pops two numbers,
-performs the calculation and pushes the result.
-
-The basic arithmetic operators are: + - * / ^
-
-Examples:
-Suppose the two previous instructions were "A B" where A and B are registers.
-This means that now the stack contains B at the top and A just below.
-Operator "+" will then calculate "A + B". Operator "-" will calculate "A - B".
-Operator "*" will calculate "A * B". Operator "/" will calculate "A / B".
-Operator "^" will calculate "A ^ B", ie. A raised to the power of B.
-
-The result of illegal operations is undefined. It will most likely result in
-an invalid number being pushed onto the stack, and operating on that number
-will cause the error to propagate.
-
-
-A token matching the name of a defined function will translate into a 'call'
-instruction for the given function. A number of standard functions are always
-available, see below for details.
-
-
-An equal sign followed by the name of a register translated into a 'store'
-instruction, that will pop the number at the top of the stack and store it
-into the named register. There must not be any whitespace between the equal
-sign and the register name.
-
-Examples: "=X", "=t0"
-
-
-Standard function library
--------------------------
-
-The following functions are always available in the machine.
-
-
-~  (tilde character)
-Takes one argument, produces one result.
-Unary minus. (Negate the argument.)
-
-abs
-Takes one argument, produces one result.
-Return the absolute value.
-
-floor
-Takes one argument, produces one result.
-Round towards negative infinity.
-
-ceil
-Takes one argument, produces one result.
-Round towards positive infinity.
-
-
-log
-Takes one argument, produces one result.
-Natural (base e) logarithm.
-
-exp
-Takes one argument, produces one result.
-Natural exponentiation. (e to the power of x.)
-
-sqrt
-Takes one argument, produces one result.
-Square root.
-
-e
-Takes no arguments, produces one result.
-Push the value of e.
-
-
-min
-Takes two arguments, produces one result.
-Return the smallest of the arguments.
-
-max
-Takes two arguments, produces one result.
-Return the largest of the arguments.
-
-
-pi
-Takes no arguments, produces one result.
-Push the value of pi.
-
-sin
-Takes one argument, produces one result.
-Sinus function. Argument in radians.
-
-cos
-Takes one argument, produces one result.
-Cosine function. Argument in radians.
-
-tan
-Takes one argument, produces one result.
-Tangent function. Argument in radians.
-
-asin
-Takes one argument, produces one result.
-Arc sinus function.
-
-acos
-Takes one argument, produces one result.
-Arc cosine function.
-
-atan
-Takes one argument, produces one result.
-Arc tangent function.
-
-
-mod
-Takes two arguments, produces one result.
-Modulo operation.
-
-
-rand
-Takes no arguments, produces one result.
-Return a random value in range 0..1.
-
-
-ifgtz
-Takes three arguments, produces one result.
-If the first argument is greater than zero, return the second argument,
-else return the third argument.
-
-ifeqz
-Takes three arguments, produces one result.
-If the first argument is equal to zero, return the second argument,
-else return the third argument.
-
-
-Sample programs
----------------
-
-For raster.pixel_value_map:
-
-"rand =t0 t0 =R t0 =G t0 =B"
-Create a field of random gray-values.
-
-"0 =R 1 G - =G"
-Zero out the red channel and invert the green channel.
-
-
-For raster.pixel_coord_map:
-
-"X .5 rand - + =X  Y .5 rand - + =Y"
-Create some jitter in the pixels.

OverLua/docs/lua-cairo.txt

@@ -1,451 +0,0 @@
-Documentation for the cairo interface provided in OverLua
-=========================================================
-
-First, this file will mostly attempt to describe the differences between the
-cairo C API and the provided Lua API. If you want more general and in-depth
-information on cairo, please see the documentation for the C API:
-
-<http://cairographics.org/manual/>
-
-
-Note that almost all of the *_reference functions are unimplemented currently.
-They should not be explicitly needed since Lua does its own management on
-objects as well, you can just copy and keep a Lua cairo object and be
-guaranteed the underlying cairo object won't be deleted until all Lua objects
-referring to it are gone.
-There are no *_destroy and *_get_reference_count functions either,
-for this reason.
-
-Finally the *_user_data functions are also removed from the API.
-
-
-Conventions in this file
-------------------------
-
-Variable name   Cairo object
-
-surf            Surface (cairo_surface_t)
-ctx             Context (cairo_t)
-face            Font face (cairo_font_face_t)
-sf              Scaled font (cairo_scaled_font_t)
-fo              Font options (cairo_font_options_t)
-mat             Matrix (cairo_matrix_t)
-path            Path (cairo_path_t)
-pat             Pattern (cairo_pattern_t)
-x, y            Coordinates
-r, g, b, a      Colour values (red, green, blue, alpha)
-
-
-If more than one of an object type is used they will get numeric suffixes.
-For matrix operations you might also see "matR", this is "result matrix".
-
-
-More "OO-like" syntax
----------------------
-
-This Lua cairo API provides a more common "OO-like" syntax for calls.
-For example, the cairo_set_source_surface(ctx, surf, x, y) function maps to
-ctx.set_source_surface(surf, x, y).
-
-
-Creating initial objects
-------------------------
-
-Many of the objects you will use are created from or by other objects, but
-you will need to create some non-dependant objects, most importantly image
-surface objects. All the object creation functions live in the global "cairo"
-table.
-
-
-surf = cairo.image_surface_create(width, height, pixel_format)
-
-Create a blank image surface object.
-
-width and height are in pixels. pixel_format is a string and must be one
-of "argb32", "rgb24", "a8" and "a1".
-
-
-fo = cairo.font_options_create()
-
-Create a new font options object.
-
-
-mat = cairo.matrix_create()
-
-Create a new matrix. It is initially the identity matrix.
-
-
-pat = cairo.pattern_create_rgb(r, g, b)
-pat = cairo.pattern_create_rgba(r, g, b, a)
-pat = cairo.pattern_create_for_surface(surf)
-pat = cairo.pattern_create_linear(x0, y0, x1, y1)
-pat = cairo.pattern_create_radial(x0, y0, r0, x1, y1, r1)
-
-Create various kinds of pattern objects.
-
-
-ctx = surf.create_context()
-
-Not strictly an "initial object", but cairo context objects are important
-enough to explicitly list here. They are created by calling the
-create_context() method in a surface object. This will create a context
-object that draws to the surface it was created with.
-
-
-Other functions that have changed API
--------------------------------------
-
-Some functions have changed API to better match the Lua programming model.
-
-
-ctx.set_dash()
-ctx.set_dash(0)
-ctx.set_dash(num[, offset])
-ctx.set_dash(dashes[, offset])
-
-There are several forms of the set_dash function. The two first disable
-dashing entirely.
-
-The third creates a repeating pattern of equal length on and off potions,
-each "num" units long. The offset argument is optional, its default is 0.
-
-The last creates a complex pattern. "dashes" must be a table of numbers
-describing the dashing pattern. offset is optional, default is 0.
-
-
-dashes, offset = ctx.get_dash()
-
-Returns current dashing setting, in same format as the last form of set_dash
-takes. If dashing is disabled, dashes will be an empty table.
-
-(You won't need to use the ctx.get_dash_count() function.)
-
-
-x0, y0, x1, y1 = ctx.clip_extents()
-x0, y0, x1, y1 = ctx.fill_extents()
-x0, y0, x1, y1 = ctx.stroke_extents()
-
-Return the smallest rectangle bounding the area that would be affected if
-performing a clip/fill/stroke operation.
-
-
-x, y = ctx.get_current_point()
-
-Get the current point for path gneration operations.
-
-
-mat = ctx.get_matrix()
-
-Get the current geometry transformation matrix.
-
-
-x, y = ctx.user_to_device(x, y)
-x, y = ctx.user_to_device_distance(x, y)
-x, y = ctx.device_to_user(x, y)
-x, y = ctx.device_to_user_distance(x, y)
-
-Returns the transformation of a point between device and user-space
-coordinates.
-
-
-offset, r, g, b, a = pat.get_color_stop_rgba(index)
-
-Returns nothing if the pattern is not a gradient pattern or the stop index
-is out of range.
-
-
-r, g, b, a = pat.get_rgba()
-
-Returns nothing if the pattern is not a solid colour fill pattern.
-
-
-surf = pat.get_surface()
-
-Returns nothing if the pattern is not a surface pattern.
-
-
-x0, y0, x1, y1 = pat.get_linear_points()
-
-Returns nothing if the pattern is not a linear gradient pattern.
-
-
-x0, y0, r0, x1, y1, r1 = pat.get_radial_circles()
-
-Returns nothing if the pattern is not a radial gradient pattern.
-
-
-extents = ctx.font_extents()
-extents = sf.font_extents()
-
-Get extents metrics for current font. The returned object is a Lua table
-with fields identical to the C struct cairo_font_extents_t.
-
-
-extents = ctx.tex_extents(utf8)
-extents = sf.text_extents(utf8)
-
-Get extents metrics for writing text given in utf8 with current font. The
-returned object is a Lua table with fields identical to the C
-struct cairo_text_extents_t.
-
-
-fo = sf.get_font_options()
-
-Get font options for a scaled font.
-
-
-mat = sf.get_font_matrix()
-
-Get text transformation matrix.
-
-
-mat = sf.get_ctm()
-
-Get the CTM. (Character transformation matrix?)
-
-
-fo1.merge(fo2)
-
-Merge font options fo2 into fo1.
-
-
-hash = fo.hash()
-
-Returns a hexadecimal string hash of fo.
-
-
-fo1.equal(fo2)
-
-Return true is fo1 equals fo2.
-
-
-fo = surf.get_font_options()
-
-Get current font options for surface.
-
-
-x, y = surf.get_device_offset()
-
-Get current device offset for surface.
-
-
-a, r, g, b = surf.get_pixel(x, y)
-r, g, b = surf.get_pixel(x, y)
-a = surf.get_pixel(x, y)
-
-Get colour value of a pixel on an image surface. This function replaces the
-cairo_image_surface_get_data(surf) function for reading surface contents.
-The number and meanings of return values depend on the surface pixel format.
-
-surf.set_pixel() is not implemented yet.
-
-
-matR = mat.copy()
-
-Duplicate a matrix. Not in cairo C API.
-
-
-mat.xx, mat.yx, mat.xy, mat.yy, mat.x0, mat.y0
-
-Access the individual numbers in a matrix. These are both read and write.
-
-
-Functional programming on path objects
---------------------------------------
-
-The path object still hasn't been completely implemented, but two useful
-functions do exist for it. These are functional programming style map and
-fold functions.
-
-
-path.map_coords(func)
-
-Transform every coordinate pair in path using func.
-
-func must be a function of type (x,y)->(x,y) ie. takes two arguments which
-are the x and y coordinates of the point and returns two numbers which are
-the new x and y coordinates of the point.
-
-Example: Produce a "wavy" effect.
-path.map_coords(function(x,y) return x+math.sin(x), y+math.cos(y) end)
-
-
-res = path.fold_coords(func, start)
-
-Produce a value by combining all the coordinate pairs using func.
-
-func must be a function of type (r,x,y)->(r) ie. takes three argument which
-are the current result and the x/y coordinates of the point, and returns a
-new result.
-When all points have been processed path.fold_coords returns the final result.
-
-Example: Find the maximum X coordinate.
-maxx = path.fold_coords(
-	function(maxx,x,y)
-		if not maxx then
-			return x
-		elseif x > maxx then
-			return x
-		else
-			return maxx
-		end
-	end, nil)
-
-
-Enumeration mappings
---------------------
-
-Everything represented by an enum in the cairo C API is represented by a
-string in the Lua API. Any enums not listed here don't have any mappings
-currently. (Which in turn means that any API requiring that enum is also
-unimplemented.)
-
-
-typedef enum _cairo_antialias {
-    CAIRO_ANTIALIAS_DEFAULT,                "default"
-    CAIRO_ANTIALIAS_NONE,                   "none"
-    CAIRO_ANTIALIAS_GRAY,                   "gray"
-    CAIRO_ANTIALIAS_SUBPIXEL                "subpixel"
-} cairo_antialias_t;
-
-typedef enum _cairo_fill_rule {
-    CAIRO_FILL_RULE_WINDING,                "winding"
-    CAIRO_FILL_RULE_EVEN_ODD                "even_odd"
-} cairo_fill_rule_t;
-
-typedef enum _cairo_line_cap {
-    CAIRO_LINE_CAP_BUTT,                    "butt"
-    CAIRO_LINE_CAP_ROUND,                   "round"
-    CAIRO_LINE_CAP_SQUARE                   "square"
-} cairo_line_cap_t;
-                               
-typedef enum _cairo_line_join {
-    CAIRO_LINE_JOIN_MITER,                  "miter"
-    CAIRO_LINE_JOIN_ROUND,                  "round"
-    CAIRO_LINE_JOIN_BEVEL                   "bevel"
-} cairo_line_join_t;
-                               
-typedef enum _cairo_operator {
-    CAIRO_OPERATOR_CLEAR,                   "clear"
-
-    CAIRO_OPERATOR_SOURCE,                  "source"
-    CAIRO_OPERATOR_OVER,                    "over"
-    CAIRO_OPERATOR_IN,                      "in"
-    CAIRO_OPERATOR_OUT,                     "out"
-    CAIRO_OPERATOR_ATOP,                    "atop"
-
-    CAIRO_OPERATOR_DEST,                    "dest"
-    CAIRO_OPERATOR_DEST_OVER,               "dest_over"
-    CAIRO_OPERATOR_DEST_IN,                 "dest_in"
-    CAIRO_OPERATOR_DEST_OUT,                "dest_out"
-    CAIRO_OPERATOR_DEST_ATOP,               "dest_atop"
-
-    CAIRO_OPERATOR_XOR,                     "xor"
-    CAIRO_OPERATOR_ADD,                     "add"
-    CAIRO_OPERATOR_SATURATE                 "saturate"
-} cairo_operator_t;
-                               
-typedef enum _cairo_path_data_type {
-    CAIRO_PATH_MOVE_TO,                     "move_to"
-    CAIRO_PATH_LINE_TO,                     "line_to"
-    CAIRO_PATH_CURVE_TO,                    "curve_to"
-    CAIRO_PATH_CLOSE_PATH                   "close"
-} cairo_path_data_type_t;
-
-typedef enum _cairo_extend {
-    CAIRO_EXTEND_NONE,                      "none"
-    CAIRO_EXTEND_REPEAT,                    "repeat"
-    CAIRO_EXTEND_REFLECT,                   "reflect"
-    CAIRO_EXTEND_PAD                        "pad"
-} cairo_extend_t;
-
-typedef enum _cairo_filter {
-    CAIRO_FILTER_FAST,                      "fast"
-    CAIRO_FILTER_GOOD,                      "good"
-    CAIRO_FILTER_BEST,                      "best"
-    CAIRO_FILTER_NEAREST,                   "nearest"
-    CAIRO_FILTER_BILINEAR,                  "bilinear"
-    CAIRO_FILTER_GAUSSIAN                   "gaussian"
-} cairo_filter_t;
-
-typedef enum _cairo_pattern_type {
-    CAIRO_PATTERN_TYPE_SOLID,               "solid"
-    CAIRO_PATTERN_TYPE_SURFACE,             "surface"
-    CAIRO_PATTERN_TYPE_LINEAR,              "linear"
-    CAIRO_PATTERN_TYPE_RADIAL               "radial"
-} cairo_pattern_type_t;
-
-typedef enum _cairo_font_slant {
-  CAIRO_FONT_SLANT_NORMAL,                  ""  (empty string)
-  CAIRO_FONT_SLANT_ITALIC,                  "italic"
-  CAIRO_FONT_SLANT_OBLIQUE                  "oblique"
-} cairo_font_slant_t;
-                               
-typedef enum _cairo_font_weight {
-  CAIRO_FONT_WEIGHT_NORMAL,                 ""  (empty string)
-  CAIRO_FONT_WEIGHT_BOLD                    "bold"
-} cairo_font_weight_t;
-
-typedef enum _cairo_subpixel_order {
-    CAIRO_SUBPIXEL_ORDER_DEFAULT,           "default"
-    CAIRO_SUBPIXEL_ORDER_RGB,               "rgb"
-    CAIRO_SUBPIXEL_ORDER_BGR,               "bgr"
-    CAIRO_SUBPIXEL_ORDER_VRGB,              "vrgb"
-    CAIRO_SUBPIXEL_ORDER_VBGR               "vbgr"
-} cairo_subpixel_order_t;
-                               
-typedef enum _cairo_hint_style {
-    CAIRO_HINT_STYLE_DEFAULT,               "default"
-    CAIRO_HINT_STYLE_NONE,                  "none"
-    CAIRO_HINT_STYLE_SLIGHT,                "slight"
-    CAIRO_HINT_STYLE_MEDIUM,                "medium"
-    CAIRO_HINT_STYLE_FULL                   "full"
-} cairo_hint_style_t;
-                               
-typedef enum _cairo_hint_metrics {
-    CAIRO_HINT_METRICS_DEFAULT,             "default"
-    CAIRO_HINT_METRICS_OFF,                 "on"
-    CAIRO_HINT_METRICS_ON                   "off"
-} cairo_hint_metrics_t;
-                               
-typedef enum _cairo_content {
-    CAIRO_CONTENT_COLOR,                    "c"
-    CAIRO_CONTENT_ALPHA,                    "a"
-    CAIRO_CONTENT_COLOR_ALPHA,              "ca"
-} cairo_content_t;
-Tnis enum and everything dependent on it is probably BROKEN.
-
-typedef enum _cairo_format {
-    CAIRO_FORMAT_ARGB32,                    "argb32"
-    CAIRO_FORMAT_RGB24,                     "rgb24"
-    CAIRO_FORMAT_A8,                        "a8"
-    CAIRO_FORMAT_A1,                        "a1"
-    /* CAIRO_FORMAT_RGB16_565               "rgb16_565"  (do not use) */
-} cairo_format_t;
-                               
-typedef enum _cairo_status {
-    CAIRO_STATUS_SUCCESS,                   "success"
-    CAIRO_STATUS_NO_MEMORY,                 "no_memory"
-    CAIRO_STATUS_INVALID_RESTORE,           "invalid_restore"
-    CAIRO_STATUS_INVALID_POP_GROUP,         "invalid_pop_group"
-    CAIRO_STATUS_NO_CURRENT_POINT,          "no_current_point"
-    CAIRO_STATUS_INVALID_MATRIX,            "invalid_matrix"
-    CAIRO_STATUS_INVALID_STATUS,            "invalid_status"
-    CAIRO_STATUS_NULL_POINTER,              "null_pointer"
-    CAIRO_STATUS_INVALID_STRING,            "invalid_string"
-    CAIRO_STATUS_INVALID_PATH_DATA,         "invalid_path_data"
-    CAIRO_STATUS_READ_ERROR,                "read_error"
-    CAIRO_STATUS_WRITE_ERROR,               "write_error"
-    CAIRO_STATUS_SURFACE_FINISHED,          "surface_finished"
-    CAIRO_STATUS_SURFACE_TYPE_MISMATCH,     "surface_type_mismatch"
-    CAIRO_STATUS_PATTERN_TYPE_MISMATCH,     "pattern_type_mismatch"
-    CAIRO_STATUS_INVALID_CONTENT,           "invalid_content"
-    CAIRO_STATUS_INVALID_FORMAT,            "invalid_format"
-    CAIRO_STATUS_INVALID_VISUAL,            "invalid_visual"
-    CAIRO_STATUS_FILE_NOT_FOUND,            "file_not_found"
-    CAIRO_STATUS_INVALID_DASH,              "invalid_dash"
-    CAIRO_STATUS_INVALID_DSC_COMMENT,       "invalid_dsc_comment"
-    CAIRO_STATUS_INVALID_INDEX,             "invalid_index"
-    CAIRO_STATUS_CLIP_NOT_REPRESENTABLE     "clip_not_representable"
-} cairo_status_t;
-

OverLua/docs/lua-fonts.txt

@@ -1,62 +0,0 @@
-Documentation for the fonts interface provided in OverLua
-=========================================================
-
-OverLua provides a simplified interface to create and manage Fontconfig
-in-memory configurations, create FreeType font face objects from those
-and basic manipulation of these font face objects.
-
-It is possible to create cairo font face objects from the FreeType font
-face objects, so the fonts can be used in cairo rendering. This is the
-preferred way to produce text in OverLua.
-
-This interface does not provide means to have Fontconfig load and use
-configuration files, neither system-wide, per-user nor private ones.
-The only way to load and use fonts is to explicitly name the font files
-and load these. The purpose of this is to let OverLua scripts produce
-predictable results, as the same font will always be selected regardless
-of the system the script is running on.
-
-
-See also:
-
-Fontconfig documentation: <http://fontconfig.org/fontconfig-devel/>
-
-FreeType 2 documentation: <http://www.freetype.org/freetype2/docs/reference/ft2-toc.html>
-
-
-Font configuration object
--------------------------
-
-OverLua keeps one global Fontconfig configuration object, which is
-implicitly used for all operations. It is accessed through the global
-'fonts' object.
-
-The following operations are supported:
-
-
-success = fonts.add_file(filename)
-
-Attempts to load the specified font file and add all fonts in it to the
-Fontconfig configuration. This uses the FcConfigAppFontAddFile C function
-to perform the work.
-
-On return, 'success' is a boolean which is 'true' on success and 'false'
-otherwise.
-
-
-cairofont = fonts.select(pattern, cairofo)
-
-Select the font best matching the pattern given, and return an object
-representing that font.
-
-The pattern is a Lua table of key=value pairs, with the keys being the
-properties Fontconfig understands, and the values the value you want
-for that property.
-
-'cairofo' is a cairo font options object. This parameter is optional.
-
-You can see a list of known properties on: <http://fontconfig.org/fontconfig-user.html>
-
-This function returns a cairo FreeType font object that can be selected
-into a cairo context for rendering with.
-

OverLua/docs/overlua.txt

@@ -1,230 +0,0 @@
-OverLua provides a Lua 5.1 runtime environment with access to all
-standard libraries.
-
-
-The Avisynth filter
--------------------
-
-The Avisynth filter version of OverLua exports one function:
-
-  OverLua(clip c, string scriptfile, string "datastring", string "vfrfile")
-
-The clip c argument is self-explanatory, the clip to render on.
-
-The scripfile is the path to the Lua script you want to load and run.
-
-datastring is a freeform string to pass to the Lua script. This will often
-be the path to a file with additional data for the script, such as timed
-subtitles/karaoke.
-
-vfrfile is the path to a timecode file Matroska format 1 or 2. If supplied,
-it will be used to translate frame numbers to timestamps instead of relying
-on the frame rate provided by Avisynth.
-
-
-API the Lua script must implement
----------------------------------
-
-Any initialisation, such as loading external data files, should be done
-in the Lua script's global environment.
-
-OverLua expects one function in the script:
-
-function render_frame(frame, timestamp)
-
-The function name must be literal "render_frame". It must not be local.
-
-The "frame" parameter is a userdata object representing the video frame
-there must be rendered to. Other functions take this object as parameter.
-
-The "timestamp" parameter is a value of type "number", representing the
-timestamp of the frame to be rendered, in seconds. The timestamp may be
-non-integer with any precision.
-
-The render_frame function should not return anything. Instead it modifies
-the frame object.
-
-The render_frame function should not assume that frames are requested in
-any specific order.
-
-
-If a "datastring" argument is supplied to the OverLua Avisynth function, the
-argument value will be available through the global variable
-"overlua_datastring" in the Lua script environment.
-
-
-The frame object
-----------------
-
-The "frame" object passed to the render_frame function has a number of
-fields accessible.
-
-The frame is always stored as RGB. No alpha channel is supported.
-
-
-frame.width
-
-An integer number storing the width of the frame in pixels.
-
-Read only.
-
-
-frame.height
-
-An integer number storing the height of the frame in pixels.
-
-Read only.
-
-
-red, green, blue = frame(x, y)
-
-"red", "green" and "blue" will be numbers in range 0..255 that will receive
-the respective colour channel values for the requested pixel.
-"x" and "y" are the pixel coordinates for the pixel to retrieve
-Pixel coordinates are counted from zero and start in the upper left corner.
-A pixel with coordinates (X, Y) has pixel number Y*frame.width+X.
-
-
-frame[n] = {red, green, blue}
-
-Set the value of the given pixel.
-
-The table on the right side of the equal sign must have at least three
-entries which must all be numbers. They are taken as red, green and blue
-values respectively, in regular enumeration order.
-"n" is the pixel number to be set.
-A pixel with coordinates (X, Y) has pixel number Y*frame.width+X.
-
-Using a table constructor as shown is recommended.
-
-
-surface = frame.create_cairo_surface()
-
-Create a cairo rgb24 surface from the video frame. Drawing to the surface
-will _not_ affect the video frame. If you want the changes to the surface
-visible on the video you will need to overlay this surface on the video.
-
-
-frame.overlay_cairo_surface(surface, x, y)
-
-Overlay the given cairo surface at the video frame such that the upper,
-left corner of the surface is positioned at pixel (x, y) on the video.
-Only argb32 and rgb24 type surfaces are supported.
-Proper alpha blending is used for argb32 surfaces.
-
-
-Setting a pixel value for a pixel outside the frame has no effect.
-Specifically, it will not produce an error or a warning message.
-
-Reading a pixel value for a pixel outside the frame will return black,
-ie. (0, 0, 0).
-
-
-Vector graphics interface
--------------------------
-
-OverLua uses the cairo library for all vector graphics handling, including
-text handling.
-
-See lua-cairo.txt for details.
-
-
-Raster graphics processing interface
-------------------------------------
-
-A raster graphics processing interface is also provided, to post-process
-the graphics produced by the vector graphics interface.
-
-The raster graphics interface operates directly on cairo surfaces.
-
-
-raster.gaussian_blur(surface, sigma)
-
-Applies a strength sigma gaussian blur on the surface.
-
-
-raster.box_blur(surface, size, repetitions)
-
-Applies a box blur filter of variable size to the surface as many times as
-specified. Please note that no specific optimisation is done for applying
-box filters over more general filters and using box blur over gaussian blur
-is probably no faster and might even be slower.
-
-
-raster.directional_blur(surface, angle, sigma)
-
-Apply a variable strength directional gaussian kernel blur to the image.
-Also known as motion blur. The angle is given in radians.
-
-
-raster.radial_blur(surface, cx, cy, sigma)
-
-Apply a variable strength radial gaussian blur centered on pixel (cx,cy).
-
-
-raster.invert(surface)
-
-Invert the colour in the given surface.
-
-For ARGB32 surfaces, only the colour channels are inverted, the alpha
-channel is kept as-is.
-For RGB24 surfaces, all channels are inverted.
-For A8 and A1 surfaces the alpha is inverted.
-
-
-raster.separable_filter(surface, filter, divisor)
-
-Apply a custom separable filter over the image.
-
-The filter must be a table of integers. After the convoluted value of each
-pixel is calculated, it is divided by divisor before it's stored back to the
-image.
-
-Note that this function can only work on integers, floating point values in
-the filter or divisor will be rounded first. To get higher precision, scale
-up the filter and divisor. (Treat it as fixed-point math.)
-
-The filter is one-dimensional, but is applied first horizontally and then
-vertically ovre the image to get the final image.
-
-
-raster.pixel_value_map(surface, expression)
-
-Map an expression over every pixel RGB value in the surface. Only works for
-ARGB32 and RGB24 surfaces.
-
-The expression is an RPN expression in the OverLua Expression Evaluator
-language, see expression-evaluator.txt for details.
-
-No additional functions are made available to the expression evaluator by
-this function.
-
-The following new registers are made available to the expression evaluator:
-  R  In range 0..1, red component. Input and output.
-  G  Ditto, for green component.
-  B  Ditto, for blue component.
-  A  Ditto, for alpha component. (Only on ARGB32 surfaces.)
-  X  X-coordinate of pixel being processed. Input only.
-  Y  Y-coordinate of pixel being processed. Input only.
-
-
-raster.pixel_coord_map(surface, expression)
-
-Map each pixel coordinate pair to a new coordinate pair in the surface. Only
-works for ARGB32 and RGB24 surfaces.
-
-The expression is an RPN expression in the OverLua Expression Evaluator
-language, see expression-evaluator.txt for details.
-
-No additional functions are made available to the expression evaluator by
-this function.
-
-The following new registers are made available to the expression evaluator:
-  X  Absolute pixel X coordinate. Input and output. The output may be
-     non-integer, in that case bilinear interpolation is used.
-  Y Ditto, for Y coordinate.
-
-
-More filtering functions are planned, though no specifics yet.
-
-Wishes/suggestions are welcome, and so are patches to add more functions.

OverLua/docs/rgb2hsl.lua

@@ -1,55 +0,0 @@
---- Convert RGB colour to HSL (hue/saturation/luminance)
--- The output image will have H instead of R,
--- S instead of G and L instead of B.
-
-function render_frame(f, t)
-	local w, h = f.width, f.height
-	for y = 0, h-1 do
-		for x = 0, w-1 do
-			local r, g, b = f(x, y)
-			local h, s, l = RGB2HSL(r, g, b)
-			f[y*w+x] = {h, s, l}
-		end
-	end
-end
-
-function clip_colorval(v)
-	if v < 0 then
-		return 0
-	elseif v > 255 then
-		return 255
-	else
-		return math.floor(v)
-	end
-end
-
-function RGB2HSL(R, G, B)
-	local r, g, b = R/255, G/255, B/255
-	local h, s, l
-	
-	local minrgb, maxrgb = math.min(r, math.min(g, b)), math.max(r, math.max(g, b))
-	
-	l = (minrgb + maxrgb) / 2
-	
-	if minrgb == maxrgb then
-		h, s = 0, 0
-	else
-		if l < 0.5 then
-			s = (maxrgb - minrgb) / (maxrgb + minrgb)
-		else
-			s = (maxrgb - minrgb) / (2 - maxrgb - minrgb)
-		end
-		if r == maxrgb then
-			h = (g - b) / (maxrgb - minrgb) + 0
-		elseif g == maxrgb then
-			h = (b - r) / (maxrgb - minrgb) + 2
-		else
-			h = (r - g) / (maxrgb - minrgb) + 4
-		end
-	end
-	
-	if h < 0 then h = h + 6 end
-	if h >= 6 then h = h - 6 end
-	
-	return clip_colorval(h*255/6), clip_colorval(s*255), clip_colorval(l*255)
-end

OverLua/docs/sample1.lua

@@ -1,134 +0,0 @@
---[[
-
-Sample script for OverLua
- - demonstrate basic reading in an ASS subtitle file and rendering its lines on the video
- 
-Given into the public domain.
-(You can do anything you want with this file, with no restrictions whatsoever.
- You don't get any warranties of any kind either, though.)
- 
-Originally authored by Niels Martin Hansen.
-
-]]
-
--- overlua_datastring is the string given to data= argument in Avisynth filter invocation
-timing_input_file = overlua_datastring
--- You may want to get these from somewhere else
--- Or just stick to hardcoding all styling information
-font_name = "Arial"
-font_size = 24
-
--- A little check that an input file was actually given
-assert(timing_input_file, "Missing input file")
-
-
--- An easier way to convert a string to a number and be guaranteed to get something useful
-function parsenum(str)
-	return tonumber(str) or 0
-end
--- Convert an ASS timestamp into a number of seconds
-function parse_ass_time(ass)
-	local h, m, s, cs = ass:match("(%d+):(%d+):(%d+)%.(%d+)")
-	return parsenum(cs)/100 + parsenum(s) + parsenum(m)*60 + parsenum(h)*3600
-end
-
--- Not used here, but do some basic \k timing parsing
-function parse_k_timing(text)
-	local syls = {}
-	local i = 1
-	for timing, syltext in text:gmatch("{\\k(%d+)}([^{]*)") do
-		local syl = {dur = parsenum(timing)/100, text = syltext, i = i}
-		table.insert(syls, syl)
-		i = i + 1
-	end
-	return syls
-end
-
--- Really stupid ASS parser
-function read_input_file(name)
-	for line in io.lines(name) do
-		-- You can catch Style lines in the same way if you want
-		local start_time, end_time, style, fx, text = line:match("Dialogue: 0,(.-),(.-),(.-),.-,0000,0000,0000,(.-),(.*)")
-		if text then
-			local ls = {}
-			ls.start_time = parse_ass_time(start_time)
-			ls.end_time = parse_ass_time(end_time)
-			ls.style = style
-			ls.fx = fx
-			ls.rawtext = text
-			ls.kara = parse_k_timing(text)
-			-- Clear out override blocks
-			ls.cleantext = text:gsub("{.-}", "")
-			table.insert(lines, ls)
-		end
-	end
-end
-
--- Initialisation function, intended to be run on the first frame
--- I think it's better to delay initialisation until first frame is requested
--- rather than doing it immediately at load time.
--- I believe much encoding software might be more graceful about that.
-function init()
-	if inited then return end
-	inited = true
-	
-	lines = {}
-	read_input_file(timing_input_file)
-end
-
-
--- Actual work function, this is what's called by OverLua for each frame
--- f is a video frame object, what we'll be drawing to
--- t is the timestamp of the frame, given in seconds (floating point)
-function render_frame(f, t)
-	-- Just call init() every time, init itself makes sure it doesn't init more than once
-	init()
-	
-	-- Find lines to be drawn
-	-- NOTE: This structure is very simplistic.
-	-- Advanced karaoke effects will probably need to build an object/effect list
-	-- as initialisation and then instead go over the list of objects/effects per frame,
-	-- instead of going over lines.
-	-- (Ie. preprocessing in the style of ASS karaoke generation.)
-	for i, line in pairs(lines) do
-		if line.start_time <= t and line.end_time > t then
-			-- Initial position of line
-			local x = 0
-			local y = f.height - 25
-			
-			-- Initialise drawing surface and context
-			local surf = cairo.image_surface_create(f.width, f.height, "argb32")
-			local c = surf.create_context()
-			
-			-- Select our font
-			c.select_font_face(font_name)
-			c.set_font_size(font_size)
-			
-			-- Get sizing information for font and line text
-			if not line.te then line.te = c.text_extents(line.cleantext); line.fe = c.font_extents() end
-			-- Calculate centered position
-			x = (f.width - line.te.width) / 2 - line.te.x_bearing
-			
-			-- Produce text path
-			c.move_to(x, y)
-			c.text_path(line.cleantext)
-			
-			-- Draw a black border
-			-- It will be centered on the text outline
-			c.set_line_width(4)
-			c.set_line_join("round") -- default is "miter"
-			c.set_source_rgba(0, 0, 0, 1)
-			-- "preserve" to keep the text path in the context
-			c.stroke_preserve()
-			-- Apply a little box blur to the border, effectively \be1
-			raster.box_blur(surf, 3)
-			
-			-- Draw a white fill - this will draw over the inner part of the border
-			c.set_source_rgba(1, 1, 1, 1)
-			c.fill()
-
-			-- Overlay on video
-			f.overlay_cairo_surface(surf, 0, 0)
-		end
-	end
-end

OverLua/docs/sample2.lua

@@ -1,235 +0,0 @@
---[[
-
-Sample script for OverLua
- - demonstrate basic reading in an ASS subtitle file and rendering its lines on the video
- 
-Given into the public domain.
-(You can do anything you want with this file, with no restrictions whatsoever.
- You don't get any warranties of any kind either, though.)
- 
-Originally authored by Niels Martin Hansen.
-
-]]
-
--- Set up some parameters
-timing_input_file = overlua_datastring
--- Just the font name to use.
-font_name = "Arial"
--- This is height in pixels, I suppose ;)
-font_size = 40
--- This is the position of the _baseline_ of the text, neither top, bottom nor center!
-ypos = 50
--- Duration of fadein/out in seconds
-fadetime = 1
-
--- Error out if no file name was given (data= in Avisynth invocation)
-assert(timing_input_file, "Missing timing input file for sample effect.")
-
-
--- ASS file reading stuff
-function parsenum(str)
-	return tonumber(str) or 0
-end
-function parse_ass_time(ass)
-	local h, m, s, cs = ass:match("(%d+):(%d+):(%d+)%.(%d+)")
-	return parsenum(cs)/100 + parsenum(s) + parsenum(m)*60 + parsenum(h)*3600
-end
-
-function parse_k_timing(text)
-	local syls = {}
-	local cleantext = ""
-	local i = 1
-	for timing, syltext in text:gmatch("{\\k(%d+)}([^{]*)") do
-		local syl = {dur = parsenum(timing)/100, text = syltext, i = i}
-		table.insert(syls, syl)
-		cleantext = cleantext .. syltext
-		i = i + 1
-	end
-	return syls, cleantext
-end
-
-function read_input_file(name)
-	for line in io.lines(name) do
-		local start_time, end_time, fx, text = line:match("Dialogue: 0,(.-),(.-),Default,,0000,0000,0000,(.-),(.*)")
-		if text then
-			local ls = {}
-			ls.start_time = parse_ass_time(start_time)
-			ls.end_time = parse_ass_time(end_time)
-			ls.fx = fx
-			ls.rawtext = text
-			ls.kara, ls.cleantext = parse_k_timing(text)
-			table.insert(lines, ls)
-		end
-	end
-end
-
-function init()
-	if inited then return end
-	inited = true
-	
-	lines = {}
-	read_input_file(timing_input_file)
-end
-
-
--- Get/create a "sparks" texture, singleton-style
-function get_sparks_texture(width, height)
-	-- Check if it already exists, just return it then
-	if sparks_texture then return sparks_texture end
-	-- We'll make a 128x128 black image with some blurred whitish spots on
-	local surf = cairo.image_surface_create(128, 128, "rgb24")
-	local c = surf.create_context()
-	-- Paint it all black
-	c.set_source_rgb(0,0,0)
-	c.paint()
-	-- Then create a very light yellow
-	c.set_source_rgb(1,1,0.9)
-	-- And create 50 small, random circles
-	for i = 1, 50 do
-		local x, y = math.random(120)+4, math.random(120)+4
-		c.arc(x, y, 3, 0, 2*math.pi)
-		c.fill()
-	end
-	-- And blur the result
-	raster.gaussian_blur(surf, 2.5)
-	
-	-- Then create a texture of it.
-	-- sparks_texture becomes a global variable
-	sparks_texture = cairo.pattern_create_for_surface(surf)
-	sparks_texture.set_extend("repeat")
-	
-	return sparks_texture
-end
-
-
-function render_frame(f, t)
-	init()
-	
-	-- Create a blurred copy of the video frame
-	local fsurf = f.create_cairo_surface()
-	raster.gaussian_blur(fsurf, 5)
-	
-	-- Function to create "wobble" effect on the text
-	local function blubble_mapper(x, y)
-		local nx = x + math.sin(x/30 + y/10 + t*2.0)*3
-		local ny = y + math.cos(y/20 + x/20 + t*2.3)*3
-		return nx, ny
-	end
-	
-	-- Find lines to be drawn
-	for i, line in pairs(lines) do
-		-- Check if the line is within time range.
-		-- "In time range" means starts fadetime seconds later than current time or ends "fadetime" seconds earlier.
-		if line.start_time <= t+fadetime and line.end_time > t-fadetime then
-			local x = 0
-			local y = ypos
-			
-			-- Prepare a surface to draw on
-			local surf = cairo.image_surface_create(f.width, 200, "argb32")
-			local c = surf.create_context()
-			-- Select the font
-			c.select_font_face(font_name)
-			c.set_font_size(font_size)
-			-- Get the text extents for the line text if we don't have them already
-			if not line.te then line.te = c.text_extents(line.cleantext); line.fe = c.font_extents() end
-			-- And calculate the start X to have the line centered
-			x = (f.width - line.te.width) / 2 - line.te.x_bearing
-			-- Then make a path for the text
-			c.move_to(x, y)
-			c.text_path(line.cleantext)
-			
-			-- Create the "wobble" effect on the text
-			-- First get a Path object for the text
-			local path = c.copy_path()
-			-- Run the path through the mapping function
-			path.map_coords(blubble_mapper)
-			-- Clear the path in the context
-			c.new_path()
-			-- And add the modified path back
-			c.append_path(path)
-			
-			-- Prepare drawing the text outline
-			c.set_line_width(8)
-			-- Red outline
-			c.set_source_rgba(1, 0, 0, 1)
-			-- Stroke it but keep the path in the canvas
-			c.stroke_preserve()
-			-- Blur this outline
-			raster.gaussian_blur(surf, 1.5)
-			-- Prepare another, smaller outline on top
-			c.set_line_width(3)
-			-- This one is white
-			c.set_source_rgba(1, 1, 1, 1)
-			-- Stroke that one too, but clear the path afterwards
-			c.stroke()
-			
-			-- Now loop over the syllables to draw them one by one
-			local sumdur = line.start_time
-			for j, syl in pairs(line.kara) do
-				-- Get the text extents for this syllable
-				if not syl.te then syl.te = c.text_extents(syl.text) end
-				-- Prepare the path
-				c.move_to(x, y)
-				c.text_path(syl.text)
-				-- Wobble the path; this will work because the mapper is deterministic on X, Y and timestamp
-				local path = c.copy_path()
-				path.map_coords(blubble_mapper)
-				c.new_path()
-				c.append_path(path)
-				-- And advance X position
-				x = x + syl.te.x_advance
-				-- Now figure out whether this syllable is the active one or not
-				-- Use a more complicated test, this makes the first syllable be highlighted
-				-- also while the line is fading in, and the last while the line is fading out.
-				if (syl.i == 1 and t < sumdur+syl.dur) or
-						(syl.i == #line.kara and t > sumdur) or
-						(t >= sumdur and t < sumdur+syl.dur) then
-					-- Get the "sparks" texture
-					local sparks = get_sparks_texture()
-					-- Prepare a transformation matrix for it
-					local texmat = cairo.matrix_create()
-					texmat.init_rotate(t/10)
-					texmat.scale(3, 3)
-					sparks.set_matrix(texmat)
-					-- Use the texture
-					c.set_source(sparks)
-					-- And fill the path
-					c.fill()
-				else
-					-- Not the active syllable, fill it with a blurred video frame
-					-- Remember fsurf is the blurred video frame
-					c.set_source_surface(fsurf, 0, 0)
-					c.fill_preserve()
-					-- Also add a slight darkening to the fill
-					c.set_source_rgba(0, 0, 0, 0.2)
-					c.fill()
-				end
-				-- Advance the sum of syllable durations
-				sumdur = sumdur + syl.dur
-			end
-			
-			-- Figure out whether we're past the actual start/end time of the line and do some fading then
-			local final = surf
-			if t < line.start_time or t > line.end_time then
-				-- Make invisibility the amount the line is invisible
-				local invisibility
-				if t < line.start_time then
-					invisibility = (line.start_time - t) / fadetime
-				else
-					invisibility = (t - line.end_time) / fadetime
-				end
-				-- We'll need a new surface object here
-				final = cairo.image_surface_create(surf.get_width(), surf.get_height(), "argb32")
-				local c = final.create_context()
-				-- So we can alpha-blend the original drawn text image onto it using invisibility as alpha
-				c.set_source_surface(surf, 0, 0)
-				c.paint_with_alpha(1-invisibility)
-				-- And then do some heavy blur-out
-				raster.gaussian_blur(final, invisibility*15)
-			end
-			
-			-- Finally just overlay the text image on the video
-			f.overlay_cairo_surface(final, 0, 0)
-		end
-	end
-end

OverLua/docs/sample3.lua

@@ -1,645 +0,0 @@
---[[
-
-Sample script for OverLua
- - advanced karaoke effect, first version of Mendoi-Conclave Gundam 00 OP 1
- 
-Given into the public domain.
-(You can do anything you want with this file, with no restrictions whatsoever.
- You don't get any warranties of any kind either, though.)
- 
-Originally authored by Niels Martin Hansen.
-
-While I can't prevent you from it, please don't use this effect script
-verbatim or almost-verbatim for own productions. It's mainly intended for
-showing techniques, just using it without modifications or with only light
-modifications is what I'd consider "cheap".
-
-Be aware that this effect is very slow at rendering, at full 720p resolution
-it takes around 3 hours to render on my dual 2.2 GHz Opteron.
-
-This effect is called "OH NOES" by the way. No special meaning to that.
-
-It's best read from bottom to top.
-
-]]
-
-
--- Virtual resolution, 720p
-local virtual_res_x = 1280
-local virtual_res_y = 720
--- Font names
---local latin_font = "Eras Bold ITC"
-local latin_font = "Briem Akademi Std Semibold"
-local latin_weight = ""
-local kanji_font = "DFGSoGei-W9"
--- Font sizes
-local romaji_size = 34
-local engrish_size = 36
-local kanji_size = 30
-local tl_size = 36
--- Text positions (vertical only, assumed centered)
-local romaji_pos_y = 55
-local tl_pos_y = virtual_res_y - 38
-local kanji_pos_y = virtual_res_y - 27
-local kanji_pos_x = virtual_res_x - 55
-local engrish_pos_y = virtual_res_y - 38
-
-
-timing_input_file = overlua_datastring
-assert(timing_input_file, "OH NOES! Missing timing input file.")
-
-
--- Here's some mostly standard input file parsing functions
-
-function parsenum(str)
-	return tonumber(str) or 0
-end
-function parse_ass_time(ass)
-	local h, m, s, cs = ass:match("(%d+):(%d+):(%d+)%.(%d+)")
-	return parsenum(cs)/100 + parsenum(s) + parsenum(m)*60 + parsenum(h)*3600
-end
-
-function parse_k_timing(text)
-	local syls = {}
-	local cleantext = ""
-	local i = 1
-	for timing, syltext in text:gmatch("{\\k(%d+)}([^{]*)") do
-		local syl = {dur = parsenum(timing)/100, text = syltext, i = i}
-		local maintext, furitext = syltext:match("(.-)|(.+)")
-		-- Note that there is a light support for Auto4 style furigana
-		-- in this script, but I haven't maintained it since it ended up being
-		-- unused.
-		if maintext and furitext and furitext ~= "" then
-			syl.text = maintext
-			syl.furi = furitext
-		end
-		table.insert(syls, syl)
-		cleantext = cleantext .. syl.text
-		i = i + 1
-	end
-	return syls, cleantext
-end
-
-function read_input_file(name)
-	for line in io.lines(name) do
-		local start_time, end_time, style, fx, text = line:match("Dialogue: 0,(.-),(.-),(.-),,0000,0000,0000,(.-),(.*)")
-		if text then
-			local ls = {}
-			ls.start_time = parse_ass_time(start_time)
-			ls.end_time = parse_ass_time(end_time)
-			ls.style = style
-			ls.fx = fx
-			ls.rawtext = text
-			ls.kara, ls.cleantext = parse_k_timing(text)
-			table.insert(lines, ls)
-		end
-	end
-end
-
-function init()
-	if inited then return end
-	inited = true
-	
-	lines = {}
-	read_input_file(timing_input_file)
-end
-
-
--- Calculate size and position of a line and its syllables
--- Only for horizontal lines, not vertical
-function calc_line_metrics(ctx, line, font_name, font_size, pos_y)
-	if line.pos_x then return end
-
-	ctx.select_font_face(font_name, "", latin_weight)
-	ctx.set_font_size(font_size)
-	
-	line.te = ctx.text_extents(line.cleantext)
-	line.fe = ctx.font_extents()
-	
-	line.pos_x = (virtual_res_x - line.te.width) / 2 - line.te.x_bearing
-	line.pos_y = pos_y
-	
-	if #line.kara < 2 then return end
-	
-	local curx = line.pos_x
-	for i, syl in pairs(line.kara) do
-		syl.te = ctx.text_extents(syl.text)
-		syl.pos_x = curx
-		syl.center_x = curx + syl.te.x_bearing + syl.te.width/2
-		syl.center_y = pos_y - line.fe.ascent/2 + line.fe.descent/2
-		curx = curx + syl.te.x_advance
-		
-		if syl.furi then
-			ctx.set_font_size(font_size/2)
-			syl.furite = ctx.text_extents(syl.furi)
-			syl.furife = ctx.font_extents()
-			ctx.set_font_size(font_size)
-			syl.furi_x = syl.center_x - syl.furite.width/2 - syl.furite.x_bearing
-			syl.furi_y = pos_y - line.fe.height
-		end
-	end
-end
-
--- Paint the image of a line of text to a cairo context
--- Assumes the current path in the context is of the text to be painted
-function paint_text(surf, ctx)
-	ctx.set_line_join("round")
-	ctx.set_source_rgba(0, 0.2, 0.3, 0.8)
-	ctx.set_line_width(3)
-	ctx.stroke_preserve()
-	raster.gaussian_blur(surf, 1.7)
-	ctx.set_source_rgba(1, 1, 1, 0.95)
-	ctx.fill()
-end
-
-
--- Render one of the zoomed circles with some parameters
--- width and height are of the source area to be visible in the zoomed image
--- Some of this is a bit hacked, I just changed stuff around until it worked,
--- honestly. Analyse it if you want, it still doesn't fully make sense to me ;)
-function make_zoomed_ellipsis(srcsurf, center_x, center_y, width, height)
-	local factor = 0.7
-	
-	local target_width, target_height = math.ceil(width/factor), math.ceil(height/factor)
-	
-	local target = cairo.image_surface_create(target_width, target_height, "argb32")
-	local targetctx = target.create_context()
-	
-	local src_x, src_y = center_x - width/2, center_y - height/2
-	
-	-- The basic premise is just taking the source surface, making an upscaling
-	-- pattern of it and fill a circle with the correct portion of it.
-	-- Actually pretty simple, it's just getting the numbers right.
-	local srcpat = cairo.pattern_create_for_surface(srcsurf)
-	srcpat.set_extend("none")
-	local srcpatmatrix = cairo.matrix_create()
-	srcpatmatrix.init_translate(src_x, src_y)
-	srcpatmatrix.scale(factor, factor)
-	srcpat.set_matrix(srcpatmatrix)
-	
-	targetctx.scale(target_width, target_height)
-	targetctx.arc(0.5, 0.5, 0.5, 0, math.pi*2)
-	targetctx.scale(1/target_width, 1/target_height)
-	targetctx.set_source(srcpat)
-	targetctx.fill()
-	
-	return target, target_width, target_height
-end
-
-
--- Duration in seconds for the fade-in/-outs
-local fadeinoutdur = 1.2
-
-
--- Paint a complete line of karaoke text with all effects, except the
--- zoom circles, to a context. It depends on l.textsurf containing the line
--- image.
--- The main attraction here is the fade-over effect.
-function paint_kara_text(f, ctx, t, l)
-	local fade, fademask, fadetype
-	-- Check if we're fading in?
-	if t < l.start_time + fadeinoutdur and l.fx ~= "nofadein" then
-		-- Calculate the position of the fade
-		fade = 1 - (l.start_time - t + fadeinoutdur/2) / fadeinoutdur
-		-- Create a gradient pattern that shows only the relevant part of
-		-- the line for the fade.
-		fademask = cairo.pattern_create_linear(virtual_res_x*fade, virtual_res_y/2, virtual_res_x*fade - 100, virtual_res_y/2-30)
-		fademask.add_color_stop_rgba(0, 1, 1, 1, 0)
-		fademask.add_color_stop_rgba(0.05, 1, 1, 1, 1)
-		fademask.add_color_stop_rgba(0.3, 1, 1, 1, 0.2)
-		fademask.add_color_stop_rgba(1, 1, 1, 1, 1)
-		fadetype = "in"
-	end
-	-- Or fading out?
-	if l.end_time - fadeinoutdur <= t and l.fx ~= "last" and l.fx~= "nofadeout" then
-		-- Pretty much the same as for fade in, except that a different part of
-		-- the line is shown by the produced pattern
-		fade = (t - l.end_time + fadeinoutdur/2) / fadeinoutdur
-		fademask = cairo.pattern_create_linear(virtual_res_x*fade, virtual_res_y/2, virtual_res_x*fade + 100, virtual_res_y/2+30)
-		fademask.add_color_stop_rgba(0, 1, 1, 1, 0)
-		fademask.add_color_stop_rgba(0.05, 1, 1, 1, 1)
-		fademask.add_color_stop_rgba(0.3, 1, 1, 1, 0.2)
-		fademask.add_color_stop_rgba(1, 1, 1, 1, 1)
-		fadetype = "out"
-	end
-	-- Is the line even visible?!
-	if not fade and (t < l.start_time or l.end_time <= t) then return end
-	
-	-- A function that calculates the distance between a point and the fade
-	-- The distance is calculated only along the X axis, so it's not the
-	-- shortest distance from the point to the "fade line".
-	-- Used to determine which side of the fade a point is on.
-	local function fadedist(x, y) -- on X axis
-		local fade_x_at_y = virtual_res_x*fade - (y - virtual_res_y/2) * 3/10
-		if fadetype == "in" then
-			return fade_x_at_y - x
-		else
-			return x - fade_x_at_y
-		end
-	end
-	
-	-- We'll be painting the surface with the image of the text
-	ctx.set_source_surface(l.textsurf, 0, 0)
-	if fade then
-		-- So first paint the text with the fading-mask
-		ctx.mask(fademask)
-		
-		-- Now generate a slightly different mask for the bloom effect
-		-- This one goes "both ways", it's not restricted to just one direction;
-		-- it gets limited later
-		local bloommask = cairo.pattern_create_linear(virtual_res_x*fade - 200, virtual_res_y/2-60, virtual_res_x*fade + 200, virtual_res_y/2+60)
-		bloommask.add_color_stop_rgba(0, 1, 1, 1, 0)
-		bloommask.add_color_stop_rgba(0.5, 1, 1, 1, 1)
-		bloommask.add_color_stop_rgba(1, 1, 1, 1, 0)
-		local bloom = cairo.image_surface_create(virtual_res_x, virtual_res_y, "argb32")
-		local bc = bloom.create_context()
-		bc.set_source_surface(l.textsurf, 0, 0)
-		bc.mask(fademask)
-		-- Ok, this could be done in a faster way I bet... modify the colour of
-		-- the bloom effect depending on whether it's a fade in or out,
-		-- by running a pixel value mapping program over them.
-		if fadetype == "out" then
-			raster.pixel_value_map(bloom, "R 0.9 * =R  G 0.1 * =G  B 0.4 * =B")
-		else
-			raster.pixel_value_map(bloom, "R 0.22 * =R  G 0.45 * =G  B 0.44 * =B")
-		end
-		-- Now, three times, do an additive blending of a successively more
-		-- blurred version of the masked text.
-		-- Exploit that the text border is very dark, so it won't contribute
-		-- much at all to the overall result.
-		-- If the border was brighter a different image of the text would need
-		-- to be used instead.
-		-- This is what *really* kills the rendering speed!
-		ctx.set_operator("add")
-		raster.gaussian_blur(bloom, 3)
-		ctx.set_source_surface(bloom, 0, 0)
-		ctx.mask(bloommask)
-		raster.gaussian_blur(bloom, 3)
-		ctx.set_source_surface(bloom, 0, 0)
-		ctx.mask(bloommask)
-		raster.gaussian_blur(bloom, 3)
-		ctx.set_source_surface(bloom, 0, 0)
-		ctx.mask(bloommask)
-		ctx.set_operator("over")
-	else
-		-- We aren't fading, just do a plain paint of the text image
-		ctx.paint()
-	end
-	
-	return fade, fademask, fadetype, fadedist
-end
-
-
--- Line style processing functions
--- The entries in this table are matched with the line Style fields to pick
--- an appropriate handling function for the line.
-stylefunc = {}
-
--- This is a generic handling function called by other functions
-function stylefunc.generic(f, ctx, t, l, font_name, font_size, pos_y)
-	-- Fast return for irrelevant lines
-	if t < l.start_time - fadeinoutdur/2 then return end
-	if l.end_time + fadeinoutdur/2 <= t then return end
-
-	-- Make sure we have the positioning information for the line
-	calc_line_metrics(ctx, l, font_name, font_size, pos_y)
-	
-	-- If it's the first time this line is processed, generate the image of it
-	if not l.textsurf then
-		-- Create surface for the text image
-		local textsurf = cairo.image_surface_create(virtual_res_x, virtual_res_y, "argb32")
-		local c = textsurf.create_context()
-		
-		-- Fill it with a path of the text
-		c.select_font_face(font_name, "", latin_weight)
-		c.set_font_size(font_size)
-		
-		c.move_to(l.pos_x, l.pos_y)
-		c.text_path(l.cleantext)
-		
-		for i, syl in pairs(l.kara) do
-			if syl.furi then
-				c.set_font_size(kanji_size/2)
-				c.move_to(syl.furi_x, syl.furi_y)
-				c.text_path(syl.furi)
-			end
-		end
-		
-		paint_text(textsurf, c)
-		
-		l.textsurf = textsurf
-	end
-	
-	-- Check if we're on the last line which needs the "fade all out" effect
-	if l.fx == "last" and t > l.end_time - 1.5 then
-		fade_all_out = (l.end_time - t) / 1.5
-	else
-		fade_all_out = nil
-	end
-	
-	-- Put the actual text onto the video image
-	local fade, fademask, fadetype, fadedist = paint_kara_text(f, ctx, t, l)
-	
-	-- Search for a currently highlighted syllable in the text
-	local sumdur = l.start_time
-	local cursyl = -1
-	for i, syl in pairs(l.kara) do
-		syl.start_time = sumdur
-		if t >= sumdur and t < sumdur+syl.dur then
-			cursyl = i
-		end
-		sumdur = sumdur + syl.dur
-	end
-	
-	if cursyl >= 1 then
-		-- There is a current syllable
-		-- Figure out where to put the zoom circle
-		local syl = l.kara[cursyl]
-		-- Assume it's at the center of the syllable for now
-		local zoompoint = {
-			cx = syl.center_x,
-			cy = syl.center_y,
-			size = math.max(syl.te.width, syl.te.height)
-		}
-		-- But check if we're time-wise close enough to the previous syllable
-		-- (if there is one) to do a transition from it
-		local prevsyl
-		if cursyl >= 2 then
-			local prevsyli = cursyl - 1
-			repeat
-				prevsyl = l.kara[prevsyli]
-				prevsyli = prevsyli - 1
-			until (prevsyl.dur > 0)
-			if syl.dur > 0.100 and t - syl.start_time < 0.100 then
-				local pcx, pcy = prevsyl.center_x, prevsyl.center_y
-				local psize = math.max(prevsyl.te.width, prevsyl.te.height)
-				local v = (t - syl.start_time) / 0.100
-				local iv = 1 - v
-				zoompoint.cx = iv * pcx + v * zoompoint.cx
-				zoompoint.cy = iv * pcy + v * zoompoint.cy
-				zoompoint.size = iv * psize + v * zoompoint.size
-			end
-		elseif cursyl == 1 and syl.dur > 0.100 and t - syl.start_time < 0.100 then
-			zoompoint.size = zoompoint.size * (t - syl.start_time) / 0.100
-		end
-		zoompoint.size = zoompoint.size * 1.1
-		-- Check that we aren't fading over and that the center of the zoom is
-		-- not outside the visible part of the line.
-		if not fade or fadedist(zoompoint.cx, zoompoint.cy) > 0 then
-			-- Insert (enable) the zoom point then
-			table.insert(zoompoints, zoompoint)
-		end
-	end
-end
-
--- The Romaji and Engrish styles are both the same generic thing
-function stylefunc.Romaji(f, ctx, t, l)
-	stylefunc.generic(f, ctx, t, l, latin_font, romaji_size, romaji_pos_y)
-end
-
--- Engrish was used for the somewhat-English lines in the original lyrics
--- (I.e. not for the translation.)
-function stylefunc.Engrish(f, ctx, t, l)
-	stylefunc.generic(f, ctx, t, l, latin_font, engrish_size, engrish_pos_y)
-end
-
--- The vertical kanji need a rather different handling
-function stylefunc.Kanji(f, ctx, t, l)
-	-- Again, check for fast skip
-	if t < l.start_time - fadeinoutdur/2 then return end
-	if l.end_time + fadeinoutdur/2 <= t then return end
-
-	-- Mostly the same as for the generic handling, except that we also
-	-- calculate the metrics here.
-	if not l.textsurf then
-		local textsurf = cairo.image_surface_create(virtual_res_x, virtual_res_y, "argb32")
-		local c = textsurf.create_context()
-		
-		c.select_font_face("@"..kanji_font)
-		c.set_font_size(kanji_size)
-		
-		l.te = c.text_extents(l.cleantext)
-		l.fe = c.font_extents()
-		
-		l.pos_x = kanji_pos_x
-		l.pos_y = (virtual_res_y - l.te.width) / 2 - l.te.x_bearing
-		
-		local cury = l.pos_y
-		for i, syl in pairs(l.kara) do
-			syl.te = c.text_extents(syl.text)
-			syl.pos_y = cury
-			syl.center_y = cury + syl.te.x_bearing + syl.te.width/2
-			syl.center_x = kanji_pos_x + l.fe.ascent/2 - l.fe.descent/2
-			cury = cury + syl.te.x_advance
-		end
-		
-		c.translate(l.pos_x, l.pos_y)
-		c.rotate(math.pi/2)
-		c.move_to(0,0)
-		c.text_path(l.cleantext)
-		
-		paint_text(textsurf, c)
-		
-		l.textsurf = textsurf
-	end
-
-	local fade, fademask, fadetype, fadedist = paint_kara_text(f, ctx, t, l)
-	
-	-- Lots of copy-paste (code re-use!) here, slightly adapted for vertical
-	-- text rather than horizontal stuff.
-	local sumdur = l.start_time
-	local cursyl = -1
-	for i, syl in pairs(l.kara) do
-		syl.start_time = sumdur
-		if t >= sumdur and t < sumdur+syl.dur then
-			cursyl = i
-		end
-		sumdur = sumdur + syl.dur
-	end
-	
-	if cursyl >= 1 then
-		local syl = l.kara[cursyl]
-		local zoompoint = {
-			cx = syl.center_x,
-			cy = syl.center_y,
-			size = math.max(syl.te.width, syl.te.height)
-		}
-		local prevsyl
-		if cursyl >= 2 then
-			local prevsyli = cursyl - 1
-			repeat
-				prevsyl = l.kara[prevsyli]
-				prevsyli = prevsyli - 1
-			until (prevsyl.dur > 0)
-			if syl.dur > 0.100 and t - syl.start_time < 0.100 then
-				local pcx, pcy = prevsyl.center_x, prevsyl.center_y
-				local psize = math.max(prevsyl.te.width, prevsyl.te.height)
-				local v = (t - syl.start_time) / 0.100
-				local iv = 1 - v
-				zoompoint.cx = iv * pcx + v * zoompoint.cx
-				zoompoint.cy = iv * pcy + v * zoompoint.cy
-				zoompoint.size = iv * psize + v * zoompoint.size
-			end
-		elseif cursyl == 1 and syl.dur > 0.100 and t - syl.start_time < 0.100 then
-			zoompoint.size = zoompoint.size * (t - syl.start_time) / 0.100
-		end
-		zoompoint.size = zoompoint.size * 1.1
-		if not fade or fadedist(zoompoint.cx, zoompoint.cy) > 0 then
-			table.insert(zoompoints, zoompoint)
-		end
-	end
-end
-
--- The translation lines get a somewhat simplified handling again.
--- Originally separated out because some translated lines were split into two
--- stacked lines, but that was dropped again.
-function stylefunc.TL(f, ctx, t, l)
-	if t < l.start_time - fadeinoutdur/2 then return end
-	if l.end_time + fadeinoutdur/2 <= t then return end
-	
-	local line1, line2 = l.rawtext, l.rawtext:find("\\n", 1, true)
-	if line2 then
-		line1 = l.rawtext:sub(line2+2)
-		line2 = l.rawtext:sub(1, line2-1)
-	else
-		line2 = ""
-	end
-	
-	if not l.textsurf then
-		local textsurf = cairo.image_surface_create(virtual_res_x, virtual_res_y, "argb32")
-		local c = textsurf.create_context()
-		
-		c.select_font_face(latin_font, "", latin_weight)
-		c.set_font_size(tl_size)
-		
-		l.te1 = c.text_extents(line1)
-		l.te2 = c.text_extents(line2)
-		l.fe = c.font_extents()
-		
-		l.pos1_x = (virtual_res_x - l.te1.width) / 2 - l.te1.x_bearing
-		l.pos2_x = (virtual_res_x - l.te2.width) / 2 - l.te2.x_bearing
-		l.pos1_y = tl_pos_y
-		l.pos2_y = tl_pos_y - l.fe.height
-		
-		c.move_to(l.pos1_x, l.pos1_y)
-		c.text_path(line1)
-		c.move_to(l.pos2_x, l.pos2_y)
-		c.text_path(line2)
-		
-		paint_text(textsurf, c)
-		
-		l.textsurf = textsurf
-	end
-
-	paint_kara_text(f, ctx, t, l)
-end
-
-
--- Paint a zoom circle onto the video
--- zp is one of the zoompoint structures generated in the style functions
-function draw_zoompoint(surf, ctx, t, zp)
-	if zp.size < 5 then return end
-
-	local zoom, zoom_width, zoom_height = make_zoomed_ellipsis(surf, zp.cx, zp.cy, zp.size*1.2, zp.size*1.2)
-	
-	local glow = cairo.image_surface_create(zoom_width+50, zoom_height+50, "argb32")
-	local gc = glow.create_context()
-
-	-- Hue-rotation
-	-- Based on HSL-to-RGB code from Aegisub
-	local r, g, b
-	local cspeed = 1/5
-	local sat = 69
-	local q = math.floor((cspeed*t) % 6)
-	local qf = ((cspeed*t) % 6 - q) * (255-sat)
-	if q == 0 then
-		r = 255
-		g = sat + qf
-		b = sat
-	elseif q == 1 then
-		r = sat + 255 - qf
-		g = 255
-		b = sat
-	elseif q == 2 then
-		r = sat
-		g = 255
-		b = sat + qf
-	elseif q == 3 then
-		r = sat
-		g = sat + 255 - qf
-		b = 255
-	elseif q == 4 then
-		r = sat + qf
-		g = qf
-		b = 255
-	elseif q == 5 then
-		r = 255
-		g = sat
-		b = qf + 255 - qf
-	end
-	-- Circle-tail-chaser thing
-	-- Just a bunch of increasingly opaque lines drawn from a center
-	-- and overlapping enough to create a sense of continuity.
-	gc.set_line_width(6)
-	for a = 0, 1, 1/zoom_height do
-		gc.set_source_rgba(r/255, g/255, b/255, a)
-		gc.move_to(zoom_width/2+25, zoom_height/2+25)
-		gc.rel_line_to((zoom_width/2+5) * math.sin(-t*8-a*math.pi*2), (zoom_height/2+5) * math.cos(-t*8-a*math.pi*2))
-		gc.stroke()
-	end
-	-- Love gaussian blur!
-	raster.gaussian_blur(glow, 2)
-	
-	-- Use additive blend to put the tail-chaser onto the video
-	ctx.set_source_surface(glow, zp.cx-zoom_width/2-25, zp.cy-zoom_height/2-25)
-	local oldop = ctx.get_operator()
-	ctx.set_operator("add")
-	ctx.paint()
-	ctx.set_operator(oldop)
-	
-	-- And regular blend for the zoom circle
-	ctx.set_source_surface(zoom, zp.cx-zoom_width/2, zp.cy-zoom_height/2)
-	ctx.paint()
-end
-
-
-function render_frame(f, t)
-	-- Make sure we're initialised
-	init()
-	
-	-- Clear the list of zoom points
-	zoompoints = {}
-	
-	-- Create a surface and context from the video
-	local worksurf = f.create_cairo_surface()
-	local workctx = worksurf.create_context()
-	-- This should make it possible to render on different resolution videos,
-	-- but I don't think it works
-	workctx.scale(f.width / virtual_res_x, f.height / virtual_res_y)
-	
-	-- Run over each input line, processing it
-	-- This will draw the main text and transition effects
-	for i, line in pairs(lines) do
-		if stylefunc[line.style] then
-			stylefunc[line.style](worksurf, workctx, t, line)
-		end
-	end
-	
-	-- Then go over the zoom points and draw those on top
-	-- If this isn't done after all lines have been drawn, lines that are close
-	-- to each other could end up overlapping each others' zoom circles.
-	for i, zp in pairs(zoompoints) do
-		draw_zoompoint(worksurf, workctx, t, zp)
-	end
-	
-	-- If we're fading it all out, make the karaoke less visible by doing
-	-- an alpha paint over with the original video frame.
-	if fade_all_out then
-		local vidsurf = f.create_cairo_surface()
-		workctx.set_source_surface(vidsurf, 0, 0)
-		workctx.paint_with_alpha(1-fade_all_out)
-	end
-
-	-- Finally put the video frame back
-	f.overlay_cairo_surface(worksurf, 0, 0)
-end

OverLua/docs/sample4.lua

@@ -1,432 +0,0 @@
---[[
-
-Sample script for OverLua
- - advanced karaoke effect, Prism Ark OP kara effect for Anime-Share Fansubs
- 
-Given into the public domain.
-(You can do anything you want with this file, with no restrictions whatsoever.
- You don't get any warranties of any kind either, though.)
- 
-Originally authored by Niels Martin Hansen.
-
-Not an extremely advanced effect, but showcases improved parsing of ASS files
-and using information from the Style lines for the styling information.
-
-Pretty fast to render at SD resolutions.
-
-As for other effects, please consider that it's not much fun to just re-use
-an effect someone else wrote, especially not verbatim. If you elect to use
-this sample for something, I ask you to do something original with it. I
-can't force you, but please :)
-
-I'm leaving several sections of this script mostly unexplained, because I've
-for a large part copied those from the Gundam 00 OP 1 effect (sample3) I did
-a few days before this one.
-Please see sample3.lua for explanations of those, if you need them.
-
-]]
-
----- START CONFIGURATION ----
-
--- Duration of line fade-in/outs, in seconds
-local line_fade_duration = 0.5
--- Minimum duration of highlights, also seconds
-local syl_highlight_duration = 0.5
-
----- END CONFIGURATION ----
-
-
--- Trim spaces from beginning and end of string
-function string.trim(s)
-	return (string.gsub(s, "^%s*(.-)%s*$", "%1"))
-end
-
-
--- Script and video resolutions
-local sres_x, sres_y
-local vres_x, vres_y
-
--- Stuff read from style definitions
-local font_name = {}
-local font_size = {}
-local font_bold = {}
-local font_italic = {}
-local pos_v = {}
-local vertical = {}
-local color1, color2, color3, color4 = {}, {}, {}, {}
-
--- Input lines
-local lines = {}
-
-
--- Read input file
-function read_field(ass_line, num)
-	local val, rest = ass_line:match("(.-),(.*)")
-	if not rest then
-		return ass_line, ""
-	elseif num > 1 then
-		return val, read_field(rest, num-1)
-	else
-		return val, rest
-	end
-end
-function parsenum(str)
-	return tonumber(str) or 0
-end
-function parse_ass_time(ass)
-	local h, m, s, cs = ass:match("(%d+):(%d+):(%d+)%.(%d+)")
-	return parsenum(cs)/100 + parsenum(s) + parsenum(m)*60 + parsenum(h)*3600
-end
-function parse_style_color(color)
-	local res = {r = 0, g = 0, b = 0, a = 0}
-	local a, b, g, r = color:match("&H(%x%x)(%x%x)(%x%x)(%x%x)")
-	res.r = tonumber(r, 16) / 255
-	res.g = tonumber(g, 16) / 255
-	res.b = tonumber(b, 16) / 255
-	res.a = 1 - tonumber(a, 16) / 255 -- Alpha has inverse meaning in ASS and cairo
-	return res
-end
-
-function parse_k_timing(text, start_time)
-	local syls = {}
-	local cleantext = ""
-	local i = 1
-	local curtime = start_time
-	for timing, syltext in text:gmatch("{\\k(%d+)}([^{]*)") do
-		local syl = {}
-		syl.dur = parsenum(timing)/100
-		syl.text = syltext
-		syl.i = i
-		syl.start_time = curtime
-		syl.end_time = curtime + syl.dur
-		table.insert(syls, syl)
-		cleantext = cleantext .. syl.text
-		i = i + 1
-		curtime = curtime + syl.dur
-	end
-	if cleantext == "" then
-		cleantext = text
-	end
-	return syls, cleantext
-end
-
-function read_input_file(name)
-	for line in io.lines(name) do
-		-- Try PlayResX/PlayResY
-		local playresx = line:match("^PlayResX: (.*)")
-		if playresx then
-			sres_x = parsenum(playresx)
-		end
-		local playresy = line:match("^PlayResY: (.*)")
-		if playresy then
-			sres_y = parsenum(playresy)
-		end
-	
-		-- Try dialogue line
-		-- Format: Layer, Start, End, Style, Name, MarginL, MarginR, MarginV, Effect, Text
-		local dialogue_line = line:match("^Dialogue:(.*)")
-		if dialogue_line then
-			local layer, start_time, end_time, style, actor, margin_l, margin_r, margin_v, effect, text = read_field(dialogue_line, 9)
-			local ls = {}
-			ls.layer = parsenum(layer)
-			ls.start_time = parse_ass_time(start_time)
-			ls.end_time = parse_ass_time(end_time)
-			ls.style = style:trim()
-			ls.actor = actor:trim()
-			ls.effect = effect:trim()
-			ls.rawtext = text
-			ls.kara, ls.cleantext = parse_k_timing(text, ls.start_time)
-			
-			table.insert(lines, ls)
-		end
-
-		-- Try style line
-		-- Format: Name, Fontname, Fontsize, PrimaryColour, SecondaryColour, OutlineColour, BackColour, Bold, Italic, Underline, StrikeOut, ScaleX, ScaleY, Spacing, Angle, BorderStyle, Outline, Shadow, Alignment, MarginL, MarginR, MarginV, Encoding
-		local style_line = line:match("^Style:(.*)")
-		if style_line then
-			local name, font, size, c1, c2, c3, c4, bold, italic, underline, overstrike, scalex, scaley, spacing, angle, borderstyle, outline, shadow, alignment, margin_l, margin_r, margin_v, encoding = read_field(style_line, 22)
-			-- Direct data
-			name = name:trim()
-			font_name[name] = font:trim()
-			font_size[name] = parsenum(size)
-			color1[name] = parse_style_color(c1)
-			color2[name] = parse_style_color(c2)
-			color3[name] = parse_style_color(c3)
-			color4[name] = parse_style_color(c4)
-			font_bold[name] = (parsenum(bold) ~= 0) and "bold" or ""
-			font_italic[name] = (parsenum(italic) ~= 0) and "italic" or ""
-
-			-- Derived data
-			if font:match("@") then
-				vertical[name] = true
-			end
-			alignment = parsenum(alignment)
-			if alignment <= 3 then
-				if vertical[name] then
-					pos_v[name] = sres_x - parsenum(margin_v)
-				else
-					pos_v[name] = sres_y - parsenum(margin_v)
-				end
-			elseif alignment <= 6 then
-				if vertical[name] then
-					pos_v[name] = sres_x / 2
-				else
-					pos_v[name] = sres_y / 2
-				end
-			else
-				pos_v[name] = parsenum(margin_v)
-			end
-		end
-	end
-end
-
-function init(f)
-	if inited then return end
-	inited = true
-	
-	vres_x = f.width
-	vres_y = f.height
-	read_input_file(overlua_datastring)
-end
-
-
--- Mask for noise over background
-local noisemask, noisemaskctx, noisemaskfilled
--- Additional images to overlay the frame
-local frame_overlays = {}
-
-
--- Calculate size and position of a line and its syllables
-function calc_line_metrics(ctx, line)
-	if line.pos_x then return end
-
-	assert(font_name[line.style], "No font name for style " .. line.style)
-	ctx.select_font_face(font_name[line.style], font_italic[line.style], font_bold[line.style])
-	ctx.set_font_size(font_size[line.style])
-	
-	line.te = ctx.text_extents(line.cleantext)
-	line.fe = ctx.font_extents()
-	
-	if vertical[line.style] then
-		line.pos_x = pos_v[line.style]
-		line.pos_y = (sres_y - line.te.width) / 2 - line.te.x_bearing
-	else
-		line.pos_x = (sres_x - line.te.width) / 2 - line.te.x_bearing
-		line.pos_y = pos_v[line.style]
-	end
-	
-	if #line.kara < 2 then return end
-	
-	local curx = line.pos_x
-	local cury = line.pos_y
-	for i, syl in pairs(line.kara) do
-		syl.te = ctx.text_extents(syl.text)
-		if vertical[line.style] then
-			syl.pos_x = line.pos_x
-			syl.pos_y = cury
-			syl.center_x = syl.pos_x + syl.te.x_bearing + syl.te.width/2
-			syl.center_y = cury - line.fe.ascent/2 + line.fe.descent/2
-		else
-			syl.pos_x = curx
-			syl.pos_y = line.pos_y
-			syl.center_x = curx + syl.te.x_bearing + syl.te.width/2
-			syl.center_y = syl.pos_y - line.fe.ascent/2 + line.fe.descent/2
-		end
-		curx = curx + syl.te.x_advance
-		cury = cury + syl.te.x_advance
-	end
-end
-
-
--- Style handling functions
-local stylefunc = {}
-
-function stylefunc.generic(t, line)
-	if not line.textsurf then
-		line.textsurf = cairo.image_surface_create(sres_x, sres_y, "argb32")
-		local c = line.textsurf.create_context()
-
-		c.select_font_face(font_name[line.style], font_italic[line.style], font_bold[line.style])
-		c.set_font_size(font_size[line.style])
-		
-		if vertical[line.style] then
-			c.translate(line.pos_x, line.pos_y)
-			c.rotate(math.pi/2)
-			c.move_to(0,0)
-		else
-			c.move_to(line.pos_x, line.pos_y)
-		end
-		c.text_path(line.cleantext)
-		
-		local c1, c3 = color1[line.style], color3[line.style]
-		c.set_source_rgba(c1.r, c1.g, c1.b, c1.a)
-		c.set_line_join("round")
-		c.set_line_width(4)
-		c.stroke_preserve()
-		c.set_source_rgba(c3.r, c3.g, c3.b, c3.a)
-		c.fill()
-	end
-	
-	-- Fade-factor (alpha for line)
-	local fade = 0
-	
-	if t < line.start_time and t >= line.start_time - line_fade_duration then
-		fade = 1 - (line.start_time - t) / line_fade_duration
-	elseif t >= line.end_time and t < line.end_time + line_fade_duration then
-		fade = 1 - (t - line.end_time) / line_fade_duration
-	elseif t >= line.start_time and t < line.end_time then
-		fade = 1
-	else
-		fade = 0
-	end
-	
-	if fade > 0 then
-		local lo = {} -- line overlay
-		lo.surf = line.textsurf
-		lo.x, lo.y = 0, 0
-		lo.alpha = 0.85 * fade
-		lo.operator = "over"
-		lo.name = "line"
-		table.insert(frame_overlays, lo)
-		
-		noisemaskctx.set_source_surface(line.textsurf, 0, 0)
-		noisemaskctx.paint_with_alpha(fade)
-		noisemaskfilled = true
-	end
-	
-	for i, syl in pairs(line.kara) do
-		if syl.end_time < syl.start_time + syl_highlight_duration then
-			syl.end_time = syl.start_time + syl_highlight_duration
-		end
-		
-		if t >= syl.start_time and t < syl.end_time then
-			local sw, sh = syl.te.width*3, line.fe.height*3
-			if vertical[line.style] then
-				sw, sh = sh, sw
-			end
-			
-			local fade = (syl.end_time - t) / (syl.end_time - syl.start_time)
-			
-			local surf = cairo.image_surface_create(sw, sh, "argb32")
-			local ctx = surf.create_context()
-			
-			ctx.select_font_face(font_name[line.style], font_italic[line.style], font_bold[line.style])
-			ctx.set_font_size(font_size[line.style]*2)
-			
-			local te, fe = ctx.text_extents(syl.text), ctx.font_extents()
-			
-			local rx, ry = (sw - te.width) / 2 + te.x_bearing, (sh - fe.height) / 2 + fe.ascent
-			assert(not vertical[line.style], "Can't handle vertical kara in syllable highlight code - poke jfs if you need this")
-			
-			ctx.move_to(rx, ry)
-			ctx.text_path(syl.text)
-			
-			local path = ctx.copy_path()
-			local function modpath(x, y)
-				local cx = math.sin(y/sh*math.pi)
-				local cy = math.sin(x/sw*math.pi)
-				cx = cx * x + (1-cx)/2*sw
-				cy = cy * y + (1-cy)/2*sh
-				return fade*x+(1-fade)*cx, fade*y+(1-fade)*cy
-			end
-			path.map_coords(modpath)
-			ctx.new_path()
-			ctx.append_path(path)
-			
-			local c2, c3 = color2[line.style], color3[line.style]
-			
-			for b = 8, 1, -3 do
-				local bs = cairo.image_surface_create(sw, sh, "argb32")
-				local bc = bs.create_context()
-				bc.set_source_rgba(c2.r, c2.g, c2.b, c2.a)
-				bc.append_path(path)
-				bc.fill()
-				raster.gaussian_blur(bs, b)
-				local bo = {}
-				bo.surf = bs
-				bo.x = syl.center_x - sw/2
-				bo.y = syl.center_y - sh/2
-				bo.alpha = fade
-				bo.operator = "add"
-				bo.name = "blur " .. b
-				table.insert(frame_overlays, bo)
-			end
-			
-			ctx.set_source_rgba(c3.r, c3.g, c3.b, c3.a)
-			ctx.set_line_join("round")
-			ctx.set_operator("over")
-			ctx.set_line_width(3*fade)
-			ctx.stroke_preserve()
-			ctx.set_operator("dest_out")
-			ctx.fill()
-			raster.box_blur(surf, 3, 2)
-			
-			local so = {}
-			so.surf = surf
-			so.x = syl.center_x - sw/2
-			so.y = syl.center_y - sh/2
-			so.alpha = 1
-			so.operator = "over"
-			so.name = string.format("bord %s %.1f %.1f (%.1f,%.1f)", syl.text, sw, sh, rx, ry)
-			table.insert(frame_overlays, so)
-		end
-	end
-end
-
-stylefunc.Romaji = stylefunc.generic
-stylefunc.Kanji = stylefunc.generic
-stylefunc.English = stylefunc.generic
-
-
--- Main rendering function
-function render_frame(f, t)
-	init(f)
-	
-	local surf = f.create_cairo_surface()
-	local ctx = surf.create_context()
-	ctx.scale(vres_x/sres_x, vres_y/sres_y)
-	
-	-- The line rendering functions add the mask of the line they rendered to
-	-- this image. It will be used to draw the glow around all lines.
-	-- It has to be done in this way to avoid the glows from nearby lines to
-	-- interfere and produce double effect.
-	noisemask = cairo.image_surface_create(sres_x, sres_y, "argb32")
-	noisemaskctx = noisemask.create_context()
-	-- Set to true as soon as anything is put into the noise mask
-	-- This is merely an optimisation to avoid doing anything when there aren't
-	-- any lines on screen.
-	noisemaskfilled = false
-	-- List of images to overlay on the video frame, after the noise mask.
-	frame_overlays = {}
-	
-	for i, line in pairs(lines) do
-		if stylefunc[line.style] then
-			calc_line_metrics(ctx, line)
-			stylefunc[line.style](t, line)
-		end
-	end
-	
-	if noisemaskfilled then
-		-- Greenish and jittery version of the frame
-		local noiseimg = f.create_cairo_surface()
-		raster.box_blur(noiseimg, 5, 2)
-		raster.pixel_value_map(noiseimg, "G rand 0.4 * + =G G 1 - 1 G ifgtz =G")
-		-- Blurred version of the noisemask
-		raster.gaussian_blur(noisemask, 8)
-		-- Mask additive paint the noise mask: only show the area near the text
-		-- and have it do interesting things with the video.
-		ctx.set_source_surface(noiseimg, 0, 0)
-		ctx.set_operator("add")
-		ctx.mask_surface(noisemask, 0, 0)
-	end
-	
-	-- Paint generated overlays onto the video.
-	for i, o in pairs(frame_overlays) do
-		ctx.set_source_surface(o.surf, o.x, o.y)
-		ctx.set_operator(o.operator)
-		ctx.paint_with_alpha(o.alpha)
-	end
-	
-	f.overlay_cairo_surface(surf, 0, 0)
-end
-

OverLua/docs/test1.lua

@@ -1,14 +0,0 @@
-function render_frame(f, t)
-	local w, h = f.width, f.height
-	for x = 0, 20 do
-		for y = 0, 20 do
-			f[y*w+x] = {x*10,y*10,255}
-		end
-	end
-	for x = 21, 40 do
-		for y = 0, h-1 do
-			local r, g, b = f(x,y)
-			f[y*w+x] = {255-r, 255-g, 255-b}
-		end
-	end
-end

OverLua/docs/test2.lua

@@ -1,42 +0,0 @@
-function render_frame(f, t)
-	--local surf = cairo.image_surface_create(200,200,"argb32")
-	local surf = f.create_cairo_surface()
-	local ctx = surf.create_context()
-	
-	ctx.set_source_rgba(1, 0.5, 0.5, 0.75)
-	ctx.move_to(10, 10)
-	ctx.line_to(10, 200)
-	ctx.line_to(300, 10)
-	ctx.close_path()
-	ctx.fill_preserve()
-	ctx.set_source_rgba(0,0,0,1)
-	ctx.stroke()
-	
-	ctx.push_group()
-	ctx.select_font_face("Arial", "italic", "")
-	ctx.set_font_size(35)
-	ctx.move_to(100,100)
-	ctx.text_path(string.format("Time: %.3fs", t))
-	ctx.set_source_rgba(0,1,0,0.8)
-	ctx.set_line_width(4)
-	ctx.stroke_preserve()
-	ctx.set_source_rgba(0,0,1,1)
-	ctx.fill()
-	ctx.pop_group_to_source()
-	ctx.paint_with_alpha(0.5)
-	
-	f.overlay_cairo_surface(surf, 0, 0)
-	
-	surf = cairo.image_surface_create(400, 200, "argb32")
-	ctx = surf.create_context()
-	ctx.select_font_face("Arial", "", "bold")
-	ctx.set_source_rgba(1, 1, 1, 1)
-	ctx.set_font_size(40)
-	ctx.move_to(100, 100)
-	ctx.text_path("OverLua")
-	ctx.fill()
-	
-	raster.directional_blur(surf, t, 5)
-	
-	f.overlay_cairo_surface(surf, 200, 50)
-end

OverLua/docs/test3.lua

@@ -1,15 +0,0 @@
-function render_frame(f, t)
-	local surf = f.create_cairo_surface()
-	--raster.gaussian_blur(surf, t)--1+(1-math.cos(t*10))*2)
-	--raster.invert(surf)
-	--raster.separable_filter(surf, {-1, 3, -1}, 1) 
-	--raster.directional_blur(surf, t, t/10)
-	--raster.radial_blur(surf, 200, 200, t/60)
-	raster.pixel_value_map(surf, "G rand 0.1 * + =G G 1 - 1 G ifgtz =G")
-	raster.pixel_coord_map(surf, "X .5 rand - + =X  Y .5 rand - + =Y")
-	f.overlay_cairo_surface(surf, 0, 0)
-	
-	--surf = cairo.image_surface_create(200, 200, "rgb24")
-	--raster.pixel_value_map(surf, "rand =t0 t0 =R t0 =G t0 =B")
-	--f.overlay_cairo_surface(surf, 20, 20)
-end

OverLua/docs/test4.lua

@@ -1,65 +0,0 @@
-function render_frame(f, t)
-	-- Some data
-	local basex, basey = 100, 100
-	local thetext = overlua_datastring or "OverLua R0xx0rz?"
-
-	-- Create a new blank surface to draw on
-	local surf = cairo.image_surface_create(f.width, f.height, "argb32")
-	-- And a context to go with it. Drawing happens through the context.
-	local c = surf.create_context()
-	
-	-- The source video is 16:9 anamorphic, so create a scaling matrix
-	local scaling = cairo.matrix_create()
-	scaling.init_scale(f.width/853, f.height/480)
-	-- And set it for the surface
-	c.set_matrix(scaling)
-	
-	-- Create a surface of the video frame...
-	local fs = f.create_cairo_surface()
-	-- .. and blur it a bit
-	raster.gaussian_blur(fs, 2)
-	-- Then create a pattern from it, that can be used for filling shapes with
-	local fspattern = cairo.pattern_create_for_surface(fs)
-	-- Also apply the scaling matrix to the pattern
-	fspattern.set_matrix(scaling)
-	
-	-- Prepare a few things
-	c.select_font_face("Gill Sans Std UltraBold", "", "bold")
-	c.set_font_size(42)
-	c.set_line_width(4)
-	c.set_line_join("round")
-	
-	-- First stroke the text a bit above and to the left of main
-	c.move_to(basex-2, basey-2)
-	c.set_source_rgba(0.8, 0.8, 1, 0.8)
-	c.text_path(thetext)
-	c.stroke()
-	
-	-- Then a bit below and to the right, so it overlaps the first stroking a bit
-	c.move_to(basex+2, basey+2)
-	c.set_source_rgba(0.4, 0.4, 0.5, 0.8)
-	c.text_path(thetext)
-	c.stroke()
-	
-	-- And blur them both together, also softening the border
-	raster.gaussian_blur(surf, 3)
-	
-	-- Now prepare the main text fill and the real location
-	c.move_to(basex, basey)
-	c.text_path(thetext)
-	-- First a thing black outline
-	c.set_source_rgba(0, 0, 0, 1)
-	c.set_line_width(2)
-	c.stroke_preserve() -- _preserve version to keep the outline
-	-- Then use the blurred video frame as fill source
-	c.set_source(fspattern)
-	c.fill_preserve()
-	-- And create a very dark colour
-	-- Adding this on top of the first fill will create a reddening effect
-	c.set_source_rgba(0.1, 0, 0, 1)
-	c.set_operator("add")
-	c.fill()
-	
-	-- Finally draw the surface onto the video
-	f.overlay_cairo_surface(surf, 0, 0)
-end

OverLua/expression_engine.cpp

@@ -1,573 +0,0 @@
-/*
- * OverLua expression engine
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-
-#include "expression_engine.h"
-#include <math.h>
-
-
-namespace ExpressionEngine {
-
-	// Builtin functions
-
-	static bool f_abs(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(fabs(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_abs = {"abs", f_abs};
-
-	static bool f_floor(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(floor(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_floor = {"floor", f_floor};
-
-	static bool f_ceil(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(ceil(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_ceil = {"ceil", f_ceil};
-
-	static bool f_log(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(log(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_log = {"log", f_log};
-
-	static bool f_exp(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(exp(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_exp = {"exp", f_exp};
-
-	static bool f_sqrt(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(sqrt(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_sqrt = {"sqrt", f_sqrt};
-
-	static bool f_e(Stack &stack, void *data)
-	{
-		stack.push_back(2.71828182845904523536);
-		return true;
-	}
-	static const Function fs_e = {"e", f_e};
-
-	static bool f_min(Stack &stack, void *data)
-	{
-		if (stack.size() >= 2) {
-			double v1 = stack.back();
-			stack.pop_back();
-			double v2 = stack.back();
-			stack.pop_back();
-			if (v1 < v2)
-				stack.push_back(v1);
-			else
-				stack.push_back(v2);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_min = {"min", f_min};
-
-	static bool f_max(Stack &stack, void *data)
-	{
-		if (stack.size() >= 2) {
-			double v1 = stack.back();
-			stack.pop_back();
-			double v2 = stack.back();
-			stack.pop_back();
-			if (v1 > v2)
-				stack.push_back(v1);
-			else
-				stack.push_back(v2);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_max = {"max", f_max};
-
-	static bool f_pi(Stack &stack, void *data)
-	{
-		stack.push_back(3.14159265358979323846);
-		return true;
-	}
-	static const Function fs_pi = {"pi", f_pi};
-
-	static bool f_sin(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(sin(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_sin = {"sin", f_sin};
-
-	static bool f_cos(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(cos(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_cos = {"cos", f_cos};
-
-	static bool f_tan(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(tan(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_tan = {"tan", f_tan};
-
-	static bool f_asin(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(asin(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_asin = {"asin", f_asin};
-
-	static bool f_acos(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(acos(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_acos = {"acos", f_acos};
-
-	static bool f_atan(Stack &stack, void *data)
-	{
-		if (stack.size() >= 1) {
-			double v = stack.back();
-			stack.pop_back();
-			stack.push_back(atan(v));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_atan = {"atan", f_atan};
-
-	static bool f_mod(Stack &stack, void *data)
-	{
-		if (stack.size() >= 2) {
-			double v1 = stack.back();
-			stack.pop_back();
-			double v2 = stack.back();
-			stack.pop_back();
-			stack.push_back(fmod(v2, v1));
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_mod = {"mod", f_mod};
-
-	static bool f_rand(Stack &stack, void *data)
-	{
-		stack.push_back((double)rand()/RAND_MAX);
-		return true;
-	}
-	static const Function fs_rand = {"rand", f_rand};
-
-	static bool f_ifgtz(Stack &stack, void *data)
-	{
-		if (stack.size() >= 3) {
-			double v1 = stack.back();
-			stack.pop_back();
-			double v2 = stack.back();
-			stack.pop_back();
-			double v3 = stack.back();
-			stack.pop_back();
-			if (v3 > 0)
-				stack.push_back(v2);
-			else
-				stack.push_back(v1);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_ifgtz = {"ifgtz", f_ifgtz};
-
-	static bool f_ifeqz(Stack &stack, void *data)
-	{
-		if (stack.size() >= 3) {
-			double v1 = stack.back();
-			stack.pop_back();
-			double v2 = stack.back();
-			stack.pop_back();
-			double v3 = stack.back();
-			stack.pop_back();
-			if (v3 == 0)
-				stack.push_back(v2);
-			else
-				stack.push_back(v1);
-			return true;
-		} else {
-			return false;
-		}
-	}
-	static const Function fs_ifeqz = {"ifeqz", f_ifeqz};
-
-
-	// Machine specification
-
-	Specification::Specification()
-	{
-		// Add standard functions
-		functions.push_back(fs_abs);
-		functions.push_back(fs_floor);
-		functions.push_back(fs_ceil);
-		functions.push_back(fs_log);
-		functions.push_back(fs_exp);
-		functions.push_back(fs_sqrt);
-		functions.push_back(fs_e);
-		functions.push_back(fs_min);
-		functions.push_back(fs_max);
-		functions.push_back(fs_pi);
-		functions.push_back(fs_sin);
-		functions.push_back(fs_cos);
-		functions.push_back(fs_tan);
-		functions.push_back(fs_asin);
-		functions.push_back(fs_acos);
-		functions.push_back(fs_atan);
-		functions.push_back(fs_mod);
-		functions.push_back(fs_rand);
-		functions.push_back(fs_ifgtz);
-		functions.push_back(fs_ifeqz);
-	}
-
-
-	// Machine runner
-
-	bool Machine::Run()
-	{
-		// Prepare the stack
-		std::vector<double> stack;
-		stack.reserve(16);
-
-		// Assume the registers are already initialised like the manager wants
-
-		// Execute the program
-		for (size_t pc = 0; pc < program.size(); pc++) {
-			Instruction &i = program[pc];
-			switch (i.op) {
-				double v1, v2; // values for operators;
-
-				case INST_PUSH_CONST:
-					stack.push_back(i.vd);
-					break;
-
-				case INST_PUSH_REG:
-					stack.push_back(registers[i.vu]);
-					break;
-
-				case INST_ADD:
-					if (stack.size() < 2) return false;
-					v1 = stack.back(); stack.pop_back();
-					v2 = stack.back(); stack.pop_back();
-					stack.push_back(v2+v1);
-					break;
-
-				case INST_SUB:
-					if (stack.size() < 2) return false;
-					v1 = stack.back(); stack.pop_back();
-					v2 = stack.back(); stack.pop_back();
-					stack.push_back(v2-v1);
-					break;
-
-				case INST_MUL:
-					if (stack.size() < 2) return false;
-					v1 = stack.back(); stack.pop_back();
-					v2 = stack.back(); stack.pop_back();
-					stack.push_back(v2*v1);
-					break;
-
-				case INST_DIV:
-					if (stack.size() < 2) return false;
-					v1 = stack.back(); stack.pop_back();
-					v2 = stack.back(); stack.pop_back();
-					stack.push_back(v2/v1);
-					break;
-
-				case INST_POW:
-					if (stack.size() < 2) return false;
-					v1 = stack.back(); stack.pop_back();
-					v2 = stack.back(); stack.pop_back();
-					stack.push_back(pow(v2, v1));
-					break;
-
-				case INST_UNM:
-					if (stack.size() < 1) return false;
-					v1 = stack.back(); stack.pop_back();
-					stack.push_back(-v1);
-					break;
-
-				case INST_CALL:
-					if (!i.vf(stack, i.vfd))
-						return false;
-					break;
-
-				case INST_STORE:
-					if (stack.size() < 1) return false;
-					v1 = stack.back(); stack.pop_back();
-					registers[i.vu] = v1;
-					break;
-
-				default:
-					return false;
-			}
-		}
-
-		// The registers should now be in the final state
-
-		return true;
-	}
-
-	static const char *parse_register_name(const char *source, const std::vector<std::string> &registers, size_t &index)
-	{
-		// Find end of the potential register name
-		// That is, end of string or whitespace
-		const char *end = source;
-		while (*end && *end != ' ' && *end != '\t' && *end != '\n' && *end != '\r') end++;
-		// Now end points to one past last character in name
-
-		std::string regname(source, end-source);
-
-		if (regname.size() == 0) return 0;
-
-		// Check for supplied register name
-		for (size_t i = 0; i < registers.size(); i++) {
-			if (regname == registers[i]) {
-				index = i;
-				return end;
-			}
-		}
-
-		// Check for temp register name
-		if (regname[0] == 't' && regname.size() == 2) {
-			if (regname[1] >= '0' && regname[1] <= '9') {
-				index = registers.size() + regname[1] - '0';
-				return end;
-			}
-		}
-
-		// Nothing matches
-		return 0;
-	}
-
-	static const char *parse_function_name(const char *source, const std::vector<Function> &functions, FunctionPtr &funcptr, void *&funcdata)
-	{
-		// Find end of the potential function name
-		// That is, end of string or whitespace
-		const char *end = source;
-		while (*end && *end != ' ' && *end != '\t' && *end != '\n' && *end != '\r') end++;
-		// Now end points to one past last character in name
-
-		std::string funcname(source, end-source);
-
-		if (funcname.size() == 0) return 0;
-
-		// Check for supplied register name
-		for (size_t i = 0; i < functions.size(); i++) {
-			if (funcname == functions[i].name) {
-				funcptr = functions[i].function;
-				funcdata = functions[i].data;
-				return end;
-			}
-		}
-
-		return 0;
-	}
-
-	Machine::Machine(const ExpressionEngine::Specification &spec, const char *source)
-	{
-		// Set up the registers
-		const size_t temp_register_count = 10;
-		registers.resize(spec.registers.size() + temp_register_count);
-
-		program.reserve(64);
-
-		// Parse the program
-		while (*source) {
-			Instruction i;
-
-			// Skip whitespace
-			while (*source && (*source == ' ' || *source == '\t' || *source == '\n' || *source == '\r')) source++;
-			if (!*source) break;
-
-			// First see if it can be read as a number constant
-			{
-				char *tmp = 0;
-				double v = strtod(source, &tmp);
-				if (tmp && source != tmp) {
-					// Could be read, so we have a constant here
-					source = tmp;
-					i.op = INST_PUSH_CONST;
-					i.vd = v;
-					program.push_back(i);
-					continue;
-				}
-			}
-
-			// Not a number constant
-			// Check for arithmetic operator
-			if (*source == '+') {
-				source++;
-				i.op = INST_ADD;
-				program.push_back(i);
-			}
-			else if (*source == '-') {
-				source++;
-				i.op = INST_SUB;
-				program.push_back(i);
-			}
-			else if (*source == '*') {
-				source++;
-				i.op = INST_MUL;
-				program.push_back(i);
-			}
-			else if (*source == '/') {
-				source++;
-				i.op = INST_DIV;
-				program.push_back(i);
-			}
-			else if (*source == '^') {
-				source++;
-				i.op = INST_POW;
-				program.push_back(i);
-			}
-			else if (*source == '~') {
-				source++;
-				i.op = INST_UNM;
-				program.push_back(i);
-			}
-			// Check for assignment
-			else if (*source == '=') {
-				i.op = INST_STORE;
-				const char *tmp = parse_register_name(source+1, spec.registers, i.vu);
-				if (!tmp) throw source; // No register name found, error
-				source = tmp;
-				program.push_back(i);
-			}
-			// Register push or function call
-			else {
-				const char *tmp = parse_register_name(source, spec.registers, i.vu);
-				if (tmp) {
-					// Register push
-					i.op = INST_PUSH_REG;
-					source = tmp;
-					program.push_back(i);
-				}
-				else {
-					tmp = parse_function_name(source, spec.functions, i.vf, i.vfd);
-					if (tmp) {
-						// Function call
-						i.op = INST_CALL;
-						source = tmp;
-						program.push_back(i);
-					}
-					else {
-						// Nothing, error
-						throw source;
-					}
-				}
-			} 
-
-		} /* end while */
-
-	} /* end Machine::Machine() */
-
-};

OverLua/expression_engine.h

@@ -1,116 +0,0 @@
-/*
- * OverLua expression engine
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#ifndef EXPRESSION_ENGINE_H
-#define EXPRESSION_ENGINE_H
-
-#include <vector>
-#include <string>
-
-
-namespace ExpressionEngine {
-
-	// The stack passed around
-	typedef std::vector<double> Stack;
-
-	// Type of callable functions
-	typedef bool (*FunctionPtr)(Stack &stack, void *data);
-
-	// A callable function
-	struct Function {
-		// The name of the function
-		const char *name;
-		// Function pointer; null for builtins
-		FunctionPtr function;
-		// Function data
-		void *data;
-	};
-
-	// A machine specification that can compile programs
-	struct Specification {
-		// The input and output register names
-		// The index of a register name in this vector translates to the register's number in the machine
-		std::vector<std::string> registers;
-
-		// The callable functions
-		std::vector<Function> functions;
-
-		// Just adds standard functions to functions vector
-		Specification();
-	};
-
-	// Operation type
-	enum Opcode {
-		INST_PUSH_CONST = 0,
-		INST_PUSH_REG,
-		INST_ADD,
-		INST_SUB,
-		INST_MUL,
-		INST_DIV,
-		INST_POW,
-		INST_UNM, // unary minus
-		INST_CALL,
-		INST_STORE
-	};
-
-	// A single program instruction
-	struct Instruction {
-		Opcode op;
-		union {
-			double vd; // double value, for const push
-			size_t vu; // uint value, for register indices
-			struct {
-				FunctionPtr vf; // function to call
-				void *vfd; // data for function
-			};
-		};
-	};
-
-	// A program is a sequence of instructions
-	typedef std::vector<Instruction> Program;
-
-	// A machine running a program
-	struct Machine {
-		// Values in the registers
-		std::vector<double> registers;
-		// The program
-		Program program;
-
-		// Run the machine.
-		// Return true is no errors, false if error
-		bool Run();
-
-		// Create a machine from a specification and a program source
-		Machine(const Specification &spec, const char *source);
-
-		// Create a blank machine
-		Machine() { }
-	};
-
-};
-
-
-#endif

OverLua/image.h

@@ -1,668 +0,0 @@
-/*
- * OverLua RGB(A) image interface
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#ifndef VIDEO_FRAME_H
-#define VIDEO_FRAME_H
-
-#include "../lua51/src/lua.h"
-#include "../lua51/src/lauxlib.h"
-#include "cairo_wrap.h"
-#include <stddef.h>
-#include <memory.h>
-#include <stdint.h>
-#include <omp.h>
-#include <math.h>
-#include <assert.h>
-
-
-// Forward
-class BaseImageAggregate;
-
-
-// Supported pixel formats
-namespace PixelFormat {
-	// A constant value with a fake assignment operator, taking up no space
-	template <class T, T v>
-	struct NopAssigningConstant {
-		operator T() const { return v; }
-		void operator = (const T &n) { }
-	};
-	typedef NopAssigningConstant<uint8_t,255> ROA; // "read only alpha"
-	typedef NopAssigningConstant<uint8_t,0> ROC; // "read only colour"
-
-	// 24 bit formats
-	struct RGB {
-		uint8_t r, g, b;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline ROA A() const { return ROA(); }
-		RGB() : r(0), g(0), b(0) { }
-		template <class PixFmt> RGB(const PixFmt &src) { r = src.R(); g = src.G(); b = src.B(); }
-	};
-	struct BGR {
-		uint8_t b, g, r;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline ROA A() const { return ROA(); }
-		BGR() : r(0), g(0), b(0) { }
-		template <class PixFmt> BGR(const PixFmt &src) { r = src.R(); g = src.G(); b = src.B(); }
-	};
-
-	// 32 bit alpha-less formats
-	struct RGBX {
-		uint8_t r, g, b, x;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline ROA A() const { return ROA(); }
-		RGBX() : r(0), g(0), b(0) { }
-		template <class PixFmt> RGBX(const PixFmt &src) { r = src.R(); g = src.G(); b = src.B(); }
-	};
-	struct BGRX {
-		uint8_t b, g, r, x;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline ROA A() const { return ROA(); }
-		BGRX() : r(0), g(0), b(0) { }
-		template <class PixFmt> BGRX(const PixFmt &src) { r = src.R(); g = src.G(); b = src.B(); }
-	};
-	struct XRGB {
-		uint8_t x, r, g, b;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline ROA A() const { return ROA(); }
-		XRGB() : r(0), g(0), b(0) { }
-		template <class PixFmt> XRGB(const PixFmt &src) { r = src.R(); g = src.G(); b = src.B(); }
-	};
-	struct XBGR {
-		uint8_t x, b, g, r;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline ROA A() const { return ROA(); }
-		XBGR() : r(0), g(0), b(0) { }
-		template <class PixFmt> XBGR(const PixFmt &src) { r = src.R(); g = src.G(); b = src.B(); }
-	};
-
-	// 32 bit with alpha
-	struct RGBA {
-		uint8_t r, g, b, a;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline uint8_t &A() { return a; } inline uint8_t A() const { return a; }
-		RGBA() : r(0), g(0), b(0), a(0) { }
-		template <class PixFmt> RGBA(const PixFmt &src) { a = src.a; r = src.r; g = src.g; b = src.b; }
-	};
-	struct BGRA {
-		uint8_t b, g, r, a;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline uint8_t &A() { return a; } inline uint8_t A() const { return a; }
-		BGRA() : r(0), g(0), b(0), a(0) { }
-		template <class PixFmt> BGRA(const PixFmt &src) { a = src.A(); r = src.R(); g = src.G(); b = src.B(); }
-	};
-	struct ARGB {
-		uint8_t a, r, g, b;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline uint8_t &A() { return a; } inline uint8_t A() const { return a; }
-		ARGB() : r(0), g(0), b(0), a(0) { }
-		template <class PixFmt> ARGB(const PixFmt &src) { a = src.A(); r = src.R(); g = src.G(); b = src.B(); }
-	};
-	struct ABGR {
-		uint8_t a, b, g, r;
-		inline uint8_t &R() { return r; } inline uint8_t R() const { return r; }
-		inline uint8_t &G() { return g; } inline uint8_t G() const { return g; }
-		inline uint8_t &B() { return b; } inline uint8_t B() const { return b; }
-		inline uint8_t &A() { return a; } inline uint8_t A() const { return a; }
-		ABGR() : r(0), g(0), b(0), a(0) { }
-		template <class PixFmt> ABGR(const PixFmt &src) { a = src.A(); r = src.R(); g = src.G(); b = src.B(); }
-	};
-
-	// Alpha only
-	struct A8 {
-		uint8_t a;
-		inline ROC R() const { return ROC(); }
-		inline ROC G() const { return ROC(); }
-		inline ROC B() const { return ROC(); }
-		inline uint8_t &A() { return a; } inline uint8_t A() const { return a; }
-		A8() : a(0) { }
-		template <class PixFmt> A8(const PixFmt &src) { a = src.A(); }
-	};
-
-	// cairo types
-	// These are only true for little endian architectures
-	// If OverLua is ever to run on big endian archs some conditional compiling should be used here
-	typedef BGRX cairo_rgb24;
-	typedef BGRA cairo_argb32;
-};
-
-
-// Support any interleaved RGB format with 8 bit per channel
-// You usually don't want to instance this class directly,
-// look at OverLuaFrameAggregate defined below
-template<class PixFmt>
-class BaseImage {
-public:
-	typedef BaseImage<PixFmt> MyType;
-
-	// video properties
-	int width;
-	int height;
-	ptrdiff_t stride;
-	unsigned char *data;
-
-	// Access a pixel value
-	inline const PixFmt &Pixel(int x, int y) const
-	{
-		return *((PixFmt*)(data + y*stride) + x)
-	}
-
-	inline PixFmt &Pixel(int x, int y)
-	{
-		return *((PixFmt*)(data + y*stride) + x);
-	}
-
-	BaseImage(unsigned _width, unsigned _height, ptrdiff_t _stride, unsigned char *_data)
-		: width(_width), height(_height), stride(_stride), data(_data)
-	{
-		owndata = false;
-		// nothing further to init
-	}
-
-	BaseImage(const MyType &src, bool copydata = false)
-	{
-		width = src.width;
-		height = src.height;
-		stride = src.stride;
-		owndata = copydata;
-		if (copydata) {
-			data = new unsigned char[height*stride];
-			memcpy(data, src.data, height*stride);
-		} else {
-			data = src.data;
-		}
-	}
-
-	~BaseImage()
-	{
-		if (owndata)
-			delete[] data;
-	}
-
-	// should never be called more than once on the same C++ object
-	void CreateLuaObject(lua_State *L, BaseImageAggregate *aggregate = 0)
-	{
-		// create userdata object
-		MyType **ud = (MyType**)lua_newuserdata(L, sizeof(MyType*));
-		*ud = this;
-
-		// create metatable
-		lua_newtable(L);
-		lua_pushcclosure(L, lua_indexget, 0);
-		lua_setfield(L, -2, "__index");
-		lua_pushcclosure(L, lua_indexset, 0);
-		lua_setfield(L, -2, "__newindex");
-		lua_pushcclosure(L, lua_getpixel, 0);
-		lua_setfield(L, -2, "__call");
-		lua_pushcclosure(L, lua_finalize, 0);
-		lua_setfield(L, -2, "__gc");
-		if (aggregate) {
-			lua_pushlightuserdata(L, aggregate);
-			lua_setfield(L, -2, "image");
-		}
-		lua_setmetatable(L, -2);
-	}
-
-private:
-	bool owndata;
-
-	// set a pixel colour
-	static int lua_indexset(lua_State *L)
-	{
-		// first arg = object
-		// second arg = index
-		// third arg = value
-		MyType **ud = (MyType**)lua_touserdata(L, 1);
-
-		if (lua_isnumber(L, 2)) {
-			if (lua_istable(L, 3)) {
-				int n = (int)lua_tointeger(L, 2);
-				int x = n % (*ud)->width;
-				int y = n / (*ud)->width;
-				if (x < 0 || y < 0 || x >= (*ud)->width || y >= (*ud)->height) return 0;
-
-				// read first three entries from table
-				PixFmt color;
-				lua_pushnil(L);
-				if (!lua_next(L, 3)) goto badtable;
-				if (!lua_isnumber(L, -1)) goto badtable;
-				color.r = (unsigned char)lua_tointeger(L, -1);
-				lua_pop(L, 1);
-				if (!lua_next(L, 3)) goto badtable;
-				if (!lua_isnumber(L, -1)) goto badtable;
-				color.g = (unsigned char)lua_tointeger(L, -1);
-				lua_pop(L, 1);
-				if (!lua_next(L, 3)) goto badtable;
-				if (!lua_isnumber(L, -1)) goto badtable;
-				color.b = (unsigned char)lua_tointeger(L, -1);
-				lua_pop(L, 2);
-
-				(*ud)->Pixel(x, y) = color;
-				return 0;
-
-			} else {
-badtable:
-				lua_pushliteral(L, "Value set into image pixel must be a table with 3 entries");
-				lua_error(L);
-				return 0;
-			}
-		}
-
-		lua_pushliteral(L, "Undefined field in image");
-		lua_error(L);
-		return 0;
-	}
-
-	// get a pixel colour or some other property
-	static int lua_indexget(lua_State *L)
-	{
-		// first arg = object
-		// second arg = index
-		MyType **ud = (MyType**)lua_touserdata(L, 1);
-
-		if (lua_type(L, 2) == LUA_TSTRING) {
-			const char *fieldname = lua_tostring(L, 2);
-			if (strcmp(fieldname, "width") == 0) {
-				lua_pushnumber(L, (*ud)->width);
-			} else if (strcmp(fieldname, "height") == 0) {
-				lua_pushnumber(L, (*ud)->height);
-			} else if (strcmp(fieldname, "copy") == 0) {
-				lua_pushvalue(L, 1);
-				lua_pushcclosure(L, lua_copyfunc, 1);
-			} else if (strcmp(fieldname, "create_cairo_surface") == 0) {
-				lua_pushvalue(L, 1);
-				lua_pushcclosure(L, lua_create_cairo_surface, 1);
-			} else if (strcmp(fieldname, "overlay_cairo_surface") == 0) {
-				lua_pushvalue(L, 1);
-				lua_pushcclosure(L, lua_overlay_cairo_surface, 1);
-			} else {
-				lua_pushfstring(L, "Undefined field name in image: %s", fieldname);
-				lua_error(L);
-			}
-
-			return 1;
-
-		}
-
-		lua_pushfstring(L, "Unhandled field type indexing image: %s", lua_typename(L, lua_type(L, 2)));
-		lua_error(L);
-		return 0;
-	}
-
-	static int lua_getpixel(lua_State *L)
-	{
-		// first arg = object
-		// second arg = x
-		// third arg = y
-		MyType **ud = (MyType**)lua_touserdata(L, 1);
-
-		int x = luaL_checkint(L, 2);
-		int y = luaL_checkint(L, 3);
-
-		if (x < 0 || y < 0 || x >= (*ud)->width || y >= (*ud)->height) {
-			lua_pushinteger(L, 0);
-			lua_pushinteger(L, 0);
-			lua_pushinteger(L, 0);
-		} else {
-			const PixFmt &p = (*ud)->Pixel(x, y);
-			lua_pushinteger(L, p.r);
-			lua_pushinteger(L, p.g);
-			lua_pushinteger(L, p.b);
-		}
-		return 3;
-	}
-
-	static int lua_finalize(lua_State *L)
-	{
-		MyType **ud = (MyType**)lua_touserdata(L, 1);
-		delete *ud;
-		return 0;
-	}
-
-	static int lua_copyfunc(lua_State *L)
-	{
-		MyType **ud = (MyType**)lua_touserdata(L, lua_upvalueindex(1));
-		MyType *copy = new MyType(**ud, true);
-		copy->CreateLuaObject(L);
-		return 1;
-	}
-
-	static int lua_create_cairo_surface(lua_State *L)
-	{
-		MyType **ud = (MyType**)lua_touserdata(L, lua_upvalueindex(1));
-
-		// Create a new surface of same resolution
-		// Always RGB24 format since we don't support video with alpha
-		cairo_surface_t *surf = cairo_image_surface_create(CAIRO_FORMAT_RGB24, (*ud)->width, (*ud)->height);
-		if (!surf || cairo_surface_status(surf) != CAIRO_STATUS_SUCCESS) {
-			lua_pushliteral(L, "Unable to create cairo surface from image");
-			lua_error(L);
-			return 0;
-		}
-
-		// Prepare copying pixels from frame to surface
-		unsigned char *surfdata = cairo_image_surface_get_data(surf);
-		int surfstride = cairo_image_surface_get_stride(surf);
-		
-		// Copy pixels
-		int height = (*ud)->height;
-		int width = (*ud)->width;
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			PixFmt *ipix = (PixFmt*)((*ud)->data + y*((*ud)->stride));
-			PixelFormat::cairo_rgb24 *opix = (PixelFormat::cairo_rgb24*)(surfdata + y*surfstride);
-			for (int x = 0; x < width; x++) {
-				*opix++ = *ipix++;
-			}
-		}
-		cairo_surface_mark_dirty(surf);
-
-		// Create Lua object
-		LuaCairoSurface *lsurf = new LuaCairoSurface(L, surf);
-
-		// Release our reference to the surface
-		cairo_surface_destroy(surf);
-
-		// Return it to Lua
-		return 1;
-	}
-
-	static int lua_overlay_cairo_surface(lua_State *L)
-	{
-		// Get inputs
-		MyType **ud = (MyType**)lua_touserdata(L, lua_upvalueindex(1));
-		LuaCairoSurface *surfwrap = LuaCairoSurface::GetObjPointer(L, 1);
-		if (!surfwrap) {
-			lua_pushliteral(L, "Argument to overlay_cairo_surface is not a cairo surface");
-			lua_error(L);
-			return 0;
-		}
-		int xpos = luaL_checkint(L, 2);
-		int ypos = luaL_checkint(L, 3);
-
-		// More argument checks
-		cairo_surface_t *surf = surfwrap->GetSurface();
-		if (cairo_surface_get_type(surf) != CAIRO_SURFACE_TYPE_IMAGE) {
-			lua_pushliteral(L, "Argument to overlay_cairo_surface is not a cairo image surface");
-			lua_error(L);
-			return 0;
-		}
-		
-		// Prepare some data
-		int fwidth = (*ud)->width, fheight = (*ud)->height;
-		int swidth = cairo_image_surface_get_width(surf), sheight = cairo_image_surface_get_height(surf);
-		int sstride = cairo_image_surface_get_stride(surf);
-		// Prepare and get read pointer for source image
-		cairo_surface_flush(surf);
-		unsigned char *sdata = cairo_image_surface_get_data(surf);
-
-		// Check that the overlaid surface won't be entirely outside the frame
-		if (xpos <= -swidth || ypos <= -sheight || xpos > fwidth || ypos > fheight)
-			return 0;
-
-		// Pick overlay algorithm
-		cairo_format_t sformat = cairo_image_surface_get_format(surf);
-
-		if (sformat == CAIRO_FORMAT_ARGB32) {
-			// This has pre-multipled alpha
-			int fy = ypos; // frame y
-			if (fy < 0) fy = 0, sdata -= ypos, sheight -= ypos;
-			int slines_to_compose = sheight, flines_to_compose = fheight;
-			int lines_to_compose = (slines_to_compose<flines_to_compose)?slines_to_compose:flines_to_compose;
-#pragma omp parallel for
-			for (int composition_line = 0; composition_line < lines_to_compose; composition_line++) {
-				PixelFormat::cairo_argb32 *sline = (PixelFormat::cairo_argb32*)(sdata + composition_line*sstride);
-				int fx = xpos;
-				int sx = 0;
-				if (fx < 0) fx = 0, sx = -xpos;
-				for ( ; sx < swidth && fx < fwidth; fx++, sx++) {
-					PixFmt &pix = (*ud)->Pixel(fx, fy+composition_line);
-					unsigned char a = 0xff - sline[sx].a;
-					pix.r = sline[sx].r + a*pix.r/255;
-					pix.g = sline[sx].g + a*pix.g/255;
-					pix.b = sline[sx].b + a*pix.b/255;
-				}
-			}
-		}
-
-		else if (sformat == CAIRO_FORMAT_RGB24) {
-			// Assume opaque alpha for all pixels
-			int fy = ypos; // frame y
-			if (fy < 0) fy = 0, sdata -= ypos, sheight -= ypos;
-			int slines_to_compose = sheight, flines_to_compose = fheight;
-			int lines_to_compose = (slines_to_compose<flines_to_compose)?slines_to_compose:flines_to_compose;
-#pragma omp parallel for
-			for (int composition_line = 0; composition_line < lines_to_compose; composition_line++) {
-				PixelFormat::cairo_rgb24 *sline = (PixelFormat::cairo_rgb24*)(sdata + composition_line*sstride);
-				int fx = xpos;
-				int sx = 0;
-				if (fx < 0) fx = 0, sx = -xpos;
-				for ( ; sx < swidth && fx < fwidth; fx++, sx++) {
-					(*ud)->Pixel(fx, fy+composition_line) = sline[sx];
-				}
-			}
-		}
-
-		else if (sformat == CAIRO_FORMAT_A8) {
-			// This one is problematic - it doesn't contain any colour information
-			// Two primary choices would be to fill with either black or white,
-			// but neither would be an optimum solution.
-			// A third option would be to take a fourth argument to this function,
-			// specifying the colour to be used.
-			lua_pushliteral(L, "8 bpp alpha images are not (yet) supported for overlay operations");
-			lua_error(L);
-			return 0;
-		}
-
-		else if (sformat == CAIRO_FORMAT_A1) {
-			lua_pushliteral(L, "1 bpp alpha images are not supported for overlay operations");
-			lua_error(L);
-			return 0;
-		}
-
-		else {
-			lua_pushliteral(L, "Unknown source image format for overlay operation");
-			lua_error(L);
-			return 0;
-		}
-
-		return 0;
-	}
-
-};
-
-
-// Now something so we can pretend all images have the same pixel format
-// and can pass around pointers to objects of one fixed base class.
-class BaseImageAggregate {
-public:
-	virtual PixelFormat::ARGB GetPixel(int x, int y) = 0;
-	virtual void SetPixel(int x, int y, const PixelFormat::ARGB &val) = 0;
-	virtual unsigned GetWidth() = 0;
-	virtual unsigned GetHeight() = 0;
-	virtual void CreateLuaObject(lua_State *L) = 0;
-};
-
-template <class PixFmt>
-class BaseImageAggregateImpl : public BaseImageAggregate {
-public:
-	typedef BaseImage<PixFmt> ImageType;
-
-private:
-	ImageType *frame;
-	bool ownframe;
-
-public:
-	BaseImageAggregateImpl(unsigned _width, unsigned _height, ptrdiff_t _stride, unsigned char *_data)
-	{
-		frame = new ImageType(_width, _height, _stride, _data);
-		ownframe = true;
-	}
-
-	BaseImageAggregateImpl(ImageType *_frame)
-	{
-		frame = _frame;
-		ownframe = false;
-	}
-
-	PixelFormat::ARGB GetPixel(int x, int y)
-	{
-		return PixelFormat::ARGB(frame->Pixel(x, y));
-	}
-
-	void SetPixel(int x, int y, const PixelFormat::ARGB &val)
-	{
-		frame->Pixel(x, y) = PixFmt(val);
-	}
-
-	unsigned GetWidth()
-	{
-		return frame->width;
-	}
-
-	unsigned GetHeight()
-	{
-		return frame->height;
-	}
-
-	void CreateLuaObject(lua_State *L)
-	{
-		frame->CreateLuaObject(L, this);
-	}
-
-};
-
-// All common, sensible formats
-typedef BaseImageAggregateImpl<PixelFormat::RGB> ImageRGB;
-typedef BaseImageAggregateImpl<PixelFormat::BGR> ImageBGR;
-typedef BaseImageAggregateImpl<PixelFormat::RGBX> ImageRGBX;
-typedef BaseImageAggregateImpl<PixelFormat::BGRX> ImageBGRX;
-typedef BaseImageAggregateImpl<PixelFormat::XRGB> ImageXRGB;
-typedef BaseImageAggregateImpl<PixelFormat::XBGR> ImageXBGR;
-typedef BaseImageAggregateImpl<PixelFormat::RGBA> ImageRGBA;
-typedef BaseImageAggregateImpl<PixelFormat::BGRA> ImageBGRA;
-typedef BaseImageAggregateImpl<PixelFormat::ARGB> ImageARGB;
-typedef BaseImageAggregateImpl<PixelFormat::ABGR> ImageABGR;
-
-
-// Access pixels with various edge conditions
-namespace EdgeCondition {
-	template<class PixFmt>
-	struct Blackness {
-		static inline PixFmt &get(BaseImage<PixFmt> &img, int x, int y)
-		{
-			if (x < 0 || y < 0 || x >= img.width || x >= img.height) {
-				return PixFmt(); // all construct with all zeroes
-			} else {
-				return img.Pixel(x,y);
-			}
-		}
-	};
-
-	template<class PixFmt>
-	struct Closest {
-		static inline PixFmt &get(BaseImage<PixFmt> &img, int x, int y)
-		{
-			if (x < 0) x = 0;
-			if (y < 0) y = 0;
-			if (x >= img.width) x = img.width-1;
-			if (y >= img.height) y = img.height - 1;
-			return img.Pixel(x,y);
-		}
-	};
-
-	template<class PixFmt>
-	struct Repeat {
-		static inline PixFmt &get(BaseImage<PixFmt> &img, int x, int y)
-		{
-			while (x < 0) x += img.width;
-			while (y < 0) y += img.height;
-			while (x >= img.width) x -= img.width;
-			while (y >= img.height) y -= img.height;
-			return img.Pixel(x,y);
-		}
-	};
-
-	template<class PixFmt>
-	struct Mirror {
-		static inline PixFmt &get(BaseImage<PixFmt> &img, int x, int y)
-		{
-			while (x < 0) x += img.width*2;
-			while (y < 0) y += img.height*2;
-			while (x >= img.width*2) x -= img.width*2;
-			while (y >= img.height*2) y -= img.height*2;
-			if (x >= img.width) x = img.width*2 - x;
-			if (y >= img.height) y = img.height*2 - y;
-			return img.Pixel(x,y);
-		}
-	};
-}
-
-
-// FIXME: this is completely broken, the compiler won't accept it
-// when instantiated with one of the EdgeCondition functions for EdgeCond
-template<class PixFmt, typename EdgeCond>
-inline PixFmt GetPixelBilinear(BaseImage<PixFmt> &img, double x, double y)
-{
-	PixFmt res;
-	double xpct = x - floor(x), ypct = y - floor(y);
-
-	if (xpct == 0 && ypct == 0)
-		return EdgeCond::get(img, (int)x, (int)y);
-
-	const PixFmt &src11 = EdgeCond::get(img, (int)x, (int)y);
-	const PixFmt &src12 = EdgeCond::get(img, (int)x, 1+(int)y);
-	const PixFmt &src21 = EdgeCond::get(img, 1+(int)x, (int)y);
-	const PixFmt &src22 = EdgeCond::get(img, 1+(int)x, 1+(int)y);
-
-	res.R() = (uint8_t)((1-xpct) * (1-ypct) * src11.R() + (1-xpct) * ypct * src12.R() + xpct * (1-ypct) * src21.R() + xpct * ypct * src22.R());
-	res.G() = (uint8_t)((1-xpct) * (1-ypct) * src11.G() + (1-xpct) * ypct * src12.G() + xpct * (1-ypct) * src21.G() + xpct * ypct * src22.G());
-	res.B() = (uint8_t)((1-xpct) * (1-ypct) * src11.B() + (1-xpct) * ypct * src12.B() + xpct * (1-ypct) * src21.B() + xpct * ypct * src22.B());
-	res.A() = (uint8_t)((1-xpct) * (1-ypct) * src11.A() + (1-xpct) * ypct * src12.A() + xpct * (1-ypct) * src21.A() + xpct * ypct * src22.A());
-
-	return res;
-}
-
-
-#endif

OverLua/luasupport/assfile.lua

@@ -1,134 +0,0 @@
---[[
-	assfile.lua - Functions for parsing ASS format subtitles
-	Part of OverLua, licensed under GPLv2
-]]
-
-module "assfile"
-
-
--- Parsing helper functions
-local function trim(s)
-	return (s:gsub("^[ \t\r\n]*(.-)[ \t\r\n]*$", "%1"))
-end
-local function num(s)
-	return tonumber(trim(s)) or 0
-end
-
-
--- Which file format we're working with.
--- Changing this changes the behaviour of various parsing functions.
--- Valid values: "SSA4", "ASS", "ASS2", "ASS3", "AS5"
--- Other versions aren't supported.
--- This is usually automatically set by the whole-file parsing functions.
-format = "SSA4"
-
-
--- Create a solid colour fill style
--- Colours are "cairo compatible", ie. range 0 to 1
--- A colour never stores alpha, that's a separate property
-function color(r, g, b, a)
-	r, g, b, a = r or 0, g or 0, b or 0, a or 0
-	return {class="solid", r=r, g=g, b=b, a=a}
-end
-
--- Parse a colour in SSA, ASS or HTML format
-function parse_color(s)
-end
-
-
--- Base style, this defines the defaults used for undefined fields in read-in styles
-default_style = {
-	-- Default style has no name
-	name = nil,
-	-- Well, sensible on Windows
-	font_face = "Arial",
-	font_size = "24",
-	font_language = "C", -- Language to assume text is in, affects some rendering
-	font_vertical = false, -- Vertical layout, replaces use of "@-fonts"
-	font_bold = false,
-	font_italic = false,
-	font_underline = false,
-	font_overstrike = false,
-	-- Fill style
-	fill1 = color(1, 1, 1, 1), -- Fill, white
-	fill2 = color(1, 0, 0, 1), -- Pre-karaoke fill, red
-	fill3 = color(0, 0, 0, 1), -- Outline, black
-	fill4 = color(0, 0, 0, 0.5), -- Shadow, semi-transparent black
-	-- Border size
-	outline = 2,
-	shadow = 2,
-	opaque_box = false,
-	-- Scaling
-	scale_x = 1.00,
-	scale_y = 1.00,
-	-- Spacing
-	spacing_char = 0, -- Extra inter-character spacing
-	spacing_line = 0, -- Extra inter-line spacing
-	baseline_shift = 0, -- Shift baseline this amount against line advance direction
-	-- Text positioning
-	margin_l = 10,
-	margin_r = 10,
-	margin_t = 10,
-	margin_b = 10,
-	align_x = 0.5, -- Bouding box centered between left/right margins
-	align_y = 1.0, -- Bounding box placed at bottom of screen
-	inner_align_x = 0.5, -- Lines centered inside bounding box
-	inner_align_y = 1.0, -- Lines at bottom of bounding box
-	break_style = "smart_top", -- "Smart-wrap", earlier lines wider (alt. "smart_bottom", "simple", "none")
-	pos_rel = "video", -- Positioning relative to video frame (alt. "screen")
-	pos_x = nil, -- Don't override positioning
-	pos_y = nil,
-	-- Rotation/reshaping
-	origin = nil, -- Automatic, at center of text
-	angle_x = 0,
-	angle_y = 0,
-	angle_z = 0,
-	shear_x = 0,
-	shear_y = 0,
-	baseline_transform = nil,
-	bounding_box_transform = nil,
-	-- Misc.
-	blend_mode = "normal", -- Alt. "add", "multiply"
-	clip_rect = nil,
-	clip_shape = nil,
-	blur = 0,
-	-- Animation
-	fade = nil,
-	animation = nil
-}
-
-
--- Parse a Style line
-function read_style(t)
-	if format == "AS5" then
-		error("Found Style line in an AS5 file, where it's unsupported.\nLine: %s", t)
-	
-	elseif format == "SSA4" then
-		local name, font_face, font_size, color1, color2, color3, color4,
-			bold, italic, underline, overstrike, border, outline, shadow,
-			align, margin_l, margin_r, margin_v, alpha, encoding
-			= t:match("^.-:(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-),(.-)$")
-		name = trim(name)
-		font_face = trim(name)
-		font_size = num(font_size)
-	end
-end
-
-
--- Parse a StyleEx line
-function read_style_ex(t)
-	if format ~= "ASS3" and format ~= "AS5" then
-		error("Found StyleEx line in format that doesn't support it.\nFormat is \"%s\".\nLine is: %s", format, t)
-	end
-end
-
-
--- Merge two styles by "overlaying" a style upon a base
--- Produces a new style
--- Fields where the overlay has a defined value, the output style has the value of overlay,
--- but in fields where overlay is nil, the output has the base value.
--- (Pretty much "out.field = overlay.field or base.field".)
--- Animation lists are merged however, but this may produce weird results
--- if the animations overlap in non-trivial ways. (Just pretend this says "undefined behaviour.")
-function merge_styles(base, overlay)
-end

OverLua/luasupport/readme.txt

@@ -1 +0,0 @@
-This directory contains various helper scripts for use with OverLua.

OverLua/overlua.cpp

@@ -1,118 +0,0 @@
-/*
- * C++ interface for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#include "overlua.h"
-#include <stdio.h>
-
-#ifdef WIN32
-#define WIN32_LEAN_AND_MEAN
-#define WIN32_EXTRA_LEAN
-#include <windows.h>
-#endif
-
-
-struct FileScriptReader {
-	static const size_t datasize = 0x10000;
-	char *data;
-	FILE *file;
-	FileScriptReader() { data = new char[datasize]; }
-	~FileScriptReader() { delete[] data; }
-	static const char *reader(lua_State *L, void *data, size_t *size)
-	{
-		FileScriptReader *self = (FileScriptReader*)data;
-		*size = fread(self->data, 1, self->datasize, self->file);
-		if (*size) return self->data;
-		else return 0;
-	}
-};
-
-OverLuaScript::OverLuaScript(const char *filename, const char *datastring)
-{
-	FileScriptReader reader;
-#ifdef WIN32
-	wchar_t *filenamew = new wchar_t[MAX_PATH];
-	MultiByteToWideChar(CP_UTF8, 0, filename, -1, filenamew, MAX_PATH);
-	reader.file = _wfopen(filenamew, L"r");
-	delete[] filenamew;
-#else
-	reader.file = fopen(filename, "r");
-#endif
-
-	Create(reader, filename, datastring);
-
-	fclose(reader.file);
-}
-
-
-struct MemScriptReader {
-	const void *memdata;
-	size_t memdatasize;
-	static const char *reader(lua_State *L, void *data, size_t *size)
-	{
-		MemScriptReader *self = (MemScriptReader*)data;
-		*size = self->memdatasize;
-		self->memdatasize = 0;
-		if (*size) return (const char*)self->memdata;
-		else return 0;
-	}
-};
-
-int OverLuaScript::lua_debug_print(lua_State *L)
-{
-	const char *str = luaL_checkstring(L, 1);
-#ifdef WIN32
-	OutputDebugStringA(str); // ought to be W version but conversion is such a hassle
-#else
-	printf(str);
-#endif
-	return 0;
-}
-
-OverLuaScript::OverLuaScript(const void *data, size_t length, const char *datastring)
-{
-	MemScriptReader reader;
-	reader.memdata = data;
-	reader.memdatasize = length;
-
-	Create(reader, "Memory script", datastring);
-}
-
-OverLuaScript::~OverLuaScript()
-{
-	lua_close(L);
-}
-
-void OverLuaScript::RenderFrameRGB(BaseImageAggregate &frame, double time)
-{
-	lua_getglobal(L, "render_frame");
-	frame.CreateLuaObject(L);
-	lua_pushnumber(L, time);
-	if (lua_pcall(L, 2, 0, 0)) {
-		const char *err = lua_tostring(L, -1);
-		throw err;
-	}
-	lua_gc(L, LUA_GCCOLLECT, 0);
-}

OverLua/overlua.h

@@ -1,96 +0,0 @@
-/*
- * C++ interface for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#ifndef OVERLUA_H
-#define OVERLUA_H
-
-// assume we're in aegisub's svn tree and
-// are building with the aegisub patched lua
-#include "../lua51/src/lua.h"
-#include "../lua51/src/lualib.h"
-#include "../lua51/src/lauxlib.h"
-
-#include <stddef.h>
-#include "image.h"
-#include "cairo_wrap.h"
-#include "raster_ops.h"
-
-
-class OverLuaScript {
-private:
-	lua_State *L;
-
-	// No default constructor
-	OverLuaScript() { }
-
-	template <class ScriptReaderClass>
-	void Create(ScriptReaderClass &reader, const char *chunkname, const char *datastring)
-	{
-		int err;
-
-		L = luaL_newstate();
-
-		// Base Lua libs
-		luaL_openlibs(L);
-		// Cairo lib
-		lua_pushcfunction(L, luaopen_cairo); lua_call(L, 0, 0);
-		// Raster library
-		lua_pushcfunction(L, luaopen_raster); lua_call(L, 0, 0);
-		// Debug print
-		lua_pushcclosure(L, lua_debug_print, 0);
-		lua_setglobal(L, "dprint");
-		// Datastring
-		if (datastring)
-			lua_pushstring(L, datastring);
-		else
-			lua_pushnil(L);
-		lua_setglobal(L, "overlua_datastring");
-
-		err = lua_load(L, reader.reader, &reader, chunkname);
-
-		// todo: better error handling
-		if (err == LUA_ERRSYNTAX) throw lua_tostring(L, -1);
-		if (err == LUA_ERRMEM) throw "Memory error";
-
-		err = lua_pcall(L, 0, 0, 0);
-
-		if (err == LUA_ERRRUN) throw lua_tostring(L, -1);
-		if (err == LUA_ERRMEM) throw "Memory error";
-		if (err == LUA_ERRERR) throw "Error-handler error";
-	}
-
-	static int lua_debug_print(lua_State *L);
-
-public:
-	OverLuaScript(const char *filename, const char *_datastring = 0);
-	OverLuaScript(const void *data, size_t length, const char *_datastring = 0);
-	virtual ~OverLuaScript();
-
-	void RenderFrameRGB(BaseImageAggregate &frame, double time);
-
-};
-
-#endif

OverLua/raster_ops.cpp

@@ -1,720 +0,0 @@
-/*
- * Raster image operations for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#include "cairo_wrap.h"
-#include "image.h"
-#include <math.h>
-#include <omp.h>
-#include <stdint.h>
-
-#include "expression_engine.h"
-#include "raster_ops.h"
-#include "../lua51/src/lauxlib.h"
-
-
-static inline cairo_surface_t *CheckSurface(lua_State *L, int idx)
-{
-	LuaCairoSurface *surfobj = LuaCairoSurface::GetObjPointer(L, idx);
-	cairo_surface_t *surf = surfobj->GetSurface();
-	if (cairo_surface_get_type(surf) != CAIRO_SURFACE_TYPE_IMAGE) {
-		lua_pushliteral(L, "Object for raster operation is not an image surface. Video frames are not accepted.");
-		lua_error(L);
-	}
-	return surf;
-}
-
-static inline double NormalDist(double sigma, double x)
-{
-	if (sigma <= 0 && x == 0) return 1;
-	else if (sigma <= 0) return 0;
-	else return exp(-(x*x)/(2*sigma*sigma)) / (sigma * sqrt(2*3.1415926535));
-}
-
-
-// Filter an image in horizontal direction with a one-dimensional filter
-// PixelWidth is the distance in bytes between pixels
-template<ptrdiff_t PixelWidth>
-void SeparableFilterX(unsigned char *src, unsigned char *dst, int width, int height, ptrdiff_t stride, int *kernel, int kernel_size, int divisor)
-{
-#pragma omp parallel for
-	for (int y = 0; y < height; y++) {
-		unsigned char *in = src + y*stride;
-		unsigned char *out = dst + y*stride;
-		for (int x = 0; x < width; x++) {
-			int accum = 0;
-			for (int k = 0; k < kernel_size; k++) {
-				int xofs = k - kernel_size/2;
-				//if (x+xofs < 0 || x+xofs >= width) continue;
-				if (x+xofs < 0) xofs += width;
-				if (x+xofs >= width) xofs -= width;
-				accum += (int)(in[xofs*PixelWidth] * kernel[k]);
-			}
-			accum /= divisor;
-			if (accum > 255) accum = 255;
-			if (accum < 0) accum = 0;
-			*out = (unsigned char)accum;
-			in+=PixelWidth;
-			out+=PixelWidth;
-		}
-	}
-}
-
-
-// Filter an image in vertical direction with a one-dimensional filter
-// This one templated with PixelWidth since the channel interlacing is horizontal only,
-// filtering once vertically will automatically catch all channels.
-// (Width must be multiplied by pixel width for that to happen though.)
-void SeparableFilterY(unsigned char *src, unsigned char *dst, int width, int height, ptrdiff_t stride, int *kernel, int kernel_size, int divisor)
-{
-#pragma omp parallel for
-	for (int  x = 0; x < width; x++) {
-		unsigned char *in = src + x;
-		unsigned char *out = dst + x;
-		for (int y = 0; y < height; y++) {
-			int accum = 0;
-			for (int k = 0; k < kernel_size; k++) {
-				int yofs = k - kernel_size/2;
-				//if (y+yofs < 0 || y+yofs >= height) continue;
-				if (y+yofs < 0) yofs += height;
-				if (y+yofs >= height) yofs -= height;
-				accum += (int)(in[yofs*stride] * kernel[k]);
-			}
-			accum /= divisor;
-			if (accum > 255) accum = 255;
-			if (accum < 0) accum = 0;
-			*out = (unsigned char)accum;
-			in += stride;
-			out += stride;
-		}
-	}
-}
-
-
-// Apply a simple separable FIR filter to an image
-void ApplySeparableFilter(lua_State *L, cairo_surface_t *surf, int *kernel, int kernel_size, int divisor)
-{
-	// Get surface properties
-	cairo_surface_flush(surf);
-	int width = cairo_image_surface_get_width(surf);
-	int height = cairo_image_surface_get_height(surf);
-	ptrdiff_t stride = (ptrdiff_t)cairo_image_surface_get_stride(surf);
-	cairo_format_t format = cairo_image_surface_get_format(surf);
-	unsigned char *data = cairo_image_surface_get_data(surf);
-
-	if (format != CAIRO_FORMAT_ARGB32 && format != CAIRO_FORMAT_RGB24 && format != CAIRO_FORMAT_A8) {
-		lua_pushliteral(L, "Unsupported image format for raster operation");
-		lua_error(L);
-	}
-
-	// Work image
-	unsigned char *wimg = new unsigned char[height*stride];
-
-	// Do the filtering
-	if (format == CAIRO_FORMAT_ARGB32 || format == CAIRO_FORMAT_RGB24) {
-		// Horizontal
-		SeparableFilterX<4>(data+0, wimg+0, width, height, stride, kernel, kernel_size, divisor);
-		SeparableFilterX<4>(data+1, wimg+1, width, height, stride, kernel, kernel_size, divisor);
-		SeparableFilterX<4>(data+2, wimg+2, width, height, stride, kernel, kernel_size, divisor);
-		SeparableFilterX<4>(data+3, wimg+3, width, height, stride, kernel, kernel_size, divisor);
-		// Vertical
-		//memcpy(data, wimg, height*stride);
-		SeparableFilterY(wimg, data, width*4, height, stride, kernel, kernel_size, divisor);
-	} else if (format == CAIRO_FORMAT_A8) {
-		// Horizontal
-		SeparableFilterX<1>(data, wimg, width, height, stride, kernel, kernel_size, divisor);
-		// Vertical
-		SeparableFilterY(wimg, data, width, height, stride, kernel, kernel_size, divisor);
-	}
-
-	// Clean up
-	cairo_surface_mark_dirty(surf);
-	delete[] wimg;
-}
-
-
-// Apply a general filter an image
-template <class FilterType>
-void ApplyGeneralFilter(lua_State *L, cairo_surface_t *surf, FilterType &filter)
-{
-	// Get surface properties
-	cairo_surface_flush(surf);
-	int width = cairo_image_surface_get_width(surf);
-	int height = cairo_image_surface_get_height(surf);
-	ptrdiff_t stride = (ptrdiff_t)cairo_image_surface_get_stride(surf);
-	cairo_format_t format = cairo_image_surface_get_format(surf);
-	unsigned char *data = cairo_image_surface_get_data(surf);
-
-	if (format != CAIRO_FORMAT_ARGB32 && format != CAIRO_FORMAT_RGB24 && format != CAIRO_FORMAT_A8) {
-		lua_pushliteral(L, "Unsupported image format for raster operation");
-		lua_error(L);
-	}
-
-	// Source image copy
-	unsigned char *wimg = new unsigned char[height*stride];
-	memcpy(wimg, data, height*stride);
-
-	if (format == CAIRO_FORMAT_ARGB32) {
-		BaseImage<PixelFormat::cairo_argb32> src(width, height, stride, wimg);
-		BaseImage<PixelFormat::cairo_argb32> dst(width, height, stride, data);
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				dst.Pixel(x,y) = filter.argb32(src, x, y);
-			}
-		}
-
-	} else if (format == CAIRO_FORMAT_RGB24) {
-		BaseImage<PixelFormat::cairo_rgb24> src(width, height, stride, wimg);
-		BaseImage<PixelFormat::cairo_rgb24> dst(width, height, stride, data);
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				dst.Pixel(x,y) = filter.rgb24(src, x, y);
-			}
-		}
-
-	} else if (format == CAIRO_FORMAT_A8) {
-		BaseImage<PixelFormat::A8> src(width, height, stride, wimg);
-		BaseImage<PixelFormat::A8> dst(width, height, stride, data);
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				dst.Pixel(x,y) = filter.a8(src, x, y);
-			}
-		}
-	}
-
-	// Clean up
-	cairo_surface_mark_dirty(surf);
-	delete[] wimg;
-}
-
-
-struct GaussianKernel {
-	int *kernel;
-	int width;
-	int divisor;
-	GaussianKernel(double sigma)
-	{
-		width = (int)(sigma*3 + 0.5) | 1; // binary-or with 1 to make sure the number is odd
-		if (width < 3) width = 3;
-		kernel = new int[width];
-		kernel[width/2] = (int)(NormalDist(sigma, 0) * 255);
-		divisor = kernel[width/2];
-		for (int x = width/2-1; x >= 0; x--) {
-			int val = (int)(NormalDist(sigma, width/2-x) * 255 + 0.5);
-			divisor += val*2;
-			kernel[x] = val;
-			kernel[width - x - 1] = val;
-		}
-	}
-	~GaussianKernel()
-	{
-		delete[] kernel;
-	}
-};
-
-
-// raster.gaussian_blur(imgsurf, sigma)
-static int gaussian_blur(lua_State *L)
-{
-	// Get arguments
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	double sigma = luaL_checknumber(L, 2);
-
-	// Generate gaussian kernel
-	GaussianKernel gk(sigma);
-
-	ApplySeparableFilter(L, surf, gk.kernel, gk.width, gk.divisor);
-
-	return 0;
-}
-
-
-// n tap box blur
-static int box_blur(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	int width = luaL_checkint(L, 2);
-	if (width <= 0) { luaL_error(L, "Width of box kernel for raster.box must be larger than zero, specified to %d.", width); return 0; }
-	int applications = luaL_optint(L, 3, 1);
-	int *kernel = new int[width];
-	for (int i = 0; i < width; i++)
-		kernel[i] = 1;
-	while (applications-- > 0)
-		ApplySeparableFilter(L, surf, kernel, width, width);
-	delete[] kernel;
-	return 0;
-}
-
-
-// TODO: figure out how to make this use bilinear pixel grabbing instead
-struct DirectionalBlurFilter {
-	GaussianKernel gk;
-	double xstep, ystep;
-	DirectionalBlurFilter(double angle, double sigma) :
-		gk(sigma)
-	{
-		xstep = cos(angle);
-		ystep = -sin(angle);
-	}
-	inline PixelFormat::A8 a8(BaseImage<PixelFormat::A8> &src, int x, int y)
-	{
-		int a = 0;
-		for (int t = -gk.width/2, i = 0; i < gk.width; t++, i++) {
-			PixelFormat::A8 &srcpx = GetPixelBilinear<PixelFormat::A8, EdgeCondition::Repeat<PixelFormat::A8> >(src, x+xstep*t, y+ystep*t);
-			//PixelFormat::A8 &srcpx = EdgeCondition::repeat(src, (int)(x+xstep*t), (int)(y+ystep*t));
-			a += srcpx.A() * gk.kernel[i];
-		}
-		PixelFormat::A8 res;
-		a = a / gk.divisor; if (a < 0) a = 0; if (a > 255) a = 255;
-		res.A() = a;
-		return res;
-	}
-	inline PixelFormat::cairo_rgb24 rgb24(BaseImage<PixelFormat::cairo_rgb24> &src, int x, int y)
-	{
-		int r = 0, g = 0, b = 0;
-		for (int t = -gk.width/2, i = 0; i < gk.width; t++, i++) {
-			PixelFormat::cairo_rgb24 &srcpx = GetPixelBilinear<PixelFormat::cairo_rgb24, EdgeCondition::Repeat<PixelFormat::cairo_rgb24> >(src, x+xstep*t, y+ystep*t);
-			//PixelFormat::cairo_rgb24 &srcpx = EdgeCondition::repeat(src, (int)(x+xstep*t), (int)(y+ystep*t));
-			r += srcpx.R() * gk.kernel[i];
-			g += srcpx.G() * gk.kernel[i];
-			b += srcpx.B() * gk.kernel[i];
-		}
-		PixelFormat::cairo_rgb24 res;
-		r = r / gk.divisor; if (r < 0) r = 0; if (r > 255) r = 255;
-		g = g / gk.divisor; if (g < 0) g = 0; if (g > 255) g = 255;
-		b = b / gk.divisor; if (b < 0) b = 0; if (b > 255) b = 255;
-		res.R() = r;
-		res.G() = g;
-		res.B() = b;
-		return res;
-	}
-	inline PixelFormat::cairo_argb32 argb32(BaseImage<PixelFormat::cairo_argb32> &src, int x, int y)
-	{
-		int a = 0, r = 0, g = 0, b = 0;
-		for (int t = -gk.width/2, i = 0; i < gk.width; t++, i++) {
-			PixelFormat::cairo_argb32 &srcpx = GetPixelBilinear<PixelFormat::cairo_argb32, EdgeCondition::Repeat<PixelFormat::cairo_argb32> >(src, x+xstep*t, y+ystep*t);
-			//PixelFormat::cairo_argb32 &srcpx = EdgeCondition::repeat(src, (int)(x+xstep*t), (int)(y+ystep*t));
-			a += srcpx.A() * gk.kernel[i];
-			r += srcpx.R() * gk.kernel[i];
-			g += srcpx.G() * gk.kernel[i];
-			b += srcpx.B() * gk.kernel[i];
-		}
-		PixelFormat::cairo_argb32 res;
-		a = a / gk.divisor; if (a < 0) a = 0; if (a > 255) a = 255;
-		r = r / gk.divisor; if (r < 0) r = 0; if (r > 255) r = 255;
-		g = g / gk.divisor; if (g < 0) g = 0; if (g > 255) g = 255;
-		b = b / gk.divisor; if (b < 0) b = 0; if (b > 255) b = 255;
-		res.A() = a;
-		res.R() = r;
-		res.G() = g;
-		res.B() = b;
-		return res;
-	}
-};
-
-
-static int directional_blur(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	double angle = luaL_checknumber(L, 2);
-	double sigma = luaL_checknumber(L, 3);
-
-	DirectionalBlurFilter filter(angle, sigma);
-	ApplyGeneralFilter(L, surf, filter);
-
-	return 0;
-}
-
-
-struct RadialBlurFilter {
-	GaussianKernel gk;
-	int cx, cy;
-	RadialBlurFilter(int x, int y, double sigma) :
-		gk(sigma), cx(x), cy(y)
-	{
-	}
-	inline PixelFormat::A8 a8(BaseImage<PixelFormat::A8> &src, int x, int y)
-	{
-		if (x == cx && y == cy) return src.Pixel(x, y);
-		double xstep = x-cx, ystep = y-cy, ivlen = 1/sqrt(xstep*xstep+ystep*ystep);
-		xstep *= ivlen; ystep *= ivlen;
-		int divisor = 0;
-		int a = 0;
-		for (int t = 0, i = gk.width/2; i < gk.width; t++, i++) {
-			PixelFormat::A8 &srcpx = GetPixelBilinear<PixelFormat::A8, EdgeCondition::Repeat<PixelFormat::A8> >(src, x+xstep*t, y+ystep*t);
-			//PixelFormat::A8 &srcpx = EdgeCondition::repeat(src, (int)(x+xstep*t), (int)(y+ystep*t));
-			a += srcpx.A() * gk.kernel[i];
-			divisor += gk.kernel[i];
-		}
-		PixelFormat::A8 res;
-		a = a / divisor; if (a < 0) a = 0; if (a > 255) a = 255;
-		res.A() = a;
-		return res;
-	}
-	inline PixelFormat::cairo_rgb24 rgb24(BaseImage<PixelFormat::cairo_rgb24> &src, int x, int y)
-	{
-		if (x == cx && y == cy) return src.Pixel(x, y);
-		double xstep = x-cx, ystep = y-cy, ivlen = 1/sqrt(xstep*xstep+ystep*ystep);
-		xstep *= ivlen; ystep *= ivlen;
-		int divisor = 0;
-		int r = 0, g = 0, b = 0;
-		for (int t = 0, i = gk.width/2; i < gk.width; t++, i++) {
-			PixelFormat::cairo_rgb24 &srcpx = GetPixelBilinear<PixelFormat::cairo_rgb24, EdgeCondition::Repeat<PixelFormat::cairo_rgb24> >(src, x+xstep*t, y+ystep*t);
-			//PixelFormat::cairo_rgb24 &srcpx = EdgeCondition::repeat(src, (int)(x+xstep*t), (int)(y+ystep*t));
-			r += srcpx.R() * gk.kernel[i];
-			g += srcpx.G() * gk.kernel[i];
-			b += srcpx.B() * gk.kernel[i];
-			divisor += gk.kernel[i];
-		}
-		PixelFormat::cairo_rgb24 res;
-		r = r / divisor; if (r < 0) r = 0; if (r > 255) r = 255;
-		g = g / divisor; if (g < 0) g = 0; if (g > 255) g = 255;
-		b = b / divisor; if (b < 0) b = 0; if (b > 255) b = 255;
-		res.R() = r;
-		res.G() = g;
-		res.B() = b;
-		return res;
-	}
-	inline PixelFormat::cairo_argb32 argb32(BaseImage<PixelFormat::cairo_argb32> &src, int x, int y)
-	{
-		if (x == cx && y == cy) return src.Pixel(x, y);
-		double xstep = x-cx, ystep = y-cy, ivlen = 1/sqrt(xstep*xstep+ystep*ystep);
-		xstep *= ivlen; ystep *= ivlen;
-		int divisor = 0;
-		int a = 0, r = 0, g = 0, b = 0;
-		for (int t = 0, i = gk.width/2; i < gk.width; t++, i++) {
-			PixelFormat::cairo_argb32 &srcpx = GetPixelBilinear<PixelFormat::cairo_argb32, EdgeCondition::Repeat<PixelFormat::cairo_argb32> >(src, x+xstep*t, y+ystep*t);
-			//PixelFormat::cairo_argb32 &srcpx = EdgeCondition::repeat(src, (int)(x+xstep*t), (int)(y+ystep*t));
-			a += srcpx.A() * gk.kernel[i];
-			r += srcpx.R() * gk.kernel[i];
-			g += srcpx.G() * gk.kernel[i];
-			b += srcpx.B() * gk.kernel[i];
-			divisor += gk.kernel[i];
-		}
-		PixelFormat::cairo_argb32 res;
-		a = a / divisor; if (a < 0) a = 0; if (a > 255) a = 255;
-		r = r / divisor; if (r < 0) r = 0; if (r > 255) r = 255;
-		g = g / divisor; if (g < 0) g = 0; if (g > 255) g = 255;
-		b = b / divisor; if (b < 0) b = 0; if (b > 255) b = 255;
-		res.A() = a;
-		res.R() = r;
-		res.G() = g;
-		res.B() = b;
-		return res;
-	}
-};
-
-
-static int radial_blur(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	int x = luaL_checkint(L, 2);
-	int y = luaL_checkint(L, 3);
-	double sigma = luaL_checknumber(L, 4);
-
-	RadialBlurFilter filter(x, y, sigma);
-	ApplyGeneralFilter(L, surf, filter);
-
-	return 0;
-}
-
-
-static int invert_image(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	cairo_surface_flush(surf);
-	int width = cairo_image_surface_get_width(surf);
-	int height = cairo_image_surface_get_height(surf);
-	ptrdiff_t stride = (ptrdiff_t)cairo_image_surface_get_stride(surf);
-	unsigned char *data = cairo_image_surface_get_data(surf);
-	cairo_format_t format = cairo_image_surface_get_format(surf);
-
-	// ARGB32 and RGB24 must be treated differently due to the premultipled alpha in ARGB32
-	// Also the alpha in ARGB32 is not inverted, only the colour channels
-	if (format == CAIRO_FORMAT_ARGB32) {
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			uint32_t *line = (uint32_t*)(data + y*stride);
-			for (int x = 0; x < width; x++, line++) {
-				// The R, G and B channels are in range 0..a, and inverting means calculating
-				// max-current, so inversion here is a-c for each channel.
-				unsigned char a = (*line & 0xff000000) >> 24;
-				unsigned char r = (*line & 0x00ff0000) >> 16;
-				unsigned char g = (*line & 0x0000ff00) >> 8;
-				unsigned char b = *line & 0x000000ff;
-				*line = (a<<24) | ((a-r)<<16) | ((a-g)<<8) | (a-b);
-			}
-		}
-	}
-	else if (format == CAIRO_FORMAT_RGB24) {
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			uint32_t *line = (uint32_t*)(data + y*stride);
-			for (int x = 0; x < width; x++, line++) {
-				// Invert R, G and B channels by XOR'ing them with 0xff each.
-				*line = *line ^ 0x00ffffff;
-			}
-		}
-	}
-	else if (format == CAIRO_FORMAT_A8) {
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			unsigned char *line = data + y*stride;
-			for (int x = 0; x < width; x++, line++) {
-				*line = ~ *line;
-			}
-		}
-	}
-	else if (format == CAIRO_FORMAT_A1) {
-		int lwidth = (width + 31) / 32; // "long-width", width in 32 bit longints, rounded up
-#pragma omp parallel for
-		for (int y = 0; y < height; y++) {
-			// Pixels are stored packed into 32 bit quantities
-			uint32_t *line = (uint32_t*)(data + y*stride);
-			for (int x = 0; x < lwidth; x++, line++) {
-				// Yes this means we might end up inverting too many bits.. hopefully won't happen.
-				// (And even then, who would seriously use A1 surfaces?)
-				*line = ~ *line;
-			}
-		}
-	}
-
-	cairo_surface_mark_dirty(surf);
-
-	return 0;
-}
-
-
-static int separable_filter(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	if (!lua_istable(L, 2)) {
-		luaL_error(L, "Expected table as second argument to raster.separable_filter, got %s", luaL_typename(L, 2));
-		return 0;
-	}
-	int divisor = luaL_checkint(L, 3);
-
-	int width = (int)lua_objlen(L, 2);
-	if (width < 1) {
-		luaL_error(L, "Cannot apply empty filter");
-		return 0;
-	}
-	int *kernel = new int[width];
-	int i = 0;
-	lua_pushnil(L);
-	while (lua_next(L, 2)) {
-		if (lua_isnumber(L, -1)) {
-			kernel[i] = (int)lua_tointeger(L, -1);
-		}
-		i++;
-		lua_pop(L, 1);
-	}
-
-	ApplySeparableFilter(L, surf, kernel, width, divisor);
-
-	delete[] kernel;
-
-	return 0;
-}
-
-
-static int pixel_value_map(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	const char *program = luaL_checkstring(L, 2);
-
-	// Init image
-	cairo_surface_flush(surf);
-	int width = cairo_image_surface_get_width(surf);
-	int height = cairo_image_surface_get_height(surf);
-	ptrdiff_t stride = (ptrdiff_t)cairo_image_surface_get_stride(surf);
-	unsigned char *data = cairo_image_surface_get_data(surf);
-	cairo_format_t format = cairo_image_surface_get_format(surf);
-
-	// Set up engine specs
-	ExpressionEngine::Specification spec;
-	if (format == CAIRO_FORMAT_ARGB32) {
-		spec.registers.resize(6);
-		spec.registers[0] = "R";
-		spec.registers[1] = "G";
-		spec.registers[2] = "B";
-		spec.registers[3] = "A";
-		spec.registers[4] = "X";
-		spec.registers[5] = "Y";
-	}
-	else if (format == CAIRO_FORMAT_RGB24) {
-		spec.registers.resize(5);
-		spec.registers[0] = "R";
-		spec.registers[1] = "G";
-		spec.registers[2] = "B";
-		spec.registers[3] = "X";
-		spec.registers[4] = "Y";
-	}
-	else {
-		luaL_error(L, "Unsupported pixel format");
-	}
-
-	// Compile program
-	ExpressionEngine::Machine machine;
-	try {
-		machine = ExpressionEngine::Machine(spec, program);
-	}
-	catch (const char *e) {
-		// This is a parse error
-		luaL_error(L, "Error in expression program near\"%s\"", e);
-	}
-
-	if (format == CAIRO_FORMAT_ARGB32) {
-		BaseImage<PixelFormat::cairo_argb32> img(width, height, stride, data);
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				PixelFormat::cairo_argb32 &p = img.Pixel(x, y);
-				machine.registers[0] = (double)p.R() / 255.0;
-				machine.registers[1] = (double)p.G() / 255.0;
-				machine.registers[2] = (double)p.B() / 255.0;
-				machine.registers[3] = (double)p.A() / 255.0;
-				machine.registers[4] = x;
-				machine.registers[5] = y;
-				machine.Run();
-				p.R() = (uint8_t)(machine.registers[0] * 255);
-				p.G() = (uint8_t)(machine.registers[1] * 255);
-				p.B() = (uint8_t)(machine.registers[2] * 255);
-				p.A() = (uint8_t)(machine.registers[3] * 255);
-			}
-		}
-	}
-	else if (format == CAIRO_FORMAT_RGB24) {
-		BaseImage<PixelFormat::cairo_rgb24> img(width, height, stride, data);
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				PixelFormat::cairo_rgb24 &p = img.Pixel(x, y);
-				machine.registers[0] = (double)p.R() / 255.0;
-				machine.registers[1] = (double)p.G() / 255.0;
-				machine.registers[2] = (double)p.B() / 255.0;
-				machine.registers[3] = x;
-				machine.registers[4] = y;
-				machine.Run();
-				p.R() = (uint8_t)(machine.registers[0] * 255);
-				p.G() = (uint8_t)(machine.registers[1] * 255);
-				p.B() = (uint8_t)(machine.registers[2] * 255);
-			}
-		}
-	}
-	else {
-		luaL_error(L, "Unsupported pixel format");
-	}
-
-	cairo_surface_mark_dirty(surf);
-
-	return 0;
-}
-
-
-static int pixel_coord_map(lua_State *L)
-{
-	cairo_surface_t *surf = CheckSurface(L, 1);
-	const char *program = luaL_checkstring(L, 2);
-
-	// Set up engine specs
-	ExpressionEngine::Specification spec;
-	spec.registers.resize(2);
-	spec.registers[0] = "X";
-	spec.registers[1] = "Y";
-
-	// Compile program
-	ExpressionEngine::Machine machine;
-	try {
-		machine = ExpressionEngine::Machine(spec, program);
-	}
-	catch (const char *e) {
-		// This is a parse error
-		luaL_error(L, "Error in expression program near\"%s\"", e);
-	}
-
-	// Init image
-	cairo_surface_flush(surf);
-	int width = cairo_image_surface_get_width(surf);
-	int height = cairo_image_surface_get_height(surf);
-	ptrdiff_t stride = (ptrdiff_t)cairo_image_surface_get_stride(surf);
-	unsigned char *data = cairo_image_surface_get_data(surf);
-	cairo_format_t format = cairo_image_surface_get_format(surf);
-
-	unsigned char *work = new unsigned char[height * stride];
-	memcpy(work, data, height*stride);
-
-	if (format == CAIRO_FORMAT_ARGB32) {
-		BaseImage<PixelFormat::cairo_argb32> simg(width, height, stride, work);
-		BaseImage<PixelFormat::cairo_argb32> dimg(width, height, stride, data);
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				machine.registers[0] = x;
-				machine.registers[1] = y;
-				machine.Run();
-				dimg.Pixel(x, y) = GetPixelBilinear<PixelFormat::cairo_argb32, EdgeCondition::Mirror<PixelFormat::cairo_argb32> >(simg, machine.registers[0], machine.registers[1]);
-			}
-		}
-	}
-	else if (format == CAIRO_FORMAT_RGB24) {
-		BaseImage<PixelFormat::cairo_rgb24> simg(width, height, stride, work);
-		BaseImage<PixelFormat::cairo_rgb24> dimg(width, height, stride, data);
-		for (int y = 0; y < height; y++) {
-			for (int x = 0; x < width; x++) {
-				machine.registers[0] = x;
-				machine.registers[1] = y;
-				machine.Run();
-				dimg.Pixel(x, y) = GetPixelBilinear<PixelFormat::cairo_rgb24, EdgeCondition::Mirror<PixelFormat::cairo_rgb24> >(simg, machine.registers[0], machine.registers[1]);
-			}
-		}
-	}
-	else {
-		luaL_error(L, "Unsupported pixel format");
-	}
-
-	delete[] work;
-	cairo_surface_mark_dirty(surf);
-
-	return 0;
-}
-
-
-// Registration
-
-static luaL_Reg rasterlib[] = {
-	{"gaussian_blur", gaussian_blur}, {"box_blur", box_blur},
-	{"directional_blur", directional_blur}, {"radial_blur", radial_blur},
-	{"separable_filter", separable_filter},
-	{"invert", invert_image},
-	{"pixel_value_map", pixel_value_map}, {"pixel_coord_map", pixel_coord_map},
-	{NULL, NULL}
-};
-
-int luaopen_raster(lua_State *L)
-{
-	luaL_register(L, "raster", rasterlib);
-	return 0;
-}

OverLua/raster_ops.h

@@ -1,30 +0,0 @@
-/*
- * Raster image operations for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-
-// Everything is implemented in the .cpp file as static functions.
-
-int luaopen_raster(lua_State *L);

OverLua/readme.txt

@@ -1,45 +0,0 @@
-OverLua is a plugin library that runs a Lua script to process video frames,
-primarily intended to produce advanced overlay graphics. The target audience
-is currently primarily programmers.
-
-The name is intended as a pun on Overlay and Lua.
-
-To help produce overlay graphics, OverLua provides an interface to the
-cairo vector graphics library. A library of functions to do raster-based
-graphics processing is also included.
-
-Curerently the only known-working plugin interface to OverLua is the Avisynth
-interface. A CSRI interface is also included but it's neither tested nor
-actively maintained. Patches to make the CSRI interface work are most welcome.
-Further interfaces would also be appreciated, eg. one for mencoder.
-
-The most thorough documentation is still the source code but I'm working on
-throwing together something more useful. See the other text files included
-in the distribution.
-
-
-Notes on the pre-built DLL file
--------------------------------
-
-The included pre-built DLL is compiled with Microsoft Visual C++ 2005 SP1
-and so will require the runtime library for that version of the compiler.
-You can download the required runtime library at this location:
-
-<http://www.microsoft.com/downloads/details.aspx?FamilyID=200b2fd9-ae1a-4a14-984d-389c36f85647&DisplayLang=en>
-
-The DLL is no longer built with SSE2. Appanrently some people still use
-CPU's without SSE2 support.
-
-Finally, the DLL is built with OpenMP optimisations enabled, which means it
-will take advantage of multi-core and other SMP systems if available. The
-OpenMP optimisations are only in the raster image filtering and the
-cairo surface/video frame interaction functions. If you do not use the raster
-graphics operations much you won't see much gain from this SMP support either.
-
-
-Licensing
----------
-
-OverLua is licensed under version 2 of the GNU General Public License. This
-means that you get no warranties of any kind.
-See the file GPLv2.txt for details.

OverLua/vfr.cpp

@@ -1,184 +0,0 @@
-/*
- * VFR translation functions for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#include "vfr.h"
-#include <stdio.h>
-#include <string.h>
-#include <vector>
-
-
-// Work with seconds per frame (spf) here instead of fps since that's more natural for the translation we're doing
-
-
-class TimecodesV1 : public VFRTranslator {
-private:
-	// Used when sections run out
-	double default_spf;
-	double first_non_section_timestamp;
-	int first_non_section_frame;
-
-	// Also generate sections for unspecified ones
-	// (use the default framerate then)
-	struct FrameRateSection {
-		double start_time;
-		double spf;
-		int start_frame;
-		int end_frame;
-	};
-	std::vector<FrameRateSection> sections;
-
-public:
-	virtual double TimeStampFromFrameNumber(int n)
-	{
-		// Find correct section
-		for (size_t i = 0; i < sections.size(); i++) {
-			FrameRateSection &sect = sections[i];
-			if (n >= sect.start_frame && n <= sect.end_frame) {
-				return sect.start_time + (n - sect.start_frame) * sect.spf;
-			}
-		}
-		// Not in a section
-		if (n < 0) return 0.0;
-		return first_non_section_timestamp + (n - first_non_section_frame) * default_spf;
-	}
-
-	TimecodesV1(FILE *vfrfile)
-	{
-		char buf[100];
-
-		default_spf = -1;
-		double cur_time = 0.0;
-
-		FrameRateSection temp_section;
-		temp_section.start_time = 0.0;
-		temp_section.spf = -1;
-		temp_section.start_frame = 0;
-		temp_section.end_frame = 0;
-
-		while (fgets(buf, 100, vfrfile)) {
-			// Comment?
-			if (buf[0] == '#') continue;
-
-			if (strncmp(buf, "Assume ", 7) == 0 && default_spf < 0) {
-				char *num = buf+7;
-				default_spf = atof(num);
-				if (default_spf > 0)
-					default_spf = 1 / default_spf;
-				else
-					default_spf = -1;
-				temp_section.spf = default_spf;
-				continue;
-			}
-
-			int start_frame, end_frame;
-			double fps;
-			if (scanf("%d,%d,%f", &start_frame, &end_frame, &fps) == 3) {
-				// Finish the current temp section
-				temp_section.end_frame = start_frame - 1;
-				if (temp_section.end_frame >= temp_section.start_frame) {
-					cur_time += (temp_section.end_frame - temp_section.start_frame + 1) * temp_section.spf;
-					sections.push_back(temp_section);
-				}
-				// Insert the section corresponding to this line
-				temp_section.spf = 1/fps;
-				temp_section.start_frame = start_frame;
-				temp_section.end_frame = end_frame;
-				temp_section.start_time = cur_time;
-				cur_time += (end_frame - start_frame + 1) / fps;
-				sections.push_back(temp_section);
-				// Begin new temp section
-				temp_section.spf = default_spf;
-				temp_section.start_frame = end_frame + 1;
-				temp_section.end_frame = end_frame; // yes, negative duration
-				temp_section.start_time = cur_time;
-			}
-		}
-
-		first_non_section_timestamp = cur_time;
-		first_non_section_frame = temp_section.start_frame;
-	}
-
-};
-
-
-class TimecodesV2 : public VFRTranslator {
-private:
-	// Main data
-	std::vector<double> timestamps;
-	// For when data are exhausted (well, they shouldn't, then the vfr file is bad)
-	int last_known_frame;
-	double last_known_timestamp;
-	double assumed_spf;
-
-public:
-	virtual double TimeStampFromFrameNumber(int n)
-	{
-		if (n < (int)timestamps.size() && n >= 0) {
-			return timestamps[n];
-		}
-		if (n < 0) return 0.0;
-		return last_known_timestamp + (n - last_known_frame) * assumed_spf;
-	}
-
-	TimecodesV2(FILE *vfrfile)
-	{
-		char buf[50];
-
-		timestamps.reserve(8192); // should be enough for most cases
-
-		while (fgets(buf, 50, vfrfile)) {
-			// Comment?
-			if (buf[0] == '#') continue;
-			// Otherwise assume it's a good timestamp
-			timestamps.push_back(atof(buf));
-		}
-
-		last_known_frame = (int)timestamps.size()-1;
-		last_known_timestamp = timestamps[last_known_frame];
-		assumed_spf = 1/25.0; // yes, this is stupid - anyone got a better idea?
-	}
-
-};
-
-
-VFRTranslator *GetVFRTranslator(const char *vfrfile)
-{
-	char buf[32];
-	buf[19] = 0; // In "# timecode format v1" the version number is character index 19
-	FILE *f = fopen(vfrfile, "r");
-	VFRTranslator *res = 0;
-	if (fgets(buf, 32, f) && buf[0] == '#') {
-		// So do some really shoddy parsing here, assume the file is good
-		if (buf[19] == '1') {
-			res = new TimecodesV1(f);
-		} else if (buf[19] == '2') {
-			res = new TimecodesV2(f);
-		}
-	}
-	fclose(f);
-	return res;
-}
-

OverLua/vfr.h

@@ -1,37 +0,0 @@
-/*
- * VFR translation functions for OverLua
- *
-
-    Copyright 2007  Niels Martin Hansen
-
-    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.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-    Contact:
-    E-mail: <jiifurusu@gmail.com>
-    IRC: jfs in #aegisub on irc.rizon.net
-
- */
-
-#ifndef VFR_H
-#define VFR_H
-
-class VFRTranslator {
-public:
-	virtual double TimeStampFromFrameNumber(int n) = 0;
-};
-
-VFRTranslator *GetVFRTranslator(const char *vfrfile);
-
-#endif

README

@@ -1 +0,0 @@
-* To be written.

README.md

@@ -0,0 +1,186 @@
+## arch1t3cht's Aegisub "fork"
+Download release builds [here](https://github.com/arch1t3cht/Aegisub/releases), or the latest CI builds [here](https://github.com/arch1t3cht/Aegisub/actions).
+
+The release page also has detailed list of all changes and new features. If you're interested in the technical details or want to compile yourself, read on.
+
+### Don't we have enough Aegisub forks already??
+We absolutely do, and I'm aware that adding another one [doesn't sound like](https://xkcd.com/927/) a [good idea on paper](https://cdn.discordapp.com/attachments/425357202963038208/1007103606421459004/unknown.png). However,
+
+- None of the existing forks are completely satisfying at the moment:
+  - [wangqr's fork](https://github.com/wangqr/Aegisub) is actively maintained, but focussing more on stability. It's missing most of the modern features.
+  - [AegisubDC](https://github.com/Ristellise/AegisubDC) has the most modern features (in particular video-panning), but is Windows-only and not actively maintained anymore.
+  - [The TypesettingTools fork](https://github.com/TypesettingTools/Aegisub) is the one that will one day become the upstream version and builds relatively effortlessly on all operating systems, but at the moment it's not moving much. It's the base for this fork, and I hope to one day merge most of these additions into it.
+- Only PR'ing the changes in here to various forks would cause even more chaos
+- ~~I try to convince myself that this isn't really a "fork" in the traditional sense - one which aims to provide extended support and stability fixes. It's a collection of new feature additions which I built myself, together with some of the most important new features floating around other forks.~~ At this point it's probably too late to still be saying this. Still, the general mission hasn't changed. This fork collects new features and critical bugfixes, but won't be putting extra time into maintenance aspects like cleanup and refactors. Partly, this is also because any big refactors would make it harder to pull these changes into upstream repositories or future forks.
+
+    While this is usually also the version of Aegisub I'm currently using, I make no promises on stability. **Don't** use this version if you're just looking for any version of Aegisub - this is mostly intended for typesetting and other advanced usage.
+
+### Organization
+Being a collection of different feature additions, this repository consists of a set of branches for different features, so that they can easily be merged into other repositories. The [`feature`](https://github.com/arch1t3cht/Aegisub/tree/feature) branch merges together all the features I deem as currently usable. Due to the structure of the repository, I will be force-pushing to this branch and some of the individual branches very frequently, so they're not ideal for basing further branches on.
+
+The `cibuilds` branch makes some CI builds of snapshots of `feature` at relevant points in time.
+
+### Branch/Feature list
+This list is for navigating the repository. Go to the [release page](https://github.com/arch1t3cht/Aegisub/releases) for a more structured changelog.
+- [`folding`](https://github.com/arch1t3cht/Aegisub/tree/folding): Add the ability to visually group and collapse lines in the subtitle grid
+- [`lua_api`](https://github.com/arch1t3cht/Aegisub/tree/lua_api): Add new functions to the Lua automation API, like controlling the selection or cursor in the text edit box
+- [`vector_clip_actions`](https://github.com/arch1t3cht/Aegisub/tree/vector_clip_actions): Make the different modes of the vector clip tool (lines, bezier curves, adding points, etc) bindable to hotkeys
+- [`color_picker_fix2`](https://github.com/arch1t3cht/Aegisub/tree/color_picker_fix2): Add an option (under "Interface") to restrict the color picker to the window, which fixes the color picker on Linux in a lot of cases.
+- [`avisynth`](https://github.com/arch1t3cht/Aegisub/tree/avisynth): Reenable Avisynth support on Windows and enable Avisynth on Linux
+- [`bestsource`](https://github.com/arch1t3cht/Aegisub/tree/bestsource): Add BestSource audio and video source. This source is slower than others by multiple orders of magnitude, but in exchange it can guarantee exact seeking.
+- [`vapoursynth`](https://github.com/arch1t3cht/Aegisub/tree/vapoursynth): Add Vapoursynth audio and video source
+- [`bugfixes`](https://github.com/arch1t3cht/Aegisub/tree/bugfixes): Various fixes necessary for compilation. Most branches are based on this.
+- [`workarounds`](https://github.com/arch1t3cht/Aegisub/tree/workarounds): Same as `bugfixes`, but these are hacky fixes that probably shouldn't be pulled without more work.
+- [`fixes`](https://github.com/arch1t3cht/Aegisub/tree/fixes): Miscellaneous bugfixes
+- [`misc`](https://github.com/arch1t3cht/Aegisub/tree/misc): Other miscellaneous additions
+- [`wangqr_gui`](https://github.com/arch1t3cht/Aegisub/tree/wangqr_gui): Merge wangqr's changes regarding the GUI. In particular, add high-DPI compatibility.
+- [`misc_dc`](https://github.com/arch1t3cht/Aegisub/tree/misc_dc): Miscellaneous changes taken from AegisubDC
+- [`xa2-ds`](https://github.com/arch1t3cht/Aegisub/tree/xa2-ds): Add XAudio2 backend and allow stereo playback for some other backends, by wangqr and Shinon.
+- [`stereo`](https://github.com/arch1t3cht/Aegisub/tree/stereo): Add multi-channel support for the other audio backends where possible.
+- [`video_panning_option`](https://github.com/arch1t3cht/Aegisub/tree/video_panning_option): Merge [moex3's video zoom and panning](https://github.com/TypesettingTools/Aegisub/pull/150), with several bugfixes and more options to control zoom behavior
+- [`spectrum-frequency-mapping`](https://github.com/arch1t3cht/Aegisub/tree/spectrum-frequency-mapping): Merge EleonoreMizo's [spectrum display improvements](https://github.com/TypesettingTools/Aegisub/pull/94), and also make Shift+Scroll vertically zoom the audio display
+- [`wangqr_time_video`](https://github.com/arch1t3cht/Aegisub/tree/wangqr_time_video): Merge wangqr's feature adding a tool for timing subtitles to changes in the video
+
+### Troubleshooting
+I'll gladly take any bug reports, but if you encounter an issue, please check first if it occurs only on my fork, or also on [earlier TSTools builds](https://github.com/TypesettingTools/Aegisub/actions).
+If it wasn't introduced by my fork, I can still take a look, but I can't promise anything.
+
+You can find me for support on various servers, including the cave and the TSTools server linked below.
+
+#### Aegisub on Linux doesn't recognize my GTK theme
+This is probably because you're building with wxgtk2. Building with wxgtk3 fixes this, but causes some problems of its own (notably the broken color picker, occasional crashes when opening file dialogs from automation scripts, and general layouting issues).
+
+The exact way of switching depends on your Linux distribution, but essentially you need to ensure that `wx-config` or the next best variant of it points to wxgtk3. If it points to wxgtk2 by default and deinstalling wxgtk2 isn't an option, you can also temporarily move it out of the path or use a `native-file` in your meson project. Then, fully reconfigure meson using `meson configure --clearcache` and `meson setup --reconfigure`.
+
+#### The video is desynced / Frames don't appear at the right time
+This is probably due to the ffms2 seeking bug ([#394](https://github.com/FFMS/ffms2/issues/394)). On Windows, this specific regression shouldn't happen anymore. On Linux, you need to install the latest git version of ffms2 - for example the [`ffms2-git`](https://aur.archlinux.org/packages/ffms2-git) AUR package on Arch linux, or just compile it yourself.
+
+If it's not because of this particular bug, you can also try an alternative video source like LSMASHSource via Avisynth or Vapoursynth, or BestSource.
+
+#### On Windows: Aegisub crashes whenever I open a video
+If you're compiling yourself, try adding `--force-fallback-for=zlib` to the meson options.
+
+
+### Compilation
+If you're just looking to install Aegisub, you might want to check out the [releases page](https://github.com/arch1t3cht/Aegisub/releases) or the [CI builds](https://github.com/arch1t3cht/Aegisub/actions) first.
+
+For compilation on Windows, see the TSTools documentation below. Also check the [GitHub workflow](https://github.com/arch1t3cht/Aegisub/blob/cibuilds/.github/workflows/ci.yml) for the project arguments.
+
+On Arch Linux, there is an AUR package called [aegisub-arch1t3cht-git](https://aur.archlinux.org/packages/aegisub-arch1t3cht-git). It's not maintained by me but seems to work.
+
+On other Linux distributions or for manual compilation you can use this package or the [TSTools PKGBUILD](https://aur.archlinux.org/packages/aegisub-ttools-meson-git) as a reference, in particular for installing the necessary dependencies if you don't want to compile them yourself.
+If all dependencies are installed:
+- Install Meson
+- Clone the repository
+- In the repository, run `meson setup build --buildtype=release` for the default configuration. See below for further options.
+- `cd` to the `build` directory and run `ninja`
+- You'll get an `aegisub` binary in the `build` folder. To install it to a system-wide location, run `ninja install`. To install to `/usr` instead of `/usr/local`, pass `--prefix=/usr` when configuring or reconfiguring meson.
+- When recompiling after pulling new commits, skip the `meson setup` setup and just immediately run `ninja` from the build directory - even when the build configuration changed.
+
+#### Compilation flags
+Some features are not enabled by default. To enable them, pass `-D<feature>=enabled` with the `meson setup` command:
+
+- `-Davisynth=enabled`: Avisynth support
+- `-Dbestsource=enabled`: BestSource
+- `-Dvapoursynth=enabled`: Vapoursynth support
+
+You can also disable options that are active by default in the same way. Check the file `meson_options.txt` for all options.
+
+To change the options of an existing build directory, run `meson setup --reconfigure <new arguments>` from inside the `build` directory.
+
+### Dependencies
+Apart from the dependencies for the TSTools version, there are some additional dependencies. These are cloned and compiled from scratch if not found, but you might want to install binaries instead:
+- `jansson`: For BestSource
+- `ffmpeg`: Becomes a direct dependency when compiling with BestSource
+- `avisynth` (or `avisynthplus`): Optional run-time dependency for the Avisynth source
+- `vapoursynth`: Optional run-time dependency for the VapourSynth source
+
+   The following VapourSynth plugins are used by the default scripts set in the default configuration:
+   - [`lsmas`](https://github.com/AkarinVS/L-SMASH-Works): For LWLibavSource
+   - [`bas`](https://github.com/vapoursynth/bestaudiosource): For BestAudioSource
+   - [`wwxd`](https://github.com/dubhater/vapoursynth-wwxd) and [`scxvid`](https://github.com/dubhater/vapoursynth-scxvid) (depending on settings): For keyframe generation
+
+
+# Aegisub
+
+For binaries and general information [see the homepage](http://www.aegisub.org).
+
+The bug tracker can be found at https://github.com/Aegisub/Aegisub/issues.
+
+Support is available on [Discord](https://discord.com/invite/AZaVyPr) or [IRC](irc://irc.rizon.net/aegisub).
+
+## Building Aegisub
+
+### Windows
+
+Prerequisites:
+
+1. Visual Studio (Community edition of any recent version is fine)
+2. The June 2010 DirectX SDK (the final release before DirectSound was dropped)
+3. Python 3
+4. Meson
+5. CMake
+6. Powershell execution policy set to Unrestricted
+
+There are a few optional dependencies that must be installed and on your PATH:
+
+1. msgfmt, to build the translations
+2. InnoSetup, to build the regular installer
+3. 7zip, to build the regular installer
+4. Moonscript, to build the regular installer
+
+All other dependencies are either stored in the repository or are included as submodules.
+
+Building:
+
+1. Clone Aegisub's repository: `git clone https://github.com/arch1t3cht/Aegisub.git`
+2. From the Visual Studio "x64 Native Tools Command Prompt", generate the build directory: `meson build -Ddefault_library=static` (if building for release, add `--buildtype=release`)
+3. Build with `cd build` and `ninja`
+
+You should now have a binary: `aegisub.exe`.
+
+Installer:
+
+You can generate the installer with `ninja win-installer` after a successful build. This assumes a working internet connection and installation of the optional dependencies.
+
+You can generate the portable zip with `ninja win-portable` after a successful build.
+
+### OS X
+
+A vaguely recent version of Xcode and the corresponding command-line tools are required.
+
+For personal usage, you can use pip and homebrew to install almost all of Aegisub's dependencies:
+
+    pip3 install meson
+    brew install cmake ninja pkg-config  libass boost zlib ffms2 fftw hunspell
+    export LDFLAGS="-L/usr/local/opt/icu4c/lib"
+    export CPPFLAGS="-I/usr/local/opt/icu4c/include"
+    export PKG_CONFIG_PATH="/usr/local/opt/icu4c/lib/pkgconfig"
+
+Once the dependencies are installed, build Aegisub with `meson build && meson compile -C build`.
+
+#### Build dmg
+
+```bash
+meson build_static -Ddefault_library=static -Dbuildtype=debugoptimized -Dbuild_osx_bundle=true -Dlocal_boost=true
+meson compile -C build_static
+meson test -C build_static --verbose
+meson compile osx-bundle -C build_static
+meson compile osx-build-dmg -C build_static
+```
+
+## Updating Moonscript
+
+From within the Moonscript repository, run `bin/moon bin/splat.moon -l moonscript moonscript/ > bin/moonscript.lua`.
+Open the newly created `bin/moonscript.lua`, and within it make the following changes:
+
+1. Prepend the final line of the file, `package.preload["moonscript"]()`, with a `return`, producing `return package.preload["moonscript"]()`.
+2. Within the function at `package.preload['moonscript.base']`, remove references to `moon_loader`, `insert_loader`, and `remove_loader`. This means removing their declarations, definitions, and entries in the returned table.
+3. Within the function at `package.preload['moonscript']`, remove the line `_with_0.insert_loader()`.
+
+The file is now ready for use, to be placed in `automation/include` within the Aegisub repo.
+
+## License
+
+All files in this repository are licensed under various GPL-compatible BSD-style licenses; see LICENCE and the individual source files for more information.
+The official Windows and OS X builds are GPLv2 due to including fftw3.

SSATool/AssemblyInfo.cs

@@ -1,77 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-//
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-//
-[assembly: AssemblyTitle("SSATool")]
-[assembly: AssemblyDescription("A typesetting tool for Advanced Substation Alpha files.")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("SSATool")]
-[assembly: AssemblyCopyright("Dan Donovan")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]		
-
-//
-// Version information for an assembly consists of the following four values:
-//
-//      Major Version
-//      Minor Version 
-//      Build Number
-//      Revision
-//
-// You can specify all the values or you can default the Revision and Build Numbers 
-// by using the '*' as shown below:
-
-[assembly: AssemblyVersion("4.3.6.0")]
-
-//
-// In order to sign your assembly you must specify a key to use. Refer to the 
-// Microsoft .NET Framework documentation for more information on assembly signing.
-//
-// Use the attributes below to control which key is used for signing. 
-//
-// Notes: 
-//   (*) If no key is specified, the assembly is not signed.
-//   (*) KeyName refers to a key that has been installed in the Crypto Service
-//       Provider (CSP) on your machine. KeyFile refers to a file which contains
-//       a key.
-//   (*) If the KeyFile and the KeyName values are both specified, the 
-//       following processing occurs:
-//       (1) If the KeyName can be found in the CSP, that key is used.
-//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
-//           in the KeyFile is installed into the CSP and used.
-//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
-//       When specifying the KeyFile, the location of the KeyFile should be
-//       relative to the project output directory which is
-//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
-//       located in the project directory, you would specify the AssemblyKeyFile 
-//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
-//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
-//       documentation for more information on this.
-//
-[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile(@"c:\documents and settings\administrator\my documents\visual studio projects\ssatool.snk")]
-[assembly: AssemblyKeyName("")]

SSATool/Condition.cs

@@ -1,89 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-using System;
-//using System.Collections;
-using System.Collections.Generic;
-
-namespace SSATool
-{
-	public class Condition : ICloneable {
-		public string ConditionOne;
-		public string ConditionOp;
-		public string ConditionTwo;
-		public bool ConditionEnabled;
-
-		public Condition() { }
-
-		public Condition(string ConditionOne, string ConditionOp, string ConditionTwo, bool ConditionEnabled) {
-			this.ConditionOne = ConditionOne;
-			this.ConditionOp = ConditionOp;
-			this.ConditionTwo = ConditionTwo;
-			this.ConditionEnabled = ConditionEnabled;
-		}
-
-		public object Clone() {
-            return this.MemberwiseClone();
-		}
-	}
-
-	public class ConditionColl {
-        protected List<Condition> conditionColl;
-
-		public ConditionColl() {
-			conditionColl = new List<Condition>();
-		}
-
-		public int ConditionCount {
-			get { return conditionColl.Count; }
-		}
-		public void AddCondition(string CondOne, string CondOp, string CondTwo) {
-			Condition newCond = new Condition(CondOne,CondOp,CondTwo,true);
-			conditionColl.Add(newCond);
-		}
-
-		public void AddCondition(string CondOne, string CondOp, string CondTwo, bool CondEnabled) {
-			Condition newCond = new Condition();
-			newCond.ConditionOne = CondOne;
-			newCond.ConditionOp = CondOp;
-			newCond.ConditionTwo = CondTwo;
-			newCond.ConditionEnabled = CondEnabled;
-			conditionColl.Add(newCond);
-		}
-
-		public void AddCondition(Condition tc) {
-			conditionColl.Add(tc);
-		}
-
-		public Condition GetCondition(int index) {
-			return conditionColl[index];
-		}
-
-		public void RemoveCondition(int index) {
-			if (conditionColl.Count > index) conditionColl.RemoveAt(index);
-		}
-
-		public List<Condition> CloneConditions() {
-            List<Condition> nl = new List<Condition>();
-			for(int index=0;index!=conditionColl.Count;index+=1)
-				nl.Add((Condition)conditionColl[index].Clone());
-            return nl;
-		}
-	}
-}

SSATool/ConditionDialog.cs

@@ -1,252 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-using System;
-using System.ComponentModel;
-using System.Windows.Forms;
-
-namespace SSATool
-{
-	/// <summary>
-	/// Summary description for ConditionDialog.
-	/// </summary>
-	public class ConditionDialog : System.Windows.Forms.Form
-	{
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.ComboBox comboBox1;
-		private System.Windows.Forms.Button cmdCancel;
-		private System.Windows.Forms.Button cmdOK;
-		private System.Windows.Forms.TextBox txtC1;
-		private System.Windows.Forms.TextBox txtC2;
-		private System.Windows.Forms.Label lblPrompt;
-		/// <summary>
-		/// Required designer variable.
-		/// </summary>
-		private System.ComponentModel.Container components = null;
-
-		public ConditionDialog() {
-			InitializeComponent();
-		}
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// </summary>
-		protected override void Dispose( bool disposing )
-		{
-			if( disposing )
-			{
-				if(components != null)
-				{
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
-		#region Windows Form Designer generated code
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.label1 = new System.Windows.Forms.Label();
-			this.label2 = new System.Windows.Forms.Label();
-			this.label3 = new System.Windows.Forms.Label();
-			this.txtC1 = new System.Windows.Forms.TextBox();
-			this.txtC2 = new System.Windows.Forms.TextBox();
-			this.lblPrompt = new System.Windows.Forms.Label();
-			this.comboBox1 = new System.Windows.Forms.ComboBox();
-			this.cmdCancel = new System.Windows.Forms.Button();
-			this.cmdOK = new System.Windows.Forms.Button();
-			this.SuspendLayout();
-			// 
-			// label1
-			// 
-			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label1.Location = new System.Drawing.Point(8, 56);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(128, 20);
-			this.label1.TabIndex = 6;
-			this.label1.Text = "Condition One:";
-			this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-			// 
-			// label2
-			// 
-			this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label2.Location = new System.Drawing.Point(8, 80);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(128, 20);
-			this.label2.TabIndex = 7;
-			this.label2.Text = "Condition Two:";
-			this.label2.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-			// 
-			// label3
-			// 
-			this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label3.Location = new System.Drawing.Point(8, 104);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(128, 20);
-			this.label3.TabIndex = 8;
-			this.label3.Text = "Comparison:";
-			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-			// 
-			// txtC1
-			// 
-			this.txtC1.Location = new System.Drawing.Point(144, 56);
-			this.txtC1.Name = "txtC1";
-			this.txtC1.Size = new System.Drawing.Size(336, 20);
-			this.txtC1.TabIndex = 0;
-			this.txtC1.Text = "";
-			this.txtC1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtC_KeyPress);
-			// 
-			// txtC2
-			// 
-			this.txtC2.Location = new System.Drawing.Point(144, 80);
-			this.txtC2.Name = "txtC2";
-			this.txtC2.Size = new System.Drawing.Size(336, 20);
-			this.txtC2.TabIndex = 1;
-			this.txtC2.Text = "";
-			this.txtC2.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtC_KeyPress);
-			// 
-			// lblPrompt
-			// 
-			this.lblPrompt.Font = new System.Drawing.Font("Microsoft Sans Serif", 11.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.lblPrompt.Location = new System.Drawing.Point(0, 8);
-			this.lblPrompt.Name = "lblPrompt";
-			this.lblPrompt.Size = new System.Drawing.Size(480, 40);
-			this.lblPrompt.TabIndex = 5;
-			// 
-			// comboBox1
-			// 
-			this.comboBox1.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.comboBox1.Items.AddRange(new object[] {
-														   "=",
-														   "==",
-														   "!=",
-                                                           "!==",
-														   ">",
-														   ">=",
-														   "<",
-														   "<="});
-			this.comboBox1.Location = new System.Drawing.Point(144, 104);
-			this.comboBox1.Name = "comboBox1";
-			this.comboBox1.Size = new System.Drawing.Size(120, 21);
-			this.comboBox1.TabIndex = 2;
-			this.comboBox1.Text = "==";
-			this.comboBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.comboBox1_KeyPress);
-			// 
-			// cmdCancel
-			// 
-			this.cmdCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.cmdCancel.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-			this.cmdCancel.Location = new System.Drawing.Point(384, 104);
-			this.cmdCancel.Name = "cmdCancel";
-			this.cmdCancel.Size = new System.Drawing.Size(96, 24);
-			this.cmdCancel.TabIndex = 4;
-			this.cmdCancel.Text = "Cancel";
-			// 
-			// cmdOK
-			// 
-			this.cmdOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.cmdOK.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-			this.cmdOK.Location = new System.Drawing.Point(272, 104);
-			this.cmdOK.Name = "cmdOK";
-			this.cmdOK.Size = new System.Drawing.Size(96, 24);
-			this.cmdOK.TabIndex = 3;
-			this.cmdOK.Text = "OK";
-			// 
-			// ConditionDialog
-			// 
-			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-			this.ClientSize = new System.Drawing.Size(488, 135);
-			this.Controls.Add(this.cmdOK);
-			this.Controls.Add(this.cmdCancel);
-			this.Controls.Add(this.comboBox1);
-			this.Controls.Add(this.lblPrompt);
-			this.Controls.Add(this.txtC2);
-			this.Controls.Add(this.txtC1);
-			this.Controls.Add(this.label3);
-			this.Controls.Add(this.label2);
-			this.Controls.Add(this.label1);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "ConditionDialog";
-			this.Text = "ConditionDialog";
-			this.Load += new System.EventHandler(this.ConditionDialog_Load);
-			this.ResumeLayout(false);
-
-		}
-		#endregion
-
-		private void ConditionDialog_Load(object sender, System.EventArgs e) {
-		
-		}
-		public static ConditionDialogResult Show(string prompt, string title, int xpos, int ypos) { 
-			using (ConditionDialog form = new ConditionDialog()) {
-				form.Text = title;
-				form.lblPrompt.Text = prompt;
-
-				if (xpos >= 0 && ypos >= 0) { 
-					form.StartPosition = FormStartPosition.Manual; 
-					form.Left = xpos; 
-					form.Top = ypos; 
-				} 
-
-				DialogResult result = form.ShowDialog(); 
-
-				ConditionDialogResult retval = new ConditionDialogResult(); 
-				if (result == DialogResult.OK) { 
-					retval.ConditionOne = form.txtC1.Text;
-					retval.ConditionTwo = form.txtC2.Text;
-					retval.ConditionComp = form.comboBox1.Text;
-					retval.OK = true; 
-				} 
-				return retval; 
-			} 
-		}
-
-		private void txtC_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) {
-			if ((e.KeyChar == (char)10) || (e.KeyChar == (char)13)) {
-				e.Handled = true;
-				cmdOK.PerformClick();
-			}
-		}
-
-		private void comboBox1_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) {
-			e.Handled = true; // We don't want anyone typing here anyway!
-			if (e.KeyChar == (char)Keys.Enter)
-				cmdOK.PerformClick();
-		}
-
-		public static ConditionDialogResult Show(string prompt, string title) { 
-			return Show(prompt, title, -1, -1); 
-		}
-	}
-
-	public class ConditionDialogResult {
-		public string ConditionOne;
-		public string ConditionTwo;
-		public string ConditionComp;
-		public bool OK;
-	}
-}

SSATool/ConditionDialog.resx

@@ -1,211 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="label1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="label1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="label1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="label2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="label2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="label2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="label3.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="label3.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="label3.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="txtC1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="txtC1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="txtC1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="txtC2.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="txtC2.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="txtC2.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="lblPrompt.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="lblPrompt.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="lblPrompt.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="comboBox1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="comboBox1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="comboBox1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="cmdCancel.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="cmdCancel.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="cmdCancel.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="cmdOK.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="cmdOK.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="cmdOK.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>(Default)</value>
-  </data>
-  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>80</value>
-  </data>
-  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.Name">
-    <value>ConditionDialog</value>
-  </data>
-  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-</root>

SSATool/DetectEncoding.cs

@@ -1,57 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SSATool {
-    public static class DetectEncoding {
-        // This detection could use some serious improving.
-        // All detection should return the occurances as an integer.
-        public static int DetectSJIS(byte[] input) {
-            int occ=0;
-            byte lastMatched=0;
-            byte thisbyte;
-            for (int index=0;index!=input.Length;index++) {
-                thisbyte = input[index];
-                if ((lastMatched==130&&thisbyte>=159&&thisbyte<=241) ||
-                    (lastMatched==131&&thisbyte>=64&&thisbyte<=151)) occ++;
-                else if (thisbyte==130||thisbyte==131||thisbyte>=136) lastMatched=thisbyte;
-                else lastMatched=0;
-            }
-            return occ;
-        }
-
-        public static int DetectEUCJP(byte[] input) {
-            int occ=0;
-            byte lastMatched=0;
-            byte thisbyte;
-            for (int index=0;index!=input.Length;index++) {
-                thisbyte = input[index];
-                if (lastMatched>=163&&lastMatched<=250&&thisbyte>=160) occ++;
-                else if (thisbyte>=163&&thisbyte<=250) lastMatched=thisbyte;
-                else lastMatched=0;
-            }
-            return occ;
-
-
-        }
-    }
-}

SSATool/Evaluate.cs

@@ -1,739 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-using System;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Collections;
-using System.Windows.Forms;
-using System.Collections.Generic;
-
-namespace SSATool {
-	public static class Evaluate {
-
-        public static string ScriptParse(string input) {
-            char[] charain = input.ToCharArray(); // It is over twice as fast to parse this as a character array!
-            StringBuilder sb = new StringBuilder();
-
-            int dIndex = 0, eIndex = 0, pIndex = 0, lastIndex = -1, parenLevel = 0, index;
-            bool foundds = false;
-
-            for (index=0;index<input.Length;index+=1) {
-                if (charain[index].Equals('$')) {
-                    if (parenLevel == 0) {
-                        if (index != (lastIndex+1))
-                            sb.Append(input, lastIndex+1, index-(lastIndex+1));
-                        dIndex = index;
-                        foundds = true;
-                    }
-                }
-
-                else if (charain[index].Equals('(')) {
-                    if ((parenLevel == 0)) pIndex = index;
-                    parenLevel+=1;
-                }
-
-                else if (charain[index].Equals(')')) {
-                    parenLevel--;
-
-                    if ((parenLevel == 0) && (foundds) && (pIndex != 0)) {
-                        eIndex = index;
-                        sb.Append(ScriptParse_Helper(input.Substring(dIndex+1, pIndex-(dIndex+1)), ScriptParse(input.Substring(pIndex+1, index-(pIndex+1)))));
-                        lastIndex = eIndex;
-                        foundds = false;
-                    }
-                    else if (parenLevel == 0) {
-                        sb.Append(input.Substring(lastIndex+1, pIndex-lastIndex) + ScriptParse(input.Substring(pIndex+1, index-(pIndex+1))) + ")");
-                        lastIndex = eIndex = index;
-                    }
-                }
-            }
-
-            if (input.Length > lastIndex) sb.Append(input, lastIndex+1, input.Length-(lastIndex+1));
-
-            return sb.ToString();
-        }
-
-        public static string ScriptParse_Helper(string function, string args) {
-            unsafe {
-                switch (function) {
-                    case "eval":
-                        return Evaluate.Eval(args).ToString();
-                    case "logic":
-                        return Evaluate.Eval(args).ToString();
-                    case "iif":
-                        string[] tok = args.Split(",".ToCharArray());
-                        if (tok.Length != 3) return "error";
-                        else if (Evaluate.Eval(tok[0]).Equals(true)) return tok[1];
-                        else return tok[2];
-                    case "len":
-                        return args.Length.ToString(Util.nfi);
-                    case "left":
-                        string[] tokl = args.Split(",".ToCharArray());
-                        if ((tokl.Length != 2) || (!Evaluate.isNum(tokl[1]))) return "error";
-                        else try {
-                                return tokl[0].Substring(0, int.Parse(tokl[1], Util.cfi));
-                            } catch {
-                                return "error";
-                            }
-                    case "mid":
-                        string[] tokm = args.Split(",".ToCharArray());
-                        if ((tokm.Length != 3) || (!Evaluate.isNum(tokm[1])) || (!Evaluate.isNum(tokm[2]))) return "error";
-                        else try {
-                                return tokm[0].Substring(int.Parse(tokm[1]), int.Parse(tokm[2], Util.cfi));
-                            } catch {
-                                return "error";
-                            }
-                    case "right":
-                        string[] tokr = args.Split(",".ToCharArray());
-                        if ((tokr.Length != 2) || (!Evaluate.isNum(tokr[1]))) return "error";
-                        else try {
-                                return tokr[0].Substring(tokr[0].Length - int.Parse(tokr[1], Util.cfi), int.Parse(tokr[1], Util.cfi));
-                            } catch {
-                                return "error";
-                            }
-                    case "str":
-                        string[] str = args.Split(",".ToCharArray());
-                        if ((str.Length != 2) || (!Evaluate.isNum(str[1]))) return "error";
-                        else try {
-                                string retstr = String.Empty;
-                                for (int strindex=0;strindex<int.Parse(str[1], Util.cfi);strindex--)
-                                    retstr = retstr + str[0];
-                                return retstr;
-                            } catch {
-                                return "error";
-                            }
-                    case "randlist":
-                        string[] splitlist = args.Split(",".ToCharArray());
-                        return splitlist[Evaluate.rand.Next(0, splitlist.Length)];
-
-                    case "listindex":
-                        string[] splitlist2 = args.Split(",".ToCharArray());
-                        if ((splitlist2.Length < 2) || (Evaluate.isNum(splitlist2[0]) == false)) return "error";
-                        int index = int.Parse(splitlist2[0], Util.cfi);
-                        if ((index < 1) || (index <= splitlist2.Length)) return "error";
-                        return splitlist2[index];
-
-                    case "listindexwrap":
-                        string[] splitlist3 = args.Split(",".ToCharArray());
-                        if ((splitlist3.Length < 2) || (Evaluate.isNum(splitlist3[0]) == false)) return "error";
-                        int index2 = int.Parse(splitlist3[0], Util.cfi);
-                        if (index2 < 1) return "error";
-                        return splitlist3[index2%splitlist3.Length];
-
-                    case "listindexlast":
-                        string[] splitlist4 = args.Split(",".ToCharArray());
-                        if ((splitlist4.Length < 2) || (Evaluate.isNum(splitlist4[0]) == false)) return "error";
-                        int index3 = int.Parse(splitlist4[0], Util.cfi);
-                        if (index3 < 1) return "error";
-                        else if (index3 >= splitlist4.Length) return splitlist4[splitlist4.Length-1];
-                        else return splitlist4[index3];
-
-                    default: // Unrecognized function... Let's treat it as a string.
-                        return "$" + function + "(" + args + ")";
-                }
-            }
-        }
-
-		public static readonly Random rand = new Random();
-        private static SortedList<string, char> ops;
-        private static SortedList<string, object> constants;
-
-        private static void evaluate_stack_tops_function(Stack numStack, Stack<string> funcStack) {
-            short numParams = (short)numStack.Pop();
-            string func = funcStack.Pop();
-			switch (func.ToLowerInvariant()) {
-				case "rand" :
-					if (numParams > 2) throw new ArgumentException("Eval.rand");
-					switch (numParams) {
-						case 0 :
-							numStack.Push(rand.Next());
-							break;
-						case 1 :
-							int randOneR = Convert.ToInt32(numStack.Pop());
-							numStack.Push(rand.Next(randOneR));
-							break;
-						case 2 :
-							int randOne, randTwo;
-                            randTwo = Convert.ToInt32(numStack.Pop(), Util.nfi);
-                            randOne = Convert.ToInt32(numStack.Pop(), Util.nfi);
-							numStack.Push(rand.Next(randOne,randTwo));
-							break;
-					}
-					break;
-				case "randf" :
-					if (numParams > 2) throw new ArgumentException("Eval.randf");
-
-					switch (numParams) {
-						case 0 :
-							numStack.Push(rand.NextDouble());
-							break;
-						case 1 :
-							double randOneRF = (double)numStack.Pop();
-							numStack.Push(rand.NextDouble()*randOneRF);
-							break;
-						case 2 :
-							double randOneF, randTwoF;
-							randTwoF = (double)numStack.Pop();
-							randOneF = (double)numStack.Pop();
-							numStack.Push(randOneF + rand.NextDouble()*(randTwoF-randOneF));
-							break;
-					}
-					break;
-                case "randlist" :
-                    int listindex = rand.Next(0, numParams - 1);
-                    string randlist = string.Empty;
-                    for (int i = 0; i != numParams; i += 1) {
-                        if (i == listindex) randlist = (string)numStack.Pop();
-                        else numStack.Pop();
-                    }
-                    numStack.Push(randlist);
-                    break;
-				case "round" :
-					if (numParams != 2) throw new ArgumentException("Eval.round");
-					double roundme;
-					int dplaces;
-					dplaces = Convert.ToInt32(numStack.Pop(), Util.nfi);
-					roundme = (double) numStack.Pop();
-					numStack.Push(Math.Round(roundme,dplaces));
-					break;
-				case "bound" :
-					if (numParams != 3) throw new ArgumentException("Eval.bound");
-					double num, min, max;
-					max = (double) numStack.Pop();
-					min = (double) numStack.Pop();
-					num = (double) numStack.Pop();
-					num = ((num < min) ? min : num);
-					num = ((num > max) ? max : num);
-					numStack.Push(num);
-					break;
-				case "max" :
-					if (numParams < 2) throw new ArgumentException("Eval.max");
-					double ansMax;
-					ansMax = Math.Max((double)numStack.Pop(),(double)numStack.Pop());
-					for(int index=2;index!=numParams;index+=1) {
-						ansMax = Math.Max(ansMax,(double)numStack.Pop());
-					}
-					numStack.Push(ansMax);
-					break;
-				case "min" :
-					if (numParams < 2) throw new ArgumentException("Eval.min");
-					double ansMin;
-					ansMin = Math.Min((double)numStack.Pop(),(double)numStack.Pop());
-					for(int index=2;index!=numParams;index+=1) {
-						ansMin = Math.Min(ansMin,(double)numStack.Pop());
-					}
-					numStack.Push(ansMin);
-					break;
-				case "ceil" :
-					if (numParams != 1) throw new ArgumentException("Eval.ceil");
-					double ceil;
-					ceil = (double) numStack.Pop();
-					numStack.Push(Math.Ceiling(ceil));
-					break;
-				case "floor" :
-					if (numParams != 1) throw new ArgumentException("Eval.floor");
-					double floor;
-					floor = (double) numStack.Pop();
-					numStack.Push(Math.Floor(floor));
-					break;
-				case "int" :
-					if (numParams != 1) throw new ArgumentException("Eval.int");
-					double thisnum;
-					thisnum = (double) numStack.Pop();
-					numStack.Push(Convert.ToInt32(thisnum,Util.nfi));
-					break;
-				case "abs" :
-					if (numParams != 1) throw new ArgumentException("Eval.abs");
-					double abs;
-					abs = (double) numStack.Pop();
-					numStack.Push(Math.Abs(abs));
-					break;
-				case "sin" :
-					if (numParams != 1) throw new ArgumentException("Eval.sin");
-					double sin;
-					sin = (double) numStack.Pop();
-					numStack.Push(Math.Sin(sin));
-					break;
-				case "asin" :
-					if (numParams != 1) throw new ArgumentException("Eval.asin");
-					double asin;
-					asin = (double) numStack.Pop();
-					numStack.Push(Math.Asin(asin));
-					break;
-				case "cos" :
-					if (numParams != 1) throw new ArgumentException("Eval.cos");
-					double cos;
-					cos = (double) numStack.Pop();
-					numStack.Push(Math.Cos(cos));
-					break;
-				case "acos" :
-					if (numParams != 1) throw new ArgumentException("Eval.acos");
-					double acos;
-					acos = (double) numStack.Pop();
-					numStack.Push(Math.Acos(acos));
-					break;
-				case "tan" :
-					if (numParams != 1) throw new ArgumentException("Eval.tan");
-					double tan;
-					tan = (double) numStack.Pop();
-					numStack.Push(Math.Tan(tan));
-					break;
-				case "atan" :
-					if (numParams != 1) throw new ArgumentException("Eval.atan");
-					double atan;
-					atan = (double) numStack.Pop();
-					numStack.Push(Math.Atan(atan));
-					break;
-				case "atan2" :
-					if (numParams != 1) throw new ArgumentException("Eval.atan2");
-					double atanx,atany;
-					atanx = (double) numStack.Pop();
-					atany = (double) numStack.Pop();
-					numStack.Push(Math.Atan2(atanx,atany));
-					break;
-				case "log" :
-					if (numParams != 1) throw new ArgumentException("Eval.log");
-					double log;
-					log = (double) numStack.Pop();
-					numStack.Push(Math.Log(log));
-					break;
-				case "sqrt" :
-					if (numParams != 1) throw new ArgumentException("Eval.sqrt");
-					numStack.Push(Math.Sqrt((double)numStack.Pop()));
-					break;
-                case "len" :
-                    if (numParams != 1) throw new ArgumentException("Eval.len");
-                    numStack.Push(((string)numStack.Pop()).Length);
-                    break;
-                case "fact" :
-                case "factorial" :
-                    if (numParams != 1) throw new ArgumentException("Eval.fact");
-                    numStack.Push(Convert.ToDouble(Factorial(Convert.ToInt32(numStack.Pop(), Util.nfi)), Util.nfi));
-                    break;
-                case "gcd" :
-                    if (numParams != 2) throw new ArgumentException("Eval.gcd");
-                    numStack.Push(EuclidGCD(Convert.ToInt32(numStack.Pop(), Util.nfi), Convert.ToInt32(numStack.Pop(), Util.nfi)));
-                    break;
-                case "lcm" :
-                    if (numParams != 2) throw new ArgumentException("Eval.lcm");
-                    int lcm2 = Convert.ToInt32(numStack.Pop(),Util.nfi);
-                    int lcm1 = Convert.ToInt32(numStack.Pop(),Util.nfi);
-                    numStack.Push((lcm1+lcm2)/EuclidGCD(lcm1,lcm2));
-                    break;
-                default :
-                    if (numParams==1 && numStack.Peek() is string) // might be a string w/o quotes, so push it back on as one
-                        numStack.Push(func+"("+numStack.Pop()+")");
-                    break;
-			}
-		}
-        private static void evaluate_stack_tops(Stack numStack, System.Collections.Generic.Stack<char> opStack, System.Collections.Generic.Stack<string> funcStack, bool safetyKill) {
-            if (((numStack.Count != 0) || (funcStack.Count != 0)) && (opStack.Count != 0) && (!opStack.Peek().Equals(","))) {
-                char Operation = opStack.Pop();
-                if (Operation == '@') { // @ is the placeholder for a function. The function itself is in funcStack.
-                    evaluate_stack_tops_function(numStack, funcStack);
-                }
-                else if (Operation == '~') {
-                    object obj = numStack.Pop();
-                    if (obj is bool) numStack.Push(!(bool)obj);
-                    else if (obj is int) numStack.Push(~(int)obj);
-                    else numStack.Push(obj);
-                }
-                else if (Operation == '!') {
-                    int fact = Convert.ToInt32(numStack.Pop(), Util.cfi);
-                    numStack.Push(Convert.ToDouble(Factorial(fact), Util.nfi));
-                }
-                else if (numStack.Count >= 2) {
-                    object objOne, objTwo;
-                    objTwo = numStack.Pop();
-                    objOne = numStack.Pop();
-                    try {
-                        switch (Operation) {
-                            case 'c': // concatenation
-                                numStack.Push((string)objOne + objTwo.ToString());
-                                break;
-                            case '^': // power
-                                numStack.Push(Math.Pow((double)objOne, (double)objTwo));
-                                break;
-                            case '*': // multiplication
-                                numStack.Push((double)objOne * (double)objTwo);
-                                break;
-                            case '/': // division
-                                numStack.Push((double)objOne / (double)objTwo);
-                                break;
-                            case '%': // modulus
-                                //numStack.Push((int)(double)objOne%(int)(double)objTwo);
-                                numStack.Push(Math.IEEERemainder((double)objOne, (double)objTwo));
-                                break;
-                            case '+': // addition
-                                numStack.Push((double)objOne + (double)objTwo);
-                                break;
-                            case '-': // subtraction
-                                numStack.Push((double)objOne - (double)objTwo);
-                                break;
-                            case '>': // greater than
-                                numStack.Push(doCompare(objOne, objTwo, false) >= 0);
-                                break;
-                            case 'G': // greater than or equal to
-                                numStack.Push(doCompare(objOne, objTwo, false) == 1);
-                                break;
-                            case '<': // less than
-                                numStack.Push(doCompare(objOne, objTwo, false) == -1);
-                                break;
-                            case 'L': // less than or equal to
-                                numStack.Push(doCompare(objOne, objTwo, false) <= 0);
-                                break;
-                            case '=': // case-sensitive equal
-                                numStack.Push(doCompare(objOne, objTwo, false) == 0);
-                                break;
-                            case 'i': // case-insensitive equal
-                                numStack.Push(doCompare(objOne, objTwo, true) == 0);
-                                break;
-                            case 'N': // case-sensitive not equal
-                                numStack.Push(doCompare(objOne, objTwo, false) != 0);
-                                break;
-                            case 'I': // case-insensitive not equal
-                                numStack.Push(doCompare(objOne, objTwo, true) != 0);
-                                break;
-                            case '&': // bitwise-and
-                                numStack.Push((int)objOne & (int)objTwo);
-                                break;
-                            case 'X': // bitwise-xor
-                                numStack.Push((int)objOne ^ (int)objTwo);
-                                break;
-                            case '|': // bitwise-or
-                                numStack.Push((int)objOne | (int)objTwo);
-                                break;
-                            case 'A': // boolean and
-                                numStack.Push((bool)objOne && (bool)objTwo);
-                                break;
-                            case 'O': // boolean or
-                                numStack.Push((bool)objOne || (bool)objTwo);
-                                break;
-                            case 'r': // shift right
-                                numStack.Push((int)objOne >> (int)objTwo);
-                                break;
-                            case 'l': // shift left
-                                numStack.Push((int)objOne << (int)objTwo);
-                                break;
-                        }
-                    } catch { throw new FormatException(); }
-                }
-                // Can't make sense of the stacks, so just clear them...
-                else if (safetyKill) {
-                    funcStack.Clear();
-                    opStack.Clear();
-                    numStack.Clear();
-                }
-            }
-
-        }
-        private static int doCompare(object objOne, object objTwo, bool caseIns) {
-            if (objOne is string || objTwo is string)
-                return String.Compare(objOne.ToString(), objTwo.ToString(), caseIns);
-            else if (objOne is bool && objTwo is bool)
-                return ((bool)objOne).CompareTo((bool)objTwo);
-            else if (objOne is double && objTwo is double)
-                return ((double)objOne).CompareTo((double)objTwo);
-            else if (objOne is bool && objTwo is double)
-                return ((bool)objOne).CompareTo((double)objTwo!=0.0);
-            else if (objOne is double && objTwo is bool)
-                return ((double)objOne!=0.0).CompareTo((bool)objTwo);
-            /*
-            else if (objOne is int && objTwo is int)
-                return ((int)objOne).CompareTo((int)objTwo);
-            else if (objOne is bool && objTwo is int)
-                return ((bool)objOne).CompareTo((int)objTwo!=0);
-            else if (objOne is int && objTwo is bool)
-                return ((int)objOne!=0).CompareTo((bool)objTwo);
-            else if (objOne is double && objTwo is int)
-                return ((double)objOne).CompareTo((double)(int)objTwo);
-            else if (objOne is int && objTwo is double)
-                return ((double)(int)objOne).CompareTo((double)objTwo);
-            */
-            throw new ArgumentException("Eval.doCompare");
-        }
-		public static bool isNum(string input) {
-			if (input.Length == 0) return false;
-			char[] charain = input.ToCharArray();
-			for (int index=(input.StartsWith("-")?1:0);index<input.Length;index+=1)
-				if ((!char.IsDigit(charain[index])) && (charain[index] != '.')) return false;
-			return true;
-		}
-        public static int EuclidGCD(int u, int v) {
-            int k = 0;
-            if ((u|v)==0) return 0;
-            while (((u|v)&1)==0) { /* while both u and v are even */
-                u >>= 1;   /* shift u right, dividing it by 2 */
-                v >>= 1;   /* shift v right, dividing it by 2 */
-                k+=1;       /* add a power of 2 to the final result */
-            }
-            /* At this point either u or v (or both) is odd */
-            do {
-                if ((u & 1) == 0)      /* if u is even */
-                    u >>= 1;           /* divide u by 2 */
-                else if ((v & 1) == 0) /* else if v is even */
-                    v >>= 1;           /* divide v by 2 */
-                else if (u >= v)       /* u and v are both odd */
-                    u = (u-v) >> 1;
-                else                   /* u and v both odd, v > u */
-                    v = (v-u) >> 1;
-            } while (u > 0);
-            return v << k;  /* returns v * 2^k */
-        }
-        public static int Factorial(int x) {
-            int result=1;
-            for (int index = x; index != 0; index--) {
-                result *= index;
-            }
-            return result;
-        }
-
-        private static byte opOrder(char tOp) {
-            byte retVal;
-            switch (tOp) {
-                case '!': // factorial
-                    retVal = 20;
-                    break;
-                case '@': // function
-                    retVal=16;
-                    break;
-                case ',': // function argument separator
-                    retVal=15;
-                    break;
-                case 'c': // concatenation
-                    retVal=14;
-                    break;
-                case '~': // inversion
-                    retVal=13;
-                    break;
-                case '^': // power
-                    retVal=12;
-                    break;
-                case '*': // multiplication
-                case '/': // division
-                case '%': // modulus
-                case '\\': // integer division
-                    retVal=11;
-                    break;
-                case '+': // addition
-                case '-': // subtraction
-                    retVal=10;
-                    break;
-                case '>': // greater than
-                case 'G': // greater than or equal to
-                case '<': // less than
-                case 'L': // less than or equal to
-                    retVal=8;
-                    break;
-                case '=': // case-sensitive equal
-                case 'i': // case-insensitive equal
-                case 'N': // case-sensitive not equal
-                case 'I': // case-insensitive not equal
-                    retVal=7;
-                    break;
-                case '&': // bitwise-and
-                    retVal=6;
-                    break;
-                case 'X': // bitwise-xor
-                    retVal=5;
-                    break;
-                case '|': // bitwise-or
-                    retVal=4;
-                    break;
-                case 'A': // boolean and
-                    retVal=3;
-                    break;
-                case 'O': // boolean or
-                    retVal=2;
-                    break;
-                case 'r': // shift right
-                case 'l': // shift left
-                    retVal=9;
-                    break;
-                default: // not an operation
-                    retVal=0;
-                    break;
-            }
-            return retVal;
-        }
-        public static bool isOp(char i, short pos) {
-            if (pos==1) return ("!+-*/\\%^&|=<>~".IndexOf(i) != -1);
-            else if (pos==2) return ("&|^=)".IndexOf(i) != -1);
-            else if (pos==3) return i=='=';
-            return false;
-        }
-        public static void FillOpsList() {
-            ops = new SortedList<string, char>(23);
-            ops.Add(">>", 'r');
-            ops.Add(">=", 'G');
-            ops.Add(">", '>');
-            ops.Add("===", '=');
-            ops.Add("==", '=');
-            ops.Add("=", 'i');
-            ops.Add("<=", 'L');
-            ops.Add("<<", 'l');
-            ops.Add("<", '<');
-            ops.Add("+", '+');
-            ops.Add("||", 'O');
-            ops.Add("|", '|');
-            ops.Add("^^", 'X');
-            ops.Add("^", '^');
-            ops.Add("/", '/');
-            ops.Add("*", '*');
-            ops.Add("&&", 'A');
-            ops.Add("&", '&');
-            ops.Add("%", '%');
-            ops.Add("-", '-');
-            ops.Add("!==", 'I');
-            ops.Add("!=", 'N');
-            ops.Add("!", '!');
-            ops.Add("~", '~');
-
-            constants = new SortedList<string, object>(6);
-            constants.Add("e", Math.E);
-            constants.Add("false",false);
-            constants.Add("g", 1.6180339887498948482045868);
-            constants.Add("pi", Math.PI);
-            constants.Add("true", true);
-            constants.Add("y", 0.5772156649015328606065120);
-        }
-
-        public static object Eval(string input) {
-            char[] charain = input.ToCharArray();
-            Stack<char> opStack = new Stack<char>(16);
-            Stack numStack = new Stack(16);
-            Stack<string> funcStack = new Stack<string>(8);
-
-            string buff;
-            int i = 0, pLevel;
-            char thisOp;
-            short loop, numParams;
-            bool lastwasop = true;
-            bool isnumber, isfloat, infunc, inquotes, unknownString = false;
-
-            while (i < charain.Length) {
-                if (charain[i].Equals('(')) {
-                    pLevel = 1;
-                    buff = string.Empty;
-                    while (pLevel!=0 && ++i<charain.Length) {
-                        if (charain[i].Equals('(')) pLevel+=1;
-                        if (charain[i].Equals(')')) pLevel--;
-                        if (pLevel!=0 || !charain[i].Equals(')')) buff += charain[i];
-                    }
-                    numStack.Push(Eval(buff));
-                    lastwasop = false;
-                }
-                else if ((!lastwasop||charain[i]!='-'||(i!=0&&charain[i-1]=='!')) && isOp(charain[i], 1)) {
-                    buff = charain[i].ToString(Util.cfi);
-                    loop=1;
-                    while (++i<charain.Length && loop++<=3 && isOp(charain[i], loop))
-                        buff += charain[i];
-                    i--;
-                    thisOp = ops[buff];
-                    if (!unknownString && thisOp.Equals('+') && numStack.Count!=0 && numStack.Peek() is string) thisOp='c';
-                    while (opStack.Count!=0 && numStack.Count!=0 && opOrder(thisOp)<=opOrder(opStack.Peek()))
-                        evaluate_stack_tops(numStack, opStack, funcStack, false);
-                    opStack.Push(thisOp);
-                    lastwasop=true;
-                    unknownString = false;
-                }
-
-                else if (charain[i] != ' ') {
-                    buff = string.Empty;
-                    if (charain[i].Equals('"')) {
-                        while (i++!=charain.Length && charain[i]!='"')
-                            buff += charain[i];
-                        numStack.Push(buff);
-                    }
-                    else {
-                        isnumber = true;
-                        isfloat = infunc = inquotes = false;
-                        pLevel = numParams = 0;
-
-                        if (charain[i].Equals('-')) {
-                            buff = "-";
-                            i+=1;
-                        }
-                        while (i!=charain.Length && (!isOp(charain[i], 1) || infunc)) {
-                            if (charain[i].Equals('(')) {
-                                if (pLevel==0) {
-                                    funcStack.Push(buff);
-                                    buff = string.Empty;
-                                    opStack.Push('@');
-                                    infunc = true;
-                                }
-                                else buff += '(';
-                                pLevel+=1;
-                            }
-                            else if (infunc && charain[i]==')') {
-                                pLevel--;
-                                if (pLevel==0) {
-                                    numStack.Push(Eval(buff));
-                                    numParams+=1;
-                                }
-                                else buff += ')';
-                            }
-                            else if (infunc && pLevel==1 && charain[i]==',') {
-                                numStack.Push(Eval(buff));
-                                numParams+=1;
-                                buff = string.Empty;
-                            }
-                            else {
-                                if (inquotes || charain[i]!=' ') {
-                                    if (charain[i] == '"') inquotes = !inquotes;
-                                    if (!(char.IsDigit(charain[i])||charain[i]=='.')) isnumber = false;
-                                    if (charain[i] == '.') isfloat=true;
-                                    buff += charain[i];
-                                }
-                            }
-                            i+=1;
-                        }
-
-                        if (!infunc) {
-                            if (isnumber) {
-                                if (isfloat = true) numStack.Push(double.Parse(buff, Util.cfi)); // effectively disable ints (for now, at least)
-                                else numStack.Push(int.Parse(buff, Util.cfi));
-                            }
-
-                            else if (constants.ContainsKey(buff.ToLowerInvariant())) numStack.Push(constants[buff.ToLowerInvariant()]);
-
-                            else {
-                                numStack.Push(buff);
-                                //unknownString = true;
-                            }
-                        }
-                        else numStack.Push(numParams);
-                        i--;
-                    }
-
-                    lastwasop = false;
-                }
-
-                i+=1;
-            }
-
-            while (opStack.Count!=0 && numStack.Count!=0)
-                evaluate_stack_tops(numStack, opStack, funcStack, false);
-
-            if (numStack.Count != 0) return numStack.Pop();
-            else return false;
-        }
-	}
-}

SSATool/Extras/Layer-Per-Syllable.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0"?>
-<PSSA>
-  <Files />
-  <Layer Enabled="True" PerSyllable="True" RemoveK="False" AddAll="False" AddOnce="False" DontAddText="False" AddText="True" AddK="True" AddASSA="True" AddClosingBracket="True" Repetitions="1">
-    <Effect InstanceName="Hide previous" Name="Raw code" Enabled="True">
-      <Option Name="Code">\1a&amp;HFF&amp;\2a&amp;HFF&amp;\3a&amp;HFF&amp;\4a&amp;HFF&amp;</Option>
-      <Condition ConditionOne="%karanum%" ConditionTwo="0" ConditionOperation="==" Enabled="True" />
-      <Condition ConditionOne="%layernumlps%" ConditionTwo="0" ConditionOperation="!=" Enabled="True" />
-    </Effect>
-    <Effect InstanceName="Main Code" Name="Raw code" Enabled="True">
-      <Option Name="Code">\r\t(%karastart%,%karamid%,\fscx50)\t(%karamid%,%karaend%,\fscx100)</Option>
-      <Condition ConditionOne="%karanum%" ConditionTwo="%layernumlps%" ConditionOperation="==" Enabled="True" />
-    </Effect>
-    <Effect InstanceName="Hide next" Name="Raw code" Enabled="True">
-      <Option Name="Code">\r\1a&amp;HFF&amp;\2a&amp;HFF&amp;\3a&amp;HFF&amp;\4a&amp;HFF&amp;</Option>
-      <Condition ConditionOne="%karanum%" ConditionTwo="$eval(%layernumlps%+1)" ConditionOperation="==" Enabled="True" />
-    </Effect>
-  </Layer>
-</PSSA>

SSATool/Extras/SSATool4.3.html

@@ -1,661 +0,0 @@
-<html>
-  <head>
-    <title>SSATool Readme</title>
-    <style type="text/css"> 
-      <!--
-      .header { background: #A0D0FF; border: thin black; margin-top: 0px; margin-bottom: 12px; color: #000000; padding: 6px; text-align: center; margin-left: 0px; margin-right: 0px; }
-      .box { background: #C0C0C0; border: thin black; color: #000000; width: 75%; border-color: #000000; text-align: left; padding-top: 4px; padding-bottom: 16px; padding-left: 12px; padding-right: 12px;  }
-      .exp { background: #DADADA; border-style: solid; border: thick black; margin-left: 32px; margin-right: 32px; margin-bottom: 24px; line-height: 130%; }
-      .subinfo { background: #D4D4D4; border: thin black; color: #000000; border-color: #000000; text-align: left; margin-left: 48px; margin-right: 32px;  }
-      #optlist li { list-style-type: square; line-height: 125%; }
-      #sublist li { list-style-type: circle; line-height: 150%; }
-      p { text-indent: 32px; }
-      h3 { text-indent: 10px; }
-      h4 { text-indent: 10px; }
-      -->
-    </style>
-  </head>
-  <body>
-    <center>
-      <h1>SSATool 4.3</h1><br />
-      <h2>Purpose</h2>To automate the creation and manipulation of Advanced Substation Alpha files.<br /><br />
-
-      <h2>Functions</h2>
-
-      <div class="box">
-        <div class="header">Shifting</div>
-        <div class="exp">
-          SSATool can shift a file by entering a time (hour:minutes:seconds.subseconds), by a given number of frames, or by specifying an 'old' time and the new time that it should be shifted to. Shifting by time or frames require a given direction, while time difference already has a direction, given the 2 times.
-        </div>
-        
-        <h4>Shifting options</h4>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Shift Start/End times: You may choose to only shift the start or end times of each line.</li>
-            <li>Replace negative times: If you're shifting backwards and some times end up negative, this option will replace them with a 0 time. After all, who wants to see subtitles before you even watch the video?</li>
-          <ul>
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Commands</div>
-        <div class="exp">
-          These are parameterless functions that don't take much explaining.
-        </div>
-        <ul id="sublist">
-          <li>Strip SSA: Strips all SSA code except for \k,\K,\kf,\ko. Useful for when you want to undo typesetting to a file but keep the timing.</li>
-          <li>Removes duplicate dialogue lines. If you've got a file that used layer per syllable type karaoke and you strip SSA, you'll have several duplicate lines.</li>
-          <li>Change last \k based on line length: Goes through dialog lines, and adjusts the length of the last syllable to match the length of the line. It is possible for this value to turn out negative if the timing is way off, so use it with care.</li>
-        </ul>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Length-based \k or \K</div>
-        <div class="exp">
-          This changes each syllable to \k or \K as determined by a threshold.
-        </div>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Threshold: Anything above or equal to this gets changed to \K and anything under it uses \k.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Scale Resolution</div>
-        <div class="exp">
-          SSATool can change a resolution of a SSA file for you. If you have two different files that you want to merge, but they have different resolutions, then you must use a function like this.
-        </div>
-        
-        <h4>Scaling options</h4>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Scale factor: Pretty straightforwardly, the amount that you want to scale by.</li>
-            <li>Scale PlayRes: Scale PlayResX/PlayResY in the header, if they're already there. They must be checked for this to do anything.</li>
-          </ul>
-        </div>
-
-        <h4>Scaled Parameters</h4>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Style lines: Font size, outline, shadow, margins</li>
-            <li>Dialogue lines: Margin overrides</li>
-            <li>\bord: using Y scale</li>
-            <li>\clip: using X and Y scales</li>
-            <li>\fs: using Y scale</li>
-            <li>\fsp: using X scale</li>
-            <li>\move: using X and Y scales</li>
-            <li>\org: using X and Y scales</li>
-            <li>\p: Coordinates will be scaled with X and Y scales. If a \p1 is in a \clip, it DOES continue past the clip unless you \p0.</li>
-            <li>\pbo: using Y scale</li>
-            <li>\pos: using X and Y scales</li>
-            <li>\shad: using Y scale</li>
-          </ul>
-        </div>
-
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Lead-in/out</div>
-        <div class="exp">
-          This adds a lead-in/out to lines. It can add a \k to the beginning of the line to compensate. It does not current affect other tags like \t, \move, etc.
-        </div>
-        
-        <h4>Options</h4>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>In Time: If checked, this is the amount of lead-in time. If it's a number, it's interpreted as seconds. Else it's interpreted as a timecode.</li>
-            <li>Out Time: If checked, this is the amount of lead-out time. If it's a number, it's interpreted as seconds. Else it's interpreted as a timecode.</li>
-            <li>Affect only karaoke lines: Affect only lines with \k in them if checked.</li>
-            <li>Add empty \k for karaoke: Add a \k to compensate for lead-in time to lines that have \k in them already.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Gradient Maker</div>
-        <div class="exp">
-          This will create a gradient by making several lines using clip. You may type text in, or you may select a line from the loaded file and click "Copy Selected List Item to Input." If the line has dialogue: ... in it (IE the information for the line and not just the line itself), then select that and click the "Move Selected" button next to the "Before Grad." textbox. This will place that text before each line without actually putting it in the gradient. Fill in the boxes and click Create.
-        </div>
-        <h3>Options:</h3>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Before Gradient: This is text that doesn't get gradiented. Put all the Dialogue: ... stuff here. This is easily accomplished by highlighting the appropriate text in the "Gradient Text" field and clicking the "Move Selected" button.</li>
-            <li>Clip Lines: How many lines the gradient will span. More lines is more precise.</li>
-            <li>Start/End Pos: The start and end positions in coordinate form x,y. Only include the part that will increase, IE if you want to go across a 640x480 screen horizontally, only x should be increasing here, and the height of 480 is an offset (it's always there), so leave height 0 here.</li>
-            <li>Offset: Static values that are added to the second X and Y positions. See the above example, where the offset here would be 0,480.</li>
-            <li>Start/End Value: The start and end colors in (A)BGR form. They can be in decimal form or in hex form with leading H. Do not include ampersands. Alpha is optional (as denoted by the parenthesis).</li>
-            <li>Linear/Log/Exp grad: These control how the colors are scaled: linearly, logarithmically, or exponentially (base^ratio). If you use one of the latter two, set the base to something greater than 1.</li>
-            <li>Turnaround: This will allow you to go from the start value to the end value somewhere in the middle of the gradient, and then back to start RGB. It's a percentage. At 50%, it will turn around at the halfway point.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-
-
-
-      <div class="box">
-        <div class="header">Blur</div>
-        <div class="exp">
-        This allows you to use layered alpha blurring. Make sure your input does not have a \bord or \pos coordinate in it, unless you're doing a glow, which does allow \pos. Also, if your line has dialogue: ... in it, make sure to select that part of the line and click the "Move Selected" button next to the "Before Blur" textbox.
-        </div>
-        <h3>Options:</h3>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Before Blur: This is text that doesn't get blurred. Put all the Dialogue: ... stuff here. This is easily accomplished by highlighting the appropriate text in the "Blur Text" field and clicking the "Move Selected" button.</li>
-            <li>Type: This allows you to select "true blur" or glow. True blur will move the line around with different alpha values given a position of the text. Glow will just leave the text in the same spot while creating subsequently larger borders with more alpha.</li>
-            <li>Lines: Only used with glow option. Creates the given amount of lines where each line has a larger border than the last.</li>
-            <li>Start/End alpha: Start and end alpha values. Decimal or hex with leading H. Omit the ampersands.</li>
-            <li>Blur Radius: How many pixels the blur should be.</li>
-            <li>Position: Only needed for true blur: The position on the screen where the text is in x,y form. Pixels will be added/subtracted to this value.</li>
-            <li>Linear/Log/Exp blur: These control how the alpha values are scaled: linearly, logarithmically, or exponentially (base^ratio). If you use one of the latter two, set the base to something greater than 1.</li>
-            <li>Affect: Will blur the selected elements (\1c, \2c, \3c, and/or \4c). Not applicable to glow.</li>
-            <li>On subsequent lines...: If not blurred, the elements selected here will have &HFF& alpha values for all lines except the main line.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-
-      <div class="box">
-        <div class="header">Notebox Maker</div>
-        <div class="exp">
-        This allows you to easily create cool looking noteboxes from templates contained in the included XML file. Noteboxes can be one or two lines long and each template must specifically give code for each length. See the included file for an example. Templates may be of different resolutions. If a script is loaded which contains PlayResX and/or PlayResY, the generated notebox will be automatically resampled to the script size. Otherwise, the generated notebox will be at the default resolution of the template.
-        </div>
-        <h3>Options:</h3>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Copy styles to file: The styles for the notebox will not be inserted into your file just by generation of a notebox. You can use this button to insert them automatically in that case.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Error Checker</div>
-        <div class="exp">
-          This will check a file for some common errors. It checks dialogue and style lines.</li>
-        </div>
-        <h4>Checks for:</h4>
-        <div class="subinfo">
-          <ul id="sublist">
-            <li>Unopened/unclosed parenthesis</li>
-            <li>Unopened/unclosed brackets</li>
-            <li>No trailing ampersand in color/alpha values</li>
-            <li>Lowercase H for hex</li>
-            <li>Malformed transformations (\t(time,time)\effect)</li>
-            <li>Decimals without leading integers (.01 vs. 0.01)</li>
-          </ul>
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Font Test</div>
-        <div class="exp">
-          This will search a file for all fonts used and check if they are installed on your system. If fonts are not installed, you may search a directory for the fonts. It does not make sure the files it finds have the needed styles. It only matches by font name.
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Manual Transform</div>
-        <div class="exp">
-          How many times have you wished you could use \t on something that doesn't allow it? How many times have you wanted a nonlinear acceleration parameter for \move? Here's a function that will automatically interpolate these things like \t, but it's much more powerful.  
-        </div>
-
-        <h3>Zones/the Times Listbox</h3>
-        <div class="subinfo">
-          <p>Manual Transform is based on zones, which are made up of a start and end time. There must be at least one zone. Each additional zone uses the end time of the previous zone as its start time. So if you entered the times of 0:00:00.00, 0:01:00.00 and 0:02:00.00, there are two zones: one from 0:00:00.00-0:01:00.00 and one from 0:01.00.00-0:02:00.00.</p>
-          <p>Based on these different zones, you can have variables which can scale differently at different times. Numbers can scale linearly during one zone and exponentially during another if you like. Text can change between zones.</p>
-          <p>If this flexibility is not required, just entering a start time and an end time, making one zone only, will keep things simple.</p>
-        </div>
-
-        <h3>Variables</h3>
-        <div class="subinfo">
-          <p>This is the data that gets scaled. To add a variable, click the new button and type a name into the popup. You can then edit the values for each time by clicking on the appropriate field in the variable list. You may use either a string or a number. Numbers will be scaled automatically, whereas strings will switch over when a new zone is reached.</p>
-          <p>If you enter a string and a number under the same variable, then it will treat both as a string. If you have a string and a number and a number (2 zones), it will print the string until it hits the second zone, where it will then scale between the two numbers. That is to say that if, in the current zone, the start and end variable values are both numbers, the number will be scaled; If one or both are non-numbers, both will be treated as strings.</p>
-          <p>Acceleration: You can use linear, logarithmic or exponential acceleration for each variable and zone. Exponential acceleration has 2 forms: ratio^base, which is specified by just entering a number > 1, or base^ratio by specifying exp<i>base</i> (Example: exp2). Specify a log transform by typing log<i>base</i>. If none of these are specified or are incorrectly entered, a linear transform will be used. ASSA itself uses ratio^base for acceleration, so the default behavior (entering a number) works the same as entering that number into \t.</p>
-        </div>
-
-        <h3>Other options</h3>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Code is how SSATool puts the variables together to form the text that gets output. To add the line times, use <b>%starttime%</b> and <b>%endtime%</b> in the code. To use a variable in the code, surround the variable name with percentage signs. You may use scripting functions here. If you're scaling an integer, you're going to want to round it with scripting because it will be printed as a decimal otherwise.</li>
-            <li>Times: Enter the times for this to span. You must enter at least two times. You may enter more than one time to create different zones where variables can be scaled differently. Times should be the first thing you add.</li>
-            <li>Frame Rate: The framerate of the video. All entered and output times will be snapped to the nearest frame.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-      
-      <div class="box">
-        <div class="header">Kanji timing</div>
-        <div class="exp">
-          This function will allow you to time Kanji (or pretty much any other East Asian character set) from Roman letters. You may combine \k times, but this function can't work with \t as it can't be sure how to handle the times. It could also technically be used in reverse, but it's not capable of splitting syllables from the source style.<br /><br />
-          You must have your two character sets entered in different styles. The kanji may already be timed, but those times will be overridden if so. Empty syllables will be copied alone, or will be combined with the surrounding syllables if those are to be combined.
-        </div>
-        <h3>Options</h3>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Styles: Select your source and destination styles here. The source style will be used for times and all ASSA code. Destination lines will be overwritten in the list. Note: Any ASSA code appearing before the \k will be directly copied, and ASSA code after the \k is currently not copied at all.</li>
-            <li>Start: Brings the first lines of each style into the corresponding text fields.</li>
-            <li>Link: When you have selected corresponding syllables, this will pair them up and you will see them appear in the group list.</li>
-            <li>Unlink last: If you've made a mistake, this will unlink the last pair. You may use it as many times as needed.</li>
-            <li>Skip source line: Skip the current source line.</li>
-            <li>Skip destination line: Skip the current destination line. It won't be modified at all.</li>
-            <li>Go back a line: Goes back to the last line for both the source and destination. It does not undo any changes made, but you may redo it.</li>
-            <li>Accept line: When all of the grouping for a line is finished, this will modify the line in the list and automatically load the next lines for source and destination.</li> 
-          </ul>
-        </div>
-        <h3>Keyboard shortcuts</h3>
-        <div class="subinfo">
-          <div class="subinfo">
-            Don't use the mouse to highlight grouping. If you incorrectly try to split syllables from the source, the function won't work right, so please use the following keyboard shortcuts while the destination textbox has focus. They're much faster.
-          </div>
-          <ul id="optlist">
-            <li>Right/left arrows: Select more or less text from the destination, respectively.</li>
-            <li>Up/down arrows: Select more or less text from the source, respectively. The source text is locked so it can not be split, but you may combine syllables from it.</li>
-            <li>Enter: Link the selected text, or if all text is linked, accept the line and move on to the next.</li>
-            <li>Backspace: Undo the previous linked text.</li>
-          </ul>
-        </div>
-      </div><br /><br />
-      
-
-      <div class="box">
-        <div class="header">Karaoke effects</div>
-        <div class="exp">
-          The karaoke effect generator is a complex karaoke effects automator. In simple terms, it could be called a "\k to \t converter," though it is not limited to transformations. You have several variables (listed below) and scripting functions (listed further below in another section) available to use in template effects. You also have "raw code," which will just dump anything you put in there into the SSA. You can use variables in any of the effect fields. You may use raw code to accomplish anything that the other effects can do. Other effect templates are there just to make it easier for you to make presets. There's an effects editor to add your own presets available under the Effects menu.
-        </div>
-        
-
-
-        <h3>Layers</h3>
-        <div class="subinfo">
-          <p>Layers are the basis of the effects system. They are, in essence, one of the base elements of ASSA itself. The simplest implementation of a layer is a single dialogue line. That's it. The subtitler program reads each line and decides where each line goes, and in what order they go.</p>
-          <p>However, in SSATool, layers are different than how SSA itself looks at them. A layer is how SSATool processes a line in order to add effects. Depending on the complexity of an effect, it may take from one to several lines to accomplish. That is, you might have two or three or even dozens of dialogue lines composing what we see as one line! So each layer in SSATool will add another dialogue line with the same text but potentially different overrides. But to make things even more confusing, there's an exception: Layer-Per-Syllable. What happens if you want to do something to a syllable in a karaoke as its "turn" comes up, but the command to do what you want to do is a command that affects the whole dialogue line, even if you use \r? You often have to make a dialogue line corresponding to each syllable.</p>
-          <p>This is what layer-per-syllable does. It will dynamically create a new dialogue line (layer) for each syllable. You're typically going to want to see each line only for the syllable it corresponds to, because that's the basic reason why layer-per-syllable exists. To accomplish that, you're going to want to have a couple of effects in addition to your transformation code. These extra effects will be to make the line invisible except at the corresponding syllable. You'll use conditions (explained below) to apply alpha codes before and after this syllable. A sample layer-per-syllable project file should be bundled to show you how to go about it. Don't use it as a basis every time you want to do layer-per-syllable, because it will ensure that you don't understand how the process works. To make karaoke, you must first understand how ASSA renders karaoke.</p>    
-          <p>To enable layer-per-syllable mode, simply add a layer and make sure the Layer-per-Syllable checkbox is clicked. You may combine layer-per-syllable layers together or with fixed layers if you like.</p>
-        </div>
-
-        <h3>Conditions</h3>
-        <div class="subinfo">
-          <p>There are two types of conditions in the karaoke effects generator: effect conditions and layer conditions. They both do the same thing, but they work on a different scope. For both, you enter two things to compare. These things may be numbers or strings, and you may use variables and scripting functions (listed below).</p>
-          <ul id="optlist">
-            <br /><li>With effect conditions, each condition must be true for that effect to be applied, or it will just be skipped for that syllable. There is no condition checking for effects on a per-line scope, meaning the conditions are only checked per syllable, not per line. This is the more flexible option of the two.</li>
-            <br /><li>With layer conditions, each of these must work out for all of the effects in that layer to be applied. By default, if this is not met, there will be no dialogue line created at all. However, when you create your layer conditions, you may option to create the dialogue line WITHOUT effects if the conditions are not met. For fixed layers, the option is called, "Add line unchanged if layer conditions not met." If you're using layer-per-syllable, just that option will add the line several times (once per syllable) if the layer conditions aren't met, so you'll also want to enable the option, "Only add it once."</li>
-          </ul>
-        </div>
-
-        <h3>Layout</h3>
-        <div class="subinfo">
-          <p>The layout of the karaoke effects section can be a little confusing at first. At the left, there's a treeview. This holds information about all layers and effects. You can add a layer via the button under it. Once you have added and selected a layer, you may add effects to it through that button. You may drag items around the treeview to reorder them or to move effects to a different layer. You may duplicate or remove layers or effects through the corresponding buttons.</p>
-          <p>When you select a layer in the treeview, the layer options page automatically shows up. Here, you can add layer conditions or change the options for the layer. When you click on an effect, you get a tabbed setup where you can view the options for that effect or the conditions. To change an option for an effect, just click on the corresponding field.</p>
-        </div>
-        
-        <h3>Options</h3>
-        <div class="subinfo">
-          <ul id="optlist">
-            <li>Don't add the syllable text: This will leave out the actual text for the syllable. You may add it yourself in your effects using the %text% variable. This allows you to split a \k if you like.</li>
-            <li>Remove \k: This will remove \k, \K, \ko and \kf after applying effects. Keep a backup file before you use this option in case timing needs to be changed later.</li>
-            <li>Add line unchanged if conditions not met: If layer conditions aren't met, add the dialogue line with no effects. You could get missing dialogue lines without this option.</li>
-            <li>Only add it once: An extension of the above for layer-per-syllable mode to prevent dialogue lines from being added multiple times when layer conditions are not met.</li>
-            <li>Layer-per-Syllable: Enable Layer-per-Syllable mode for this layer. See the explanation above.</li>
-            <li>Repetitions: This only applies to non-LPS layers. The layer will be repeated this amount of times. It only applies to karaoke lines, not regular dialogue lines.</li>
-          </ul>
-        </div>
-
-
-        <h3>Karaoke variables</h3>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td width="150">%karastart%</td>
-              <td>Start time of current kara block in milliseconds.</td>
-            </tr><tr>
-              <td>%karastart[n]%</td>
-              <td>Start time of kara block <i>n</i> in milliseconds. Yes, the square brackets should be there. You may use other variables in the brackets (except for another variable with brackets). Example: %karastart[%totkaranum%]%</td>
-            </tr><tr>
-              <td>%karaend%</td>
-              <td>End time of current kara block in milliseconds.</td>
-            </tr><tr>
-              <td>%karaend[n]%</td>
-              <td>End time of kara block <i>n</i> in milliseconds. Yes, the square brackets should be there. You may use other variables in the brackets (except for another variable with brackets).</td>
-            </tr><tr>
-              <td>%karamid%</td>
-              <td>Mid point of current kara block in milliseconds. ((start+end)/2)</td>
-            </tr><tr>
-              <td>%karalen%</td>
-              <td>Length of current kara block in milliseconds.</td>
-            </tr><tr>
-              <td>%karalen[n]%</td>
-              <td>Length of kara block n in milliseconds. Yes, the square brackets should be there. You may use other variables in the brackets (except for another variable with brackets.</td>
-            </tr><tr>
-              <td>%karanum%</td>
-              <td>The number of the kara block being evaluated, indexed from 0.</td>
-            </tr><tr>
-              <td>%karanumtot%</td>
-              <td>The total number of kara blocks in this line. If you compare with %karanum%, make sure to add 1 to %karanum% since it starts at 0.</td>
-            </tr><tr>
-              <td>%linestart%</td>
-              <td>Start time of current line in seconds in seconds</td>
-            </tr><tr>
-              <td>%lineend%</td>
-              <td>End time of current line in seconds</td>
-            </tr><tr>
-              <td>%linelen%</td>
-              <td>Length of current line in seconds</td>
-            </tr><tr>
-              <td>%layernum%</td>
-              <td>The current layer number, indexed from 0.</td>
-            </tr><tr>
-              <td>%layernumtot%</td>
-              <td>The total number of layers</td>
-            </tr><tr>
-              <td>%layernumlps%</td>
-              <td>The current layer number in layer-per-syllable mode. In fixed layer mode, this is also also used when repetitions of the layer is set > 1. Indexed from 0.</td>
-            </tr><tr>
-              <td>%layernumlpstot%</td>
-              <td>The total number of layers in layer-per-syllable mode. In fixed layer mode, it is the total number of repetitions of the current layer.</td>
-            </tr><tr>
-              <td>%name%</td>
-              <td>The name (SSA) or actor (ASS) of the line.</td>
-            </tr><tr>
-              <td>%style%</td>
-              <td>The name of the current style</td>
-            </tr><tr>
-              <td>%text%</td>
-              <td>The text inside of the current syllable. Recommended for use with "Don't add the syllable text itself" in the Layer Conditions+Options tab, but can be used by itself.</td>
-            </tr>
-          </table>
-        </div>
-      </div><br /><br />
-
-
-      <div class="box">
-        <div class="header">Scripting</div>
-        <h4>Functions</h4>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td width="200">$eval(expression)</td>
-              <td>Does math/logic. It supports the sub-functions listed in the table below. Strings used in this must be surrounded by double quotes. Not using quotes should work in most situations, but this is mostly for reasons of backwards compatibility. If used for logic, it will return True or False (as booleans, so no quotes around them).</td>
-            </tr><tr>
-              <td>$iif(expression,t, f)</td>
-              <td>Inline if (a conditional statement). The expression may be a boolean logic expression, or it may be something that evaluates to true or false. If the expression is True, it returns the second argument. If it's false, it returns the third. If it (or you) messes up, it returns "error".</td>
-            </tr><tr>
-              <td>$len(text)</td>
-              <td>Returns the length of <i>text</i>.</td>
-            </tr><tr>
-              <td>$left(text,length)</td>
-              <td>Returns the first <i>length</i> characters of <i>text</i>.</td>
-            </tr><tr>
-              <td>$listindex(n,item,item,...)</td>
-              <td>Returns the n<super>th</super> supplied item indexed from 1. Returns "error" if the supplied value is incorrect.</td>
-            </tr><tr>
-              <td>$listindexlast(item,item,item,...)</td>
-              <td>Returns the n<super>th</super> supplied item indexed from 1. Returns "error" if the supplied value is less than one. Returns the last value if the index is too big.</td>
-            </tr><tr>
-              <td>$listindexwrap(item,item,item,...)</td>
-              <td>Returns the n<super>th</super> supplied item indexed from 1. Returns "error" if the supplied value is less than one. Wraps around to the beginning of the list if the index is too big.</td>
-            </tr><tr>
-              <td>$mid(text,start,length)</td>
-              <td>Returns <i>length</i> characters of <i>text</i>, starting at <i>start</i>. The first character is indexed as 0.</td>
-            </tr><tr>
-              <td>$randlist(item,item,item,...)</td>
-              <td>Returns a random item from the given inputs.</td>
-            </tr><tr>
-              <td>$right(text,length)</td>
-              <td>Returns the last <i>length</i> characters of <i>text</i>.</td>
-            </tr><tr>
-              <td>$str(text,n)</td>
-              <td>Repeats <i>text</i> <i>n</i> times.</td>
-            </tr>
-          </table>
-        </div>
-        <br /><br />
-
-        <h4>Eval Sub-Functions</h4>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td width="200">abs</td>
-              <td>Return the absolute value of a number.</td>
-            </tr><tr>
-              <td>acos</td>
-              <td>Returns the arc-cosine of a number.</td>
-            </tr><tr>
-              <td>asin</td>
-              <td>Returns the arc-sin of a number.</td>
-            </tr><tr>
-              <td>atan</td>
-              <td>Returns the arc-tangent of a number given an angle.</td>
-            </tr><tr>
-              <td>atan2</td>
-              <td>Returns the arc-tangent of a coordinate. Format: atan2(x,y)</td>
-            </tr><tr>
-              <td>bound</td>
-              <td>Bounds a number between 2 values. Takes 3 parameters: Number, LBound, UBound. Returns LBound if Number < LBound, or UBound if Number > UBound. Otherwise returns Number.</td>
-            </tr><tr>
-              <td>ceil</td>
-              <td>Rounds up. Example: ceil(5.01) returns 6</td>
-            </tr><tr>
-              <td>cos</td>
-              <td>Return the cosine of a number.</td>
-            </tr><tr>
-              <td>fact</td>
-              <td>Computes the factorial of an integer. This is the same as the ! operator.</td>
-            </tr><tr>
-              <td>floor</td>
-              <td>Rounds down. Example: floor(5.99) returns 5. floor(-5.99) returns -6.</td>
-            </tr><tr>
-              <td>int</td>
-              <td>Returns the integer of a number. int(-5.99) returns -5.</td>
-            </tr><tr>
-              <td>len</td>
-              <td>Returns the length of a string.</td>
-            </tr><tr>
-              <td>log</td>
-              <td>Return the log of a number. It's base e. If you want a different base, do log(number)/log(base)</td>
-            </tr><tr>
-              <td>max</td>
-              <td>Return the higher of 2 numbers.</td>
-            </tr><tr>
-              <td>min</td>
-              <td>Return the lower of 2 numbers.</td>
-            </tr><tr>
-              <td>rand</td>
-              <td>Returns a bounded random integer. rand() gives you an integer from 0 to 1, rand(maxvalue) gives an integerfrom 0 to maxvalue, and rand(low,high) from low to high</td>
-            </tr><tr>
-              <td>randf
-              <td>Returns a bounded double precision floating point number. randf() gives you a double from 0 to 1, randf(maxvalue) gives a double from 0 to maxvalue, and randf(low,high) from low to high</td>
-            </tr><tr>
-              <td>round</td>
-              <td>Rounds a number to the given number of decimal places. Format: round(number,decimal places)</td>
-            </tr><tr>
-              <td>sin</td>
-              <td>Return the sin of a number.</td>
-            </tr><tr>
-              <td>sqrt</td>
-              <td>Return the square root of a number.</td>
-            </tr><tr>
-              <td>tan</td>
-              <td>Return the tangent of a number.</td>
-            </tr>
-          </table><br />
-          Take note that these do NOT have a leading $ like the above functions. They must be used INSIDE of $eval.
-        </div>
-        <br /><br />
-
-        <h4>Data types supported by eval</h4>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td>Boolean</td>
-              <td>true or false. Capitalization does not matter. Do not enclose in quotes.</td>
-            </tr><tr>
-              <td width="60">Integer</td>
-              <td>Support not done, numbers currently treated as double. All mathematical/bitwise operations are available.</td>
-            </tr><tr>
-              <td>Double</td>
-              <td>Double-precision floating point number. All mathematical operations except modulus are available.</td>
-            </tr><tr>
-              <td>Point</td>
-              <td>An x,y pair. You may add or subtract points, or you may add, subtract, multiply or divide points by scalars. Not finished.</td>
-            </tr><tr>
-              <td>String</td>
-              <td>A string. + may be used to concatenate strings. All strings MUST be enclosed by quotes.</td>
-            </tr>
-          </table><br />
-          Boolean logic comparisons are available with all types. Also, note that conditions in the karaoke effects tool internally use $eval, so strings must be enclosed in quotes in there. Variables that are strings currently do NOT automatically do so.
-        </div>
-        <br /><br />
-
-        <h4>Constants supported by eval</h4>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td>e</td>
-              <td>e, the natural logarithmic base.</td>
-            </tr><tr>
-              <td width="60">g</td>
-              <td>The golden ratio.</td>
-            </tr><tr>
-              <td>Pi</td>
-              <td>Pi.</td>
-            </tr><tr>
-              <td>y</td>
-              <td>Euler's constant.</td>
-            </tr>
-          </table><br />
-          All numerical constants are double precision (64-bit) floating points.
-        </div>
-        <br /><br />
-
-        <h4>Mathematical/Bitwise operators</h4>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td width="60">+</td>
-              <td>Add</td>
-            </tr><tr>
-              <td>-</td>
-              <td>Subtract</td>
-            </tr><tr>
-              <td>*</td>
-              <td>Multiply</td>
-            </tr><tr>
-              <td>/</td>
-              <td>Divide</td>
-            </tr><tr>
-              <td>!</td>
-              <td>Factorial</td>
-            </tr><tr>
-              <td>%</td>
-              <td>Modulus (remainder after integer division)</td>
-            </tr><tr>
-              <td>&</td>
-              <td>Bitwise and</td>
-            </tr><tr>
-              <td>\</td>
-              <td>Bitwise or</td>
-            </tr><tr>
-              <td>\</td>
-              <td>Bitwise xor</td>
-            </tr><tr>
-              <td>&lt;&lt;</td>
-              <td>Shift left</td>
-            </tr><tr>
-              <td>&gt;&gt;</td>
-              <td>Shift right</td>
-            </tr><tr>
-              <td>~</td>
-              <td>Inversion</td>
-            </tr>
-          </table>
-        </div>
-        <br /><br />
-
-        <h4>Boolean/comparison operators</h4>
-        <div class="subinfo">
-          <table border="0" cellspacing="8">
-            <tr>
-              <td width="60">=</td>
-              <td>Equal to (if used with text, is case insensitive)</td>
-            </tr><tr>
-              <td>&lt;&gt;</td>
-              <td>Equal to (if used with text, is case sensitive)</td>
-            </tr><tr>
-              <td>==</td>
-              <td>Equal to (if used with text, is case sensitive)</td>
-            </tr><tr>
-              <td>!=</td>
-              <td>Not equal to (if used with text, is case insensitive)</td>
-            </tr><tr>
-              <td>!=</td>
-              <td>Not equal to (if used with text, is case sensitive)</td>
-            </tr><tr>
-              <td>&gt;</td>
-              <td>Greater than</td>
-            </tr><tr>
-              <td>&gt;=</td>
-              <td>Greater than or equal to</td>
-            </tr><tr>
-              <td>&lt;</td>
-              <td>Less than</td>
-            </tr><tr>
-              <td>&lt;=</td>
-              <td>Less than or equal to</td>
-            </tr><tr>
-              <td>||</td>
-              <td>Boolean or</td>
-            </tr><tr>
-              <td>&&</td>
-              <td>Boolean and</td>
-            </tr>
-          </table>
-        </div>
-      </div><br /><br />
-
-      <div class="box">
-        <div class="header">Effect and project files</div>
-        <h3>Effect files</h3>
-        <div class="subinfo">
-          Effect files are XML files that hold all preset effects except for "raw code," which is built in. They use the extension exml. You may edit them in a text editor by using the bundled effects as a template. There's also an effects editor in the program to write them for you.
-        </div><br />
-        
-        <h3>Project files</h3>
-        <div class="subinfo">
-          Project files are also XML files, but they are in a different format than the effect files. They contain all layer, filter and condition information as well as the filename to the loaded SSA, if applicable. They are not a script - they do not keep track of your commands, but merely karaoke effects information. They may be edited in a text editor, but I only recommend doing that if you want to make a slight modification to an existing file.
-        </div>
-      </div><br /><br />
-      
-      <div class="box">
-        <div class="header">File Encoding</div>
-          SSATool will open most common file encodings including ANSI (using your local codepage), Shift-JIS, and Unicode in 1, 2, or 4 octet versions. Some encodings, such as Shift-JIS are notoriously hard to detect, so if your file includes Japanese text and you're unsure of the encoding, please make sure to find out, or that it displays correctly if you use the open file option without the SJIS.<br /><br />
-          As of version 4.1, SSATool employs extremely simple algorithms for attempting to detect Shift-JIS and EUC-JP. If a file is under 4KB, 100 or more characters detected with either encoding will trigger a prompt asking to reload using that encoding. If the file is 4KB-8KB, the threshold is 300, and if the file is 8KB or more, 600.
-      </div><br /><br />
-
-      <div class="box">
-        <div class="header">Thanks</div>
-        The following are people I want to thank for helping me with this, be that by testing, lending me webspace, putting up educational code samples on the web, etc. Some will be in names, and others will be in online nicknames.<br />
-        <div class="subinfo">
-        <ul>
-          <li>DeathWolf - testing, feature suggestions, webspace</li>
-          <li>Neil Davidson - the <a href="http://www.codeproject.com/csharp/GetSaveFileName.asp?print=true">save file dialog w/ encoding</a> I'm using</li>
-          <li>PovRayMan - icon</li>
-          <li>SCR512 - testing</li>
-          <li>zalas - feature suggestions</li>
-          <li>Dead-Cow - testing</li>
-          <li>Nikolai - testing, feature suggestions</li>
-          <li>Anyone else I forgot</li>
-        </ul>
-        </div>
-      </div><br /><br />
-
-      SSATool is copyright (C) 2005-2006 Dan Donovan. It is free to use.
-    </center>
-  </body>
-</html>

SSATool/Extras/changelog.txt

@@ -1,492 +0,0 @@
-4.3.6
--Fix saving a project file with default layer names not showing any names when loading the file again
--Fix small bug loading v5/6 scripts
-
-4.3.5
--Truetype Collection (TTC) font files are supported in the font finder
--Factorial should work now
--More optimizations/cleanups
-
-4.3.4
--Fixed/tweaked some UI stuff
--More resize code added
--Fixed double click in error list
--Optimized some stuff
--All karaoke variables now index from 0, not 1. This will break backwards compatibility with some karaoke, but it has never been consistent, so I am changing it.
--Fixed %karamid%
-
-4.3.3
--A bunch of fixes for noteboxes
--Don't bother to scale resolution if the factor is 1:1
-
-4.3.2
--Workaround for crash when line is 259 characters long
--Workaround to prevent splitter from stealing focus on resize (by design, MS? What were you thinking?)
--Fix in default notebox template
-
-4.3.1
--Search/replace now affects everything as it used to
--Unparsable dialogue/style lines are now parsed as strings, displayed with green background
--Changing time precision or running search/replace refreshes the list automatically
-
-4.3.0.2
--Fixed karaoke condition buttons
-
-4.3.0
--Added notebox generator, see readme
--List and utility panel are now resizable panes
--Fixed a bug in resolution scaling
--Fixed error checker crash
--Fixed kanji timing crash
-
-4.2.0.10
--Fixed strip SSA leaving off the last syllable
-
-4.2.0.9
--Fixed a bunch of functions that did nothing
-
-4.2.0.8
--Gradient fixes
--Make screen update when you copy text from gradient/blur/etc to it, and don't copy text backwards
-
-4.2.0.7
--v6 script support improved
--Fix so that you can do both lead-in and lead-out
--A bunch of UI crashes from 4.2.0 fixed
-
-4.2.0.6
--Timecodes may now be unapplied
-
-4.2.0
--Lead no longer makes the list backwards
--Undo/redo optimized and now support adding/removing lines
--Fixed styles
--Optimizations, including overall memory usage
--Fixed lead and remove duplicate lines
--Reading negative times supported
--Other misc fixes, mostly UI-related
--Some Math constants added to $eval, see readme
--Boolean inversion is now denoted as ~ as opposed to ! in $eval
--Added LCM and GCD to $eval
--Fix loading some files through command line
--Fix to reading ARGB colors
--Timecode transform added
--Double clicking a line in the list will bring up the modify line dialogue box
--Bold, Italic, etc. now specified as -1 (instead of 1) as per specs. Parsing will work correctly with either.
-
-4.1.0
--V6 scripts (AKA V4++) supported
--Fixed a bug with %layernum% when you have disabled layers
--Undo/redo added
--Fixed a couple of bugs with kanji timing
--Effects files now use .exml extension. Old files may be renamed.
--Manual transform times are now displayed in the listbox as entered, but are snapped internally to be between frames.
--Conditions may now be edited directly instead of removing/readding
--Completely rewritten script engine combining $logic and $eval
--Workaround to prevent resaving UTF-16 files as UTF-8 by default
--You may now edit the names for karaoke layers and effects.
--Error checker now looks for decimals without leading integers (.1 vs 0.1)
--Rudamentary SJIS/EUC-JP detection
--Fixes to gradient maker
--Lots of general optimizations and other internal code changes
--Put layer condition checking back to per line instead of per syllable, as it should be
--Added karaoke syllable-per-line mode
-
-4.0.0
--Resolution scaling now has separate scale parameters for X and Y, no longer affects all lines, and no longer crashes
--FPS is now a global parameter
--Added option for ms precision. A modified VSFilter is required for it to work.
--Lead-in/out now affect \t and \move
--Karaoke layer options layed out a little differently
--Added kanji timing
--Fixed a possible crash with karaoke effects for short lines
--Fixed trying to save a project file as ANSI
--Various interface tweaks
-
-3.7.3
--Fixed %text% for syllables with no text
--Fixed logic with non-number, non-digit characters, such as space.
-
-3.7.2
--Fixed $iif when a condition is false
--Fix crash trying to remove an item in the karaoke tree when nothing is selected
--Adding an effect to the karaoke tree selects it automatically
--Added $str, see readme
--Fixed one layer being disabled affecting all layers below it
--Fixed one effect having unmet conditions disabling all effects below it
-
-3.7.1
--Added lead-in/out. It does not yet correct for \t, \move, etc.
-
-3.7.0
--Converting to C# 2.0. Filesize is much smaller. New bugs may be introduced.
--Fixed bug loading project files where layers didn't specify repetitions.
-
-3.6.0
--Added repetitions to karaoke effects. See readme.
--Removing effects should work better now.
--$logic should correctly interpret strings with numbers
-
-3.5.0
--Programming structure improved
--Random tweaks here and there
--Fixed cloning (copying effects, duplicating layers) in many cases
--Select first karaoke effects layer (if there is one) when loading a project
--Added manual transform. See readme.
--Improved precision of shifting by frame. Start times are now always rounded down (floor), while end times are rounded up (ceil)
--Changed interface for karaoke effects to use a treeview for layers and effects
--Fixed a bunch of eval functions
--Font names can now contain anything except \ or }
--Fix parameter order for $eval(round)
-
-3.2.5
--Script parser should handle parenthesis better now.
--Made $eval play nicer with decimals
--(hopefully) fixed one parameter functions for $eval
--$eval should bail and return String.Empty if it can't make sense of the data it's given
--Added sqrt() to $eval (or you can still do ^0.5)
--Fixed =/== in $evallogic/$iif
--Strings in $evallogic/$iif no longer are expected to be in quotes
-
-3.2.4
--Fixed <, <=, >, >=
-
-3.2.3
--Fixed a few bugs with writing XML Project files
--Fixed a bug when loading an XML project file that options would become confused between filters with multiple instances
--Fixed a couple of bugs that rendered effect conditions pretty much useless
--%layernum% and %layernumlps% now index from 1, not 0
--Pressing enter in the condition dialog box will click OK automatically
-
-3.2.2
--The selected line information now properly moves when the form is resized.
-
-3.2.1
--You can now load files (except effects files) through the command line (do "Open With" in Explorer)
-
-3.2.0
--Karaoke effects generator can now allow you to edit the actual text for each syllable by setting "don't add the syllable text itself" in Layer Conditions+Options and using %text%.
--Length-based \k / \K fixed again
-
-3.1.0
--Select/Deselect Line Range now accept the last line number (IE if you have a 10 line file, 1-10 works now)
--Slight optimization to how effects are created
--Blur now only has two types: true blur and glow. However, it is more powerful than before. See the readme for more.
--Blur no longer adds an empty line at the end
--Exponential blur no longer disregards BlurStart for the center line.
--Gradient now accepts a parameter called mirror. See the readme, but know that leaving it at 100 (%) will act the same as it used to.
--Added $listindex, $listindexwrap, $listindexlast functions
-
-3.0.3 (3.0.2019.28843)
--Adding the same effect multiple times no longer mixes up the options between them.
--Fixed length-based \k / \K
-
-3.0.2 (3.0.2017.31380)
--Offset in gradient maker now only affects the second X,Y pair in \clip
-
-3.0.1 (3.0.2017.27737)
--Detecting unclosed parenthesis/brackets at the end of the line now works.
-
-3.0 (3.0.2017.5108)
--Added $len, $left, $mid, $right
--Slight optimizations in $iif
--Added select/deselect line range to list menu. If you don't know the line numbers, click on the lines and use the go to line option and it'll show the current line.
--Made go to line show the selected line number by default and added a label to show this as well
--Optimizations to shifting and length based \k-\K
--Fixed strip SSA
--Fixed linear glow type blur accuracy
--Error checker will now report unclosed ampersands in \alpha, \2c, \2a, \3c, \3a, \4c, \4a
--Error checker will now report lowercase hex markers in \alpha
-
-3.0 beta 6 (3.0.1975.5261)
--Fixed shifting if your file is 10 hours or more
--Fixed font check sometimes adding fonts more than once
--Workaround for looking for vertical fonts (@fonts). It will just omit the @. It doesn't check if the font is actually capable of being vertical.
--Added ability to search for fonts that aren't installed in a directory
--Saving as UTF-8 fixed
-
-3.0 beta 5 (3.0.1958.3274)
--Fixed shifting cutting off part of the line in many cases.
-
-3.0 beta 4
--Made form resizable
--Made default (and minimum) form width 1024 for those people using 1024x768
--Fixed logarithmic glow blur alpha values
--Fixed logarithmic and exponential gradient values when using a start color > 0
--Added font checker. Make good use of it. I know I will.
-
-3.0 beta 3
--Fixed some menu options that weren't doing anything
--Double clicking on a line in error checking now takes you to the line in question. Also added a couple of checks for style lines.
--Added a layered blur option.
--Added option to do logarithmic and exponential gradients.
--Removed messagebox popping up with $iif
--Added some more error checks for various functions (not talking about the error checker, but when you enter invalid parameters to functions)
-
-3.0 beta 2 (3.0.1948.40271)
--Also check for colors/alpha with lowercase hex codes (including the H) and also where there is not a trailing ampersand
--Scale PlayResX and PlayResY too
--Fixed eval
--Added the "list" menu with some useful list functions
--Performance increases in scripting/eval/evallogic. Thanks to DeathWolf for helping with this.
--Fixed effect conditions
-
-3.0 beta 1 (3.0.1948.26940)
--Complete rewrite of application using C# 1.1, so you now need .NET to run it. Speed increases and GUI improvements result.
--Variables have changed formats. See readme.
--Scripting language is much different. See readme.
--Project files and effects list files both use XML now. They are not backwards compatible.
--Program supports basically all normal encodings, including UTF-16 (Unicode) that previous versions didn't.
--Gradient maker can do \1c, \2c, \3c, \4c (user selectable) and can handle RGBA (in ARGB order) and decimal input
--Resolution scaling now scales a lot more stuff. See readme.
-
-
-
-
---Old versions--
-
-
-2.0.161
--Even bigger speedup
--Completely rewrote effects procedure, kept the old one as it may be buggy, as usual
--Made after 3.0 for those looking to avoid .Net (bad choice though)
-
-2.0.158
--HUGE speedup
--Will no longer affect non-karaoke dialog lines
--Probably buggy
--Made after 3.0 for those looking to avoid .Net (bad choice though)
-
-2.0.157
--More bugfixes and speedups
-
-2.0.154
--More bugfixes
--Layer-per-syllable and fixed layer modes may be combined
--New variables dealing with layers: $layernumtot$, $layernumlps$, $layernumlpstot$. If you have a "legacy" layer-per-syllable file, open the PSSA in Notepad and add PerSyllable=True. When using $layernum$ for layer-per-syllable, you must now use $layernumlps$.
-
-1.6.153
--Fixed several bugs introduced in the last release
--More speedups
--Added $style$ variable (see readme)
--Added ability to resize the program
-
-1.5.152
--Fixed $iif with more than one comparison
--Some other random bugfixes
--There should be a minor speedup all around, but I don't know if it'll be noticeable
-
-1.5.151
--Added ability to insert a gradient into a file without replacing a line
-
-1.5.150
--A small bugfix in the gradient maker. Not sure if it even affected anything.
-
-1.5.149
--Added some more to gradient maker
--New HTML readme
-
-1.5.146
--Added a bunch of stuff to gradient maker, such as copying to/from the SSA file and automatically adding text before and after the line.
--Gradient maker no longer adds 1 extra line
-
-1.4.145
--Another fix
-
-1.4.144
--Fixed a gradient maker problem having to do with some parts of it being unfinished and disabled.
-
-1.4.143
--More gradient maker work
--Added $randlist
-
-1.3.142
--Started to implement a gradient maker. It's not done and what is done is experimental.
-
-1.2.141
--New version scheme, actually using minor (and eventually major) version numbers instead of just build numbers.
--Added ability to change font in Listbox, including encoding.
- 
-1.1.140
--Fixed strip SSA, it should no longer strip numbers after \kf.
-
-1.1.139
--Added: \k or \K depending on the length of the syllable
--Fixed a little big with scaling where it would try to work on lines it shouldn't be (though it shouldn't have messed anything up)
-
-1.1.138
--Added: SSA Resolution Scaling. Use at your own risk.
--Removed: Old load/save projects
--Removed: Old add effects procedure.
-
-1.1.137
--Fixed: Shifting now correctly abides the lines being checked/unchecked
-
-1.1.136
--Some minor interface tweaks
--Added 'Move Down' for effects
-
-1.1.135
--Restructured/cleaned up the code for adding karaoke effects. The old code will be left in for a little while until I can be sure there are no bugs in the new code. Please try the new code, but make sure you save before doing so.
-
-1.1.134
--Fixed: Reparsing styles (made typo last build)
-
-1.1.133
--Fixed: Read ASS Styles reparsing (also made slightly faster)
-
-1.1.132
--Fixed: Read ASS Styles ([v4+ styles]) correctly.
-
-1.1.131
--Fixed: Layer conditions and effect count were, in certain conditions, obtained from the wrong layer. This has been (hopefully) corrected.
-
-1.1.130
--Fixed shifting...
-
-1.1.129
--Fixed (I don't know): Shifting............. last time? Nah...
-
-1.1.128
--Fixed (probably): Shifting... again. Should be accurate and not crash.
-
-1.1.127
--Fixed (maybe): Shifting should be more accurate.
-
-1.1.126
--Fixed: Effect condition checkboxes now correctly show as checked/unchecked when the condition is active/inactive as opposed to always being checked.
--Fixed: Layer condition checkboxes now correctly show as checked/unchecked when the condition is active/inactive as opposed to always being checked.
--Fixed: Effect conditions should no longer crash when loading a project.
--Fixed: Layer conditions should now correctly load as layer conditions instead of effect conditions when loading a project.
-
-1.1.125
--Added: $lastkaranzkstart$
--Fixed: Trying to move/copy an effect when there are no effects no longer creates a blank effect.
-
-1.1.124
--Fixed effects list not being correctly loaded if you open a SSA/ASS/PSSA from the command line.
-
-1.1.123
--Added ability to load SSA/ASS and PSSA (project files) from command line. You can now associate SSATool with SSA, ASS and/or PSSA files and it will open them.
-
-1.1.122
--Effects can now use variables in the code line and not just the options lines. If you don't know what this means, don't worry about it.
-
-1.1.121
--Forgot to comment out some code before hitting compile in last version that made load project crash. Fixed.
--Added script tracing in the help tab... Every call to the script parser adds a line to the listbox. It will be at least 2 lines per script call.
-
-1.1.120
--Fixed bug in $calc where a negative as the first number would not be recognized.
--Fixed: Trying to delete a layer when there are no layers no longer crashes.
--Fixed: Trying to delete an effect condition when there are no effect conditions no longer crashes.
--Fixes to load project
-
-1.1.119
--Fixed: Shifting by difference now works in both directions.
--Fixed: Shifting bug introduced last version for times w/o decimals hopefully fixed.
--Improvement: Times are now stored as double precision instead of single precision.
-
-1.1.118
--Fixed: Trying to save in various situations as opposed to save as no longer results in a crash
--Fixed: $rand no longer returns 0 or gives type mismatch crashes
--Fixed: Trying to move an effect up when there is no effect to move up no longer results in a crash
--Fixed: Copying or moving an effect to another layer now includes the conditons.
--Fixed: Shifting times should no longer mess up if a time has a decimal >= .995 (which was rounded as 1.0 before, screwing things up)
-
-1.1.117
--Fixed: Scripting should now properly support recursion.
-
-1.1.116
--Fixed bug where closing the program did not unload it from memory.
--Fixed select/deselect all styles.
-
-1.1.115
--Added script functions: and, nand, or, nor, not, xor
--Added operator info to readme
--Added script testing/debugging in the help tab. This is mostly for me, but you may test your own logic on it if you like.
-
-1.1.114
--Fix stupid typo in new load project. Effects should correctly load now...
-
-1.1.113
--Fixed new project format to actually attempt to load the SSA file itself
--Added a progress popup w/ cancel option for karaoke effects
--Added list of variables to readme
-
-1.1.112
--New project format. Please only use the old format if you find bugs in the new one.
--Added time shifting by difference.
-
-1.1.111
--Make multicharacter comparisons (!=, <>, etc) work correctly
--Fixed saving a ssa file without the extension causing a crash. Really this time.
-
-1.1.110
--Changed to common dialog for open/save
--Added version number to form title
--Minor code cleanup, slightly smaller file
-
-1.1.109
--Removed preview in the open box because it was causing problems for some computers.
--Fixed saving a ssa file without the extension causing a crash.
--Added remove duplicate dialog lines option-Useful for when stripping a multilayer SSA leaves you with duplicate lines.
--Added tooltips for a few things.
-
-1.1.108
--Minor tweaks in open/save windows
--Fixed major multilayering bug introduced in build 105.
-
-1.1.107
--Fix (allow) removal of effect conditions.
-
-1.1.106
--Fix checkmarks in layer conditions tab.
-
-1.1.105
--Remove limit of 100 layers
--Fixed condition checking
--Saving/loading project now also saves conditions.
--Added "layer per syllable" mode
--Added ability to not add layers to the output if the conditions are not met (as opposed to adding the line unchanged)
--Added "Invert Line Selection" for the SSA list.
-
-1.1.104
--Changed name to SSATool.
--Changed the UI around.
--Fixed: $iif should now work correctly when comparing numbers, as opposed to comparing them as strings
--Added ability to define custom conditions specifying when each layer and each filter are used.
--Added variable $karanumtot$ to tell how many syllables are on the line.
-
-1.0.103
--Added ability to effect only certain lines.
--Added option to shift only start/end times.
-
-1.0.102
--Changed format of effects file and project files to get around some delimiting issues and to make more readable if you open them in a text editor.
--Changed extension of project file to .pssa to get around a VB quirk (*.aas would also return .aasp files)
--Added scripting functions: bound, round, int, sin, cos, tan, log, exp, abs
--Calc now supports parenthesis and uses the order of operations instead of left-to-right processing.
--Fixed floor behavior
-
-1.0.101
--Made copy/move to layer work again.
--Added scripting functions: ceil, floor. math is now a synonym for calc.
-
-1.0.100
--Implemented simple inline scripting. Supported functions: iif, rand, randf (floating), calc (math)
--Added variable $layernum$
-
-1.0.99
--Fixed bug with enabling/disabling filters
--Implemented save/load project, does not save layer conditions yet
--Fixed saving effects list
--Speedups
-
-1.0.98
--Finished implementing the effects editor.
-
-1.0.97
--The default style may now be effected. SSA by default calls Default *Default in your lines, which was screwing up the comparison.
--Time shifting now correctly rounds decimals insdtead of giving you several numbers as an exponential.
--Stripping a SSA will now copy lines which have unselected styles instead of leaving them out.

SSATool/Extras/effects.exml

@@ -1,17 +0,0 @@
-<?xml version="1.0"?>
-<ESSA>
-	<Effect Name="Transformation" Code="\t($Start Time$,$End Time$,$Acceleration$,$Code$)">
-		<Option Name="Start Time">%karastart%</Option>
-		<Option Name="End Time">%karaend%</Option>
-		<Option Name="Acceleration">1</Option>
-		<Option Name="Code"></Option>
-	</Effect>
-	<Effect Name="Move" Code="\move($Start X$,$Start Y$,$End X$,$End Y$,$Start Time$,$End Time$)">
-		<Option Name="Start X"></Option>
-		<Option Name="Start Y"></Option>
-		<Option Name="End X"></Option>
-		<Option Name="End Y"></Option>
-		<Option Name="Start Time">0</Option>
-		<Option Name="End Time">$eval(%linelen%*1000)</Option>
-	</Effect>
-</ESSA>

SSATool/Extras/notebox.xml

@@ -1,67 +0,0 @@
-<?xml version="1.0"?>
-<NSSA>
-  <Note name="getfresh v4" author="getfresh" desc="Notebox by getfresh. Start a little early and end a little late as it fades+scrolls in." resx="1024" resy="768">
-    <Styles version="5">
-      <Style>Style: NoteBOX1,Arial,29,&amp;HFFD6AE85,&amp;HFFFFFFFF,&amp;HFFFFFFFF,&amp;HFF000000,0,0,0,0,100,100,0,0.00,1,0,0,7,0,0,0,0</Style>
-      <Style>Style: NoteBOX2,Arial,29,&amp;HFFFFFFFF,&amp;HFFFFFFFF,&amp;HFF000000,&amp;HFF000000,1,0,0,0,100,100,0,0.00,1,0.5,1.5,7,0,0,0,128</Style>
-      <Style>Style: NoteBOX3,Arial,29,&amp;HFFC9471E,&amp;HFFFFFFFF,&amp;HFFFFFFFF,&amp;HFF000000,0,0,0,0,100,100,0,0.00,1,0,0,7,0,0,0,0</Style>
-    </Styles>
-    <LSet lines="1">
-      <line style="NoteBOX1">{\pos(174,-99)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy70\t(0,500,\1a&amp;Haa&amp;\3a&amp;H00&amp;\4a&amp;H00&amp;)\t(3500,4000,,\alpha&amp;HFF&amp;)\bord3}{\p1}m 0 0 l 690 0 690 80 0 80{\p0}</line>
-      <line style="NoteBOX3">{\pos(254,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy144\fscx200\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,,\alpha&amp;HFF&amp;)\bord1.5}{\p1}m 0 0 l 1 0 1 47 0 47{\p0}</line>
-      <line style="NoteBOX3">{\pos(255,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy146\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 1 0 1 48 0 48{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy100\t(0,500,\alpha&amp;H40&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 700 0 700 3 0 3{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,-35)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 699 0 699 3 0 3{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy77\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 1 0 1 93 0 93{\p0}</line>
-      <line style="NoteBOX3">{\pos(868,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy77\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 1 0 1 93 0 93{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy77\t(0,500,\1a&amp;HCA&amp;\3a&amp;H00&amp;\4a&amp;H00&amp;)\t(3500,4000,,\alpha&amp;HFF&amp;)\bord3}{\p1}m 0 0 l 699 0 699 93 0 93{\p0}</line>
-      <line style="NoteBOX1">{\pos(184,-86)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)\1c&amp;HFFFFFF&amp;\3c&amp;H000000&amp;\bord0.5\shad1.5\b1\i1}NOTE</line>
-      <line style="NoteBOX2">{\pos(264,-92)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)\fs40}%line1%</line>
-    </LSet>
-    <LSet lines="2">
-      <line style="NoteBOX1">{\pos(174,-99)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\1a&amp;Haa&amp;\3a&amp;H00&amp;\4a&amp;H00&amp;)\t(3500,4000,,\alpha&amp;HFF&amp;)\bord3}{\p1}m 0 0 l 690 0 690 80 0 80{\p0}</line>
-      <line style="NoteBOX3">{\pos(254,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy142\fscx200\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,,\alpha&amp;HFF&amp;)\bord1.5}{\p1}m 0 0 l 1 0 1 47 0 47{\p0}</line>
-      <line style="NoteBOX3">{\pos(173,-41)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)\bord1.5}{\p1}m 0 0 l 82 0 82 1 0 1{\p0}</line>
-      <line style="NoteBOX3">{\pos(255,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy130\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 1 0 1 48 0 48{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\alpha&amp;H50&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 700 0 700 3 0 3{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,28)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 699 0 699 3 0 3{\p0}</line>
-      <line style="NoteBOX3">{\pos(170,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 2 0 2 93 0 93{\p0}</line>
-      <line style="NoteBOX3">{\pos(868,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy150\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)}{\p1}m 0 0 l 1 0 1 93 0 93{\p0}</line>
-      <line style="NoteBOX1">{\pos(170,-105)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\fscy145\t(0,500,\1a&amp;HCA&amp;\3a&amp;H00&amp;\4a&amp;H00&amp;)\t(3500,4000,,\alpha&amp;HFF&amp;)\bord3}{\p1}m 0 0 l 699 0 699 93 0 93{\p0}</line>
-      <line style="NoteBOX3">{\pos(184,-87)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)\1c&amp;HFFFFFF&amp;\3c&amp;H000000&amp;\bord0.5\shad1.5\b1\i1}NOTE</line>
-      <line style="NoteBOX2">{\pos(264,-85)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)\fs40}%line1%</line>
-      <line style="NoteBOX2">{\pos(180,-28)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&amp;HFF&amp;}0\N{\r\t(0,500,\alpha&amp;H00&amp;)\t(3500,4000,\alpha&amp;HFF&amp;)\fs40}%line2%</line>
-    </LSet>
-  </Note>
-</NSSA>
-
-
-<!--
-Style: NoteBOX1,Arial,29,&HFFF6E0FF,&HFFFFFFFF,&HFF000000,&HFF000000,0,0,0,0,100,100,0,0,1,0,0,7,0,0,0,0
-Style: NoteBOX2,Arial,29,&HFFFFFFFF,&HFFFFFFFF,&HFF000000,&HFF000000,0,0,0,0,100,100,0,0,1,0.5,0,7,0,0,0,128
-
-{\pos(174,-74)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy70\t(0,500,\1a&Haa&\3a&H00&\4a&H00&)\t(3500,4000,,\alpha&Hff&)\bord2}{\p1}m 0 0 l 690 0 690 60 0 60{\p0}
-{\pos(254,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy144\fscx200\t(0,500,\alpha&H00&)\t(3500,4000,,\alpha&Hff&)\bord1.5}{\p1}m 0 0 l 1 0 1 35 0 35{\p0}
-{\pos(255,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy146\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 1 0 1 36 0 36{\p0}
-{\pos(170,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy100\t(0,500,\alpha&H40&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 700 0 700 2 0 2{\p0}
-{\pos(170,-26)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 699 0 699 2 0 2{\p0}
-{\pos(170,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy77\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 1 0 1 70 0 70{\p0}
-{\pos(868,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy77\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 1 0 1 70 0 70{\p0}
-{\pos(170,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy77\t(0,500,\1a&Hca&\3a&H00&\4a&H00&)\t(3500,4000,,\alpha&Hff&)\bord2}{\p1}m 0 0 l 699 0 699 70 0 70{\p0}
-{\pos(184,-68)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)\1c&HFFFFFF&\bord0\shad1.5\bord0.5\3c&H000000&\b1\i1}NOTE
-{\pos(264,-69)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)\shad1.5\b1\fs30}%line1%
-
-
-{\pos(174,-74)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\1a&Haa&\3a&H00&\4a&H00&)\t(3500,4000,,\alpha&Hff&)\bord2}{\p1}m 0 0 l 690 0 690 60 0 60{\p0}
-{\pos(254,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy142\fscx200\t(0,500,\alpha&H00&)\t(3500,4000,,\alpha&Hff&)\bord1.5}{\p1}m 0 0 l 1 0 1 35 0 35{\p0}
-{\pos(173,-31)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)\bord1.5}{\p1}m 0 0 l 82 0 82 1 0 1{\p0}
-{\pos(255,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy130\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 1 0 1 36 0 36{\p0}
-{\pos(170,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\alpha&H50&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 700 0 700 2 0 2{\p0}
-{\pos(170,21)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 699 0 699 2 0 2{\p0}
-{\pos(170,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 2 0 2 70 0 70{\p0}
-{\pos(868,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy150\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)}{\p1}m 0 0 l 1 0 1 70 0 70{\p0}
-{\pos(170,-79)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\fscy145\t(0,500,\1a&Hca&\3a&H00&\4a&H00&)\t(3500,4000,,\alpha&Hff&)\bord2}{\p1}m 0 0 l 699 0 699 70 0 70{\p0}
-{\pos(184,-70)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)\1c&HFFFFFF&\bord0\shad1.5\bord0.5\3c&H000000&\b1\i1}NOTE
-{\pos(264,-64)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)\shad1.5\b1\fs30}%line1%
-{\pos(180,-21)\fscy0\t(0,500,\fscy320)\t(3500,4000,\fscy0)\alpha&Hff&}0\N{\r\t(0,500,\alpha&H00&)\t(3500,4000,\alpha&Hff&)\shad1.5\b1\fs30}%line2%
--->

SSATool/Filter.cs

@@ -1,194 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic; //.Net 2.0
-
-
-namespace SSATool {
-
-    public class Filter : ConditionColl, System.Collections.Generic.IEnumerable<FilterOption>, IEquatable<Filter> {
-        private Filter template;
-		protected List<FilterOption> fOptions;
-		public string Name, Code;
-		public bool Enabled;
-
-		public Filter() : base() {
-			fOptions = new List<FilterOption>();
-            Enabled = true;
-		}
-		public Filter(List<FilterOption> optionsList) : base() {
-			fOptions = optionsList;
-            Code = String.Empty;
-		}
-
-        public Filter(string name) : this() {
-            Name = name;
-            Code = String.Empty;
-        }
-
-        public Filter(string name, string code) : this() {
-            Name = name;
-            Code = code;
-        }
-
-        public Filter(string name, List<FilterOption> optionsList)
-            : this(optionsList) {
-            Name = name;
-            Enabled = true;
-        }
-
-        bool System.IEquatable<Filter>.Equals(Filter f) {
-            return (String.CompareOrdinal(this.Name, f.Name) == 0);
-        }
-
-		public override string ToString() {
-			return Name;
-		}
-
-		public int NumOptions {
-			get { return fOptions.Count; }
-		}
-
-        public Filter Template {
-            get { return template; }
-        }
-
-		public void AddOption(string Name,string Val) {
-			fOptions.Add(new FilterOption(Name,Val));
-		}
-
-		public void AddOption(FilterOption fo) {
-			fOptions.Add(fo);
-		}
-		public void SetOptionValueByIndex(int index, string val) {
-			if (fOptions.Count > index) fOptions[index].Value = val;
-		}
-		public void SetOptionValueByName(string name, string val) {
-			for (int index=0;index<fOptions.Count;index+=1)
-				if (string.CompareOrdinal(fOptions[index].Name,name) == 0)
-					fOptions[index].Value = val;
-		}
-
-		public void SetOptionNameByIndex(int index, string name) {
-			if (fOptions.Count > index) fOptions[index].Name = name;
-		}
-		public void SetOptionByIndex(int index, string name, string val) {
-			if (fOptions.Count > index) {
-				fOptions[index].Name = name;
-				fOptions[index].Value = val;
-			}
-		}
-
-		public FilterOption GetOptionByIndex(int index) {
-			return fOptions[index];
-		}
-        public string GetOptionValueByIndex(int index) {
-			return fOptions[index].Value;
-		}
-		public FilterOption GetOptionByName(string name) {
-			for(int index=0;index<fOptions.Count;index+=1) 
-				if (fOptions[index].Name == name)
-					return fOptions[index];
-
-			return (FilterOption) null;
-		}
-		public string GetOptionValueByName(string name) {
-			for(int index=0;index<fOptions.Count;index+=1)
-				if (fOptions[index].Name == name)
-					return fOptions[index].Value;
-
-			return null;
-		}
-		public void RemoveOptionByIndex(int index) {
-			fOptions.RemoveAt(index);
-		}
-		public void RemoveOptionByName(string name) {
-			for(int index=0;index<fOptions.Count;index+=1)
-				if (fOptions[index].Name == name) fOptions.RemoveAt(index);
-		}
-
-        public List<FilterOption> CloneOptions() {
-            List<FilterOption> nl = new List<FilterOption>();
-			for(int index=0;index!=fOptions.Count;index+=1)
-				nl.Add((FilterOption)fOptions[index].Clone());
-			return nl;
-		}
-
-        public object Clone() {
-            Filter nf = new Filter(Name, CloneOptions());
-            nf.conditionColl = CloneConditions();
-            nf.template = (this.template==null)?this:this.template;
-            return nf;
-        }
-
-		#region IEnumerable Members
-        IEnumerator<FilterOption> IEnumerable<FilterOption>.GetEnumerator() {
-            return new FilterEnumerator(this);
-		}
-        public System.Collections.IEnumerator GetEnumerator() {
-            return new FilterEnumerator(this);
-        }
-		#endregion
-	}
-
-	public class FilterEnumerator : IEnumerator<FilterOption>, IDisposable {
-		Filter f;
-		int index;
-
-        public void Dispose() {
-            
-        }
-		public FilterEnumerator(Filter f) {
-			this.f = f;
-			Reset();
-		}
-		public void Reset() {
-			index=-1;
-		}
-		object IEnumerator.Current {
-			get { return f.GetOptionByIndex(index); }
-		}
-		public FilterOption Current {
-			get { return f.GetOptionByIndex(index);	}
-		}
-		public bool MoveNext() {
-			if (++index >= f.NumOptions) return false;
-			else return true;
-		}
-	}
-
-	public class FilterOption : ICloneable {
-		public string Name;
-		public string Value;
-
-		public FilterOption() { }
-
-		public FilterOption(string name, string val) {
-			Name = name;
-			Value = val;
-		}
-
-		public object Clone() {
-			return new FilterOption(Name,Value);
-		}
-	}
-
-}

SSATool/Form1.ja.resx

@@ -1,241 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="cmdSearchReplace.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label12.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label11.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdShift.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkShiftNoNeg.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkShiftEnd.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkShiftStart.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="radTShiftBack.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="radTShiftForward.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label3.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="radFShiftBackward.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="radFShiftForward.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label5.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label4.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label7.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label6.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label10.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label9.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label8.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdNewLayer.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdDelLayer.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdAddEffect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdCopyEffect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdMoveEffect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdMoveEffDown.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdMoveEffUp.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdDelEffect.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label2.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkDelEffectCondition.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdAddEffectCondition.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkAddOnce.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkAddAnyway.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkRemoveK.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="chkLayerPerSyllable.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdDelLayerCondition.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="CmdNewLayerCondition.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdDoEffects.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdDupLayer.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="label1.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdReloadFile.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdSSAInvertSel.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdSSADeselall.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdSSASelall.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdReparse.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdDeselAll.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="cmdSelAll.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>On</value>
-  </data>
-  <data name="lstSSA.Font" type="System.Drawing.Font, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>MS UI Gothic, 9pt</value>
-  </data>
-</root>

SSATool/InputBox.cs

@@ -1,223 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.ComponentModel;
-using System.Windows.Forms;
-
-namespace SSATool
-{
-	/// <summary>
-	/// Summary description for InputBox.
-	/// 
-	public class InputBox : System.Windows.Forms.Form {
-
-		#region Windows Contols and Constructor
-
-		private System.Windows.Forms.Label lblPrompt;
-		private System.Windows.Forms.Button btnOK;
-		private System.Windows.Forms.Button button1;
-		private System.Windows.Forms.TextBox txtInput;
-		/// <summary>
-		/// Required designer variable.
-		/// 
-		private System.ComponentModel.Container components = null;
-
-		public InputBox() {
-			//
-			// Required for Windows Form Designer support
-			//
-			InitializeComponent();
-
-			//
-			// TODO: Add any constructor code after InitializeComponent call
-			//
-		}
-
-		#endregion
-
-		#region Dispose
-
-		/// <summary>
-		/// Clean up any resources being used.
-		/// 
-		protected override void Dispose( bool disposing ) {
-			if( disposing ) {
-				if(components != null) {
-					components.Dispose();
-				}
-			}
-			base.Dispose( disposing );
-		}
-
-		#endregion
-
-		#region Windows Form Designer generated code
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// 
-		private void InitializeComponent() {
-			this.lblPrompt = new System.Windows.Forms.Label();
-			this.btnOK = new System.Windows.Forms.Button();
-			this.button1 = new System.Windows.Forms.Button();
-			this.txtInput = new System.Windows.Forms.TextBox();
-			this.SuspendLayout();
-			// 
-			// lblPrompt
-			// 
-			this.lblPrompt.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 
-				| System.Windows.Forms.AnchorStyles.Left) 
-				| System.Windows.Forms.AnchorStyles.Right)));
-			this.lblPrompt.BackColor = System.Drawing.SystemColors.Control;
-			this.lblPrompt.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.lblPrompt.Location = new System.Drawing.Point(12, 9);
-			this.lblPrompt.Name = "lblPrompt";
-			this.lblPrompt.Size = new System.Drawing.Size(302, 82);
-			this.lblPrompt.TabIndex = 3;
-			// 
-			// btnOK
-			// 
-			this.btnOK.DialogResult = System.Windows.Forms.DialogResult.OK;
-			this.btnOK.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-			this.btnOK.Location = new System.Drawing.Point(326, 24);
-			this.btnOK.Name = "btnOK";
-			this.btnOK.Size = new System.Drawing.Size(64, 24);
-			this.btnOK.TabIndex = 1;
-			this.btnOK.Text = "&OK";
-			// 
-			// button1
-			// 
-			this.button1.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-			this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Popup;
-			this.button1.Location = new System.Drawing.Point(326, 56);
-			this.button1.Name = "button1";
-			this.button1.Size = new System.Drawing.Size(64, 24);
-			this.button1.TabIndex = 2;
-			this.button1.Text = "&Cancel";
-			// 
-			// txtInput
-			// 
-			this.txtInput.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.txtInput.Location = new System.Drawing.Point(8, 100);
-			this.txtInput.Name = "txtInput";
-			this.txtInput.Size = new System.Drawing.Size(379, 20);
-			this.txtInput.TabIndex = 0;
-			this.txtInput.Text = "";
-			this.txtInput.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.txtInput_KeyPress);
-			// 
-			// InputBox
-			// 
-			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-			this.ClientSize = new System.Drawing.Size(398, 128);
-			this.Controls.Add(this.txtInput);
-			this.Controls.Add(this.button1);
-			this.Controls.Add(this.btnOK);
-			this.Controls.Add(this.lblPrompt);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog;
-			this.ImeMode = System.Windows.Forms.ImeMode.Off;
-			this.MaximizeBox = false;
-			this.MinimizeBox = false;
-			this.Name = "InputBox";
-			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
-			this.Text = "InputBox";
-			this.ResumeLayout(false);
-
-		}
-		#endregion
-
-		#region Private Variables
-		string formCaption = string.Empty;
-		string formPrompt = string.Empty;
-		string inputResponse = string.Empty;
-		string defaultValue = string.Empty;
-		#endregion
-
-		#region Public Properties
-		public string FormCaption {
-			get{return formCaption;}
-			set{formCaption = value;}
-		} // property FormCaption
-		public string FormPrompt {
-			get{return formPrompt;}
-			set{formPrompt = value;}
-		} // property FormPrompt
-		public string InputResponse {
-			get{return inputResponse;}
-			set{inputResponse = value;}
-		} // property InputResponse
-		public string DefaultValue {
-			get{return defaultValue;}
-			set{defaultValue = value;}
-		} // property DefaultValue
-
-		#endregion
-
-		#region Form and Control Events
-		public static InputBoxResult Show(string prompt, string title, string defaultResponse, 
-			int xpos, int ypos) { 
-			using (InputBox form = new InputBox()) { 
-				form.lblPrompt.Text = prompt; 
-				form.Text = title; 
-				form.txtInput.Text = defaultResponse; 
-				if (xpos >= 0 && ypos >= 0) { 
-					form.StartPosition = FormStartPosition.Manual; 
-					form.Left = xpos; 
-					form.Top = ypos; 
-				} 
-
-				DialogResult result = form.ShowDialog(); 
-
-				InputBoxResult retval = new InputBoxResult(); 
-				if (result == DialogResult.OK) { 
-					retval.Text = form.txtInput.Text; 
-					retval.OK = true; 
-				} 
-				return retval; 
-			} 
-		}
-
-
-
-		private void txtInput_KeyPress(object sender, System.Windows.Forms.KeyPressEventArgs e) {
-			if ((e.KeyChar == '\r') || (e.KeyChar == '\n')) {
-				btnOK.PerformClick();
-				e.Handled = true;
-			}
-			else if (e.KeyChar == 27) { //escape key
-				button1.PerformClick();
-				e.Handled = true;
-			}
-		}
-
-		public static InputBoxResult Show(string prompt, string title, string defaultText) { 
-			return Show(prompt, title, defaultText, -1, -1); 
-		}
-
-
-
-	}
-	#endregion
-
-	public class InputBoxResult {
-		public bool OK;
-		public string Text;
-	}
-}

SSATool/InputBox.resx

@@ -1,166 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 1.3
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">1.3</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1">this is my long string</data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        [base64 mime encoded serialized .NET Framework object]
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        [base64 mime encoded string representing a byte array form of the .NET Framework object]
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used forserialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>1.3</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <data name="lblPrompt.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="lblPrompt.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="lblPrompt.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="btnOK.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="btnOK.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="btnOK.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="button1.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="button1.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="button1.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="txtInput.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="txtInput.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="txtInput.Modifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-  <data name="$this.Locked" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Language" type="System.Globalization.CultureInfo, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>(Default)</value>
-  </data>
-  <data name="$this.TrayLargeIcon" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.Localizable" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>False</value>
-  </data>
-  <data name="$this.GridSize" type="System.Drawing.Size, System.Drawing, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>8, 8</value>
-  </data>
-  <data name="$this.DrawGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.Name">
-    <value>InputBox</value>
-  </data>
-  <data name="$this.TrayHeight" type="System.Int32, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>80</value>
-  </data>
-  <data name="$this.SnapToGrid" type="System.Boolean, mscorlib, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>True</value>
-  </data>
-  <data name="$this.DefaultModifiers" type="System.CodeDom.MemberAttributes, System, Version=1.0.5000.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
-    <value>Private</value>
-  </data>
-</root>

SSATool/Layer.cs

@@ -1,126 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic; //.Net 2.0
-
-namespace SSATool
-{
-	public class Layer : ConditionColl, IEnumerable, ICloneable {
-		private List<Filter> filterColl;
-        public string Name;
-		public int Repetitions;
-		public bool Enabled;
-		public bool PerSyllable, SyllablePerLine;
-        public bool AddAll, AddOnce;
-        public bool AddK, AddASSA, AddBracket, AddText;
-
-		public Layer() {
-			filterColl = new List<Filter>();
-			Enabled = true;
-            PerSyllable = SyllablePerLine = AddAll = AddOnce = false;
-            AddK = AddASSA = AddBracket = AddText = true;
-			Repetitions = 1;
-		}
-
-		public int Count {
-			get { return filterColl.Count; }
-		}
-
-		public Filter GetFilter(int index) {
-			return filterColl[index];
-		}
-
-		public void AddFilter(Filter tf) {
-			filterColl.Add(tf);
-		}
-
-		public void InsertFilter(int index, Filter tf) {
-			filterColl.Insert(index,tf);
-		}
-
-		public void RemoveFilter(int index) {
-			if (filterColl.Count > index) filterColl.RemoveAt(index);
-		}
-
-		public void SwapFilterPositions(int indexone, int indextwo) {
-			if ((filterColl.Count > Math.Max(indexone,indextwo)) && (indexone != indextwo)) {
-				Filter swap;
-				swap = filterColl[indexone];
-				filterColl[indexone] = filterColl[indextwo];
-				filterColl[indextwo] = swap;
-			}
-		}
-
-
-        public List<Filter> CloneFilters() {
-            List<Filter> nl = new List<Filter>();
-			for (int index=0;index!=filterColl.Count;index+=1)
-				nl.Add((Filter)filterColl[index].Clone());
-			return nl;
-		}
-
-		public object Clone() {
-			Layer nl = (Layer)this.MemberwiseClone();
-			nl.filterColl = CloneFilters();
-            nl.conditionColl = CloneConditions();
-			return nl;
-		}
-
-
-		public IEnumerator GetEnumerator() {
-			return new LayerEnumerator(this);
-		}
-
-
-	}
-
-	public class LayerEnumerator : IEnumerator {
-		Layer l;
-		int index;
-
-		#region IEnumerator Members
-
-		public void Reset() {
-			index = -1;
-		}
-
-		public object Current {
-			get {
-				return l.GetFilter(index);
-			}
-		}
-
-		public bool MoveNext() {
-			if (++index >= l.Count) return false;
-			else return true;
-		}
-
-		#endregion
-
-		internal LayerEnumerator(Layer l) {
-			this.l = l;
-			Reset();
-		}
-
-	}
-
-}

SSATool/Line.cs

@@ -1,305 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Drawing;
-
-namespace SSATool {
-    public enum LineType {
-        dialogue,
-        comment,
-        style,
-        other,
-        error
-    }
-    public class DialogueLine : ICloneable {
-        public TimeSpan start, end;
-        public Style style;
-        public string actor, effect;
-        public string text;
-        public int marginl, marginr, margint, marginb;
-        public int layer;
-        public bool marked;
-
-        public override string ToString() {
-            string retStr = String.Format("Dialogue: {0},{1},{2},{3},{4},{5:D4},{6:D4},{7:D4},{8}{9},{10}",
-                (Form1.sver==4)?("Marked="+(this.marked?"1":"0")):this.layer.ToString(Util.nfi),
-                Util.TimeSpanSSA(this.start,false,1),
-                Util.TimeSpanSSA(this.end,true,1),
-                this.style.name, this.actor,
-                this.marginl, this.marginr, this.margint,
-                ((Form1.sver == 6) ? this.marginb.ToString(Util.nfi).PadLeft(4, '0') + "," : String.Empty),
-                this.effect,this.text);
-            return retStr;
-        }
-
-        public Object Clone() {
-            return this.MemberwiseClone(); // A shallow memberwise-clone is fine
-        }
-
-        /// <summary>
-        /// Return just the text of the line without any SSA
-        /// </summary>
-        /// <returns></returns>
-        public string JustText {
-            get {
-                string justtext = string.Empty;
-                char[] linechar = this.text.ToCharArray();
-                bool inCode = false;
-                for (int charindex = 0; charindex != this.text.Length; charindex+=1) {
-                    if (linechar[charindex] == '{') inCode = true;
-                    else if (linechar[charindex] == '}') inCode = false;
-                    else if (!inCode) justtext = justtext + linechar[charindex];
-                }
-                return justtext;
-            }
-        }
-
-        /// <summary>
-        /// Return the margin of this line, taking overrides into account
-        /// </summary>
-        /// <returns>The margin as a rectangle</returns>
-        public RectangleF GetMargin() {
-            int Marginl = (this.marginl==0)?this.style.marginl:this.marginl;
-            int Margint = (this.margint==0)?this.style.margint:this.margint;
-            int Marginb = (this.marginb==0)?this.style.marginb:this.marginb;
-            int Marginr = (this.marginr==0)?this.style.marginr:this.marginr;
-            int Height = Form1.ResY - (Margint+Marginb);
-            int Width = Form1.ResX - (Marginl+Marginr);
-            return new RectangleF(Marginl, Margint, Width, Height);
-        }
-
-        /// <summary>
-        /// Find the bounding rectangle of an area of the line
-        /// </summary>
-        /// <param name="startIndex"></param>
-        /// <param name="length"></param>
-        /// <returns>The bounding rectangle</returns>
-        public RectangleF GetRect(int startIndex, int length) {
-            Graphics graphics = Form1.listSSAg;
-            StringFormat format  = new System.Drawing.StringFormat();
-            CharacterRange[] ranges  = { new CharacterRange(startIndex, length) };
-            Region[] regions = new Region[1];
-            RectangleF margin, rect;
-            margin = this.GetMargin();
-            format.SetMeasurableCharacterRanges(ranges);
-            int align = this.style.scrAlignment;
-            switch (align&3) {
-                case 1:
-                    format.LineAlignment = StringAlignment.Near;
-                    break;
-                case 2:
-                    format.LineAlignment = StringAlignment.Center;
-                    break;
-                default:
-                    format.LineAlignment = StringAlignment.Far;
-                    break;
-            }
-            switch (align&12) {
-                case 0:
-                    format.Alignment = StringAlignment.Far;
-                    break;
-                case 4:
-                    format.Alignment = StringAlignment.Near;
-                    break;
-                default:
-                    format.Alignment = StringAlignment.Center;
-                    break;
-            }
-            
-
-            regions = graphics.MeasureCharacterRanges(this.JustText, this.style.GetFont(), margin, format);
-            rect = regions[0].GetBounds(graphics);
-            rect = new RectangleF(margin.X+rect.X, margin.Y+rect.Y, rect.Width, rect.Height);
-            return rect;
-        }
-
-        public static DialogueLine ParseLine(string theLine, LineType lt) {
-            try {
-                DialogueLine retLine = new DialogueLine();
-                char[] linechar = theLine.ToCharArray();
-                string buff = String.Empty;
-                int pos = 0;
-                bool neg = false;
-                for (int index = (Form1.sver == 4) ? 17 : 9; index != linechar.Length; index+=1) {
-                    if ((pos<9||pos==9&&Form1.sver==6) && linechar[index].Equals(',')) {
-                        switch (pos) {
-                            case 0:
-                                if (Form1.sver == 4) retLine.marked = linechar[index - 1].Equals('1');
-                                else retLine.layer = int.Parse(buff, Util.cfi);
-                                break;
-                            case 1:
-                                if (neg) retLine.start = TimeSpan.Parse(buff.Replace("-", String.Empty)).Negate();
-                                else retLine.start = TimeSpan.Parse(buff);
-                                break;
-                            case 2:
-                                if (neg) retLine.end = TimeSpan.Parse(buff.Replace("-", String.Empty)).Negate();
-                                else retLine.end = TimeSpan.Parse(buff);
-                                break;
-                            case 3:
-                                retLine.style = Form1.styleColl.Find(delegate(Style s) { return s.Equals(buff); });
-                                if (retLine.style == null) retLine.style = new Style(buff);
-                                break;
-                            case 4:
-                                retLine.actor = buff;
-                                break;
-                            case 5:
-                                retLine.marginl = int.Parse(buff, Util.cfi);
-                                break;
-                            case 6:
-                                retLine.marginr = int.Parse(buff, Util.cfi);
-                                break;
-                            case 7:
-                                retLine.margint = int.Parse(buff, Util.cfi);
-                                break;
-                            case 8:
-                                if (Form1.sver < 6) retLine.effect = buff;
-                                else retLine.marginb = int.Parse(buff, Util.cfi);
-                                break;
-                            case 9:
-                                retLine.effect = buff;
-                                break;
-                        }
-                        pos += 1;
-                        buff = string.Empty;
-                        neg = false;
-                    }
-                    else if ((pos != 0 || char.IsDigit(linechar[index])) && (pos == 3 || pos == 4 || pos >= 8 || !char.IsWhiteSpace(linechar[index]))) {
-                        buff += linechar[index];
-                        neg = neg || (linechar[index] == '-');
-                    }
-                }
-                retLine.text = buff;
-                return retLine;
-            } catch {
-                throw new FormatException();
-            }
-        }
-        public DialogueLine() { }
-        public DialogueLine(TimeSpan StartTime, TimeSpan EndTime, Style Style) {
-            start = StartTime;
-            end = EndTime;
-            style = Style;
-        }
-        public DialogueLine(string Text) {
-            text = Text;
-        }
-        public DialogueLine(Style Style, string Text) : this(Text) {
-            style = Style;
-        }
-    }
-    public class Line : IEquatable<Line>, ICloneable  {
-        public LineType lineType;
-        public object line;
-        public bool enabled, selected;
-
-        public Line() {
-            this.enabled = true;
-        }
-
-        public static LineType getLineType(string theLine) {
-            if (theLine.Length > 20 && String.Compare(theLine.Substring(0, 9), "dialogue:", true, Util.cfi) == 0)
-                return LineType.dialogue;
-            else if (theLine.Length > 8 && String.Compare(theLine.Substring(0, 8), "comment:", true, Util.cfi) == 0)
-                return LineType.comment;
-            else if (theLine.Length > 20 && String.Compare(theLine.Substring(0, 6), "style:", true, Util.cfi) == 0)
-                return LineType.style;
-            else
-                return LineType.other;
-        }
-        public static Line ParseLine(string inStr) {
-            Line l = new Line();
-            l.lineType = getLineType(inStr);
-            switch (l.lineType) {
-                case LineType.dialogue:
-                    try {
-                        l.line = DialogueLine.ParseLine(inStr, LineType.dialogue);
-                    } catch {
-                        l.lineType = LineType.error;
-                        l.line = inStr;
-                    }
-                    break;
-                case LineType.style:
-                    try {
-                        Style s = Style.ParseStyle(inStr);
-                        l.line = s;
-                        Form1.styleColl.Add(s);
-                    } catch {
-                        l.lineType = LineType.error;
-                        l.line = inStr;
-                    }
-                    break;
-                default:
-                    if (inStr.Length > 8 && String.Compare(inStr.Substring(0, 7), "playres", true, Util.cfi) == 0) {
-                        switch (inStr.ToCharArray()[7]) {
-                            case 'x':
-                            case 'X':
-                                Form1.ResX = int.Parse(inStr.Substring(9, inStr.Length - 9), Util.cfi);
-
-                                break;
-                            case 'y':
-                            case 'Y':
-                                Form1.ResY = int.Parse(inStr.Substring(9, inStr.Length - 9), Util.cfi);
-                                break;
-                        }
-                    }
-                    else if (inStr.Length > 10 && String.Compare(inStr.Substring(0, 10), "scripttype", true, Util.cfi) == 0) {
-                        //TODO: Improve this detection
-                        inStr = inStr.TrimEnd();
-                        if (inStr.EndsWith("+=1")) Form1.sver = 6;
-                        else if (inStr.EndsWith("+")) Form1.sver = 5;
-                        else Form1.sver = 4;
-                    }
-                    l.line = inStr;
-                    break;
-            }
-            return l;
-        }
-
-        bool System.IEquatable<Line>.Equals(Line line) {
-            return this.line==line.line;
-        }
-
-        public override int GetHashCode() {
-            return base.GetHashCode();
-        }
-
-        public Object Clone() {
-            Line retLine = new Line();
-            retLine.enabled = this.enabled;
-            retLine.lineType = this.lineType;
-            if (this.lineType == LineType.dialogue)
-                retLine.line = ((DialogueLine)line).Clone();
-            else if (this.lineType == LineType.style)
-                retLine.line = ((Style)line).Clone();
-            else
-                retLine.line = this.line;
-
-            return retLine;
-        }
-
-        public override string ToString() {
-            return line.ToString();
-        }
-
-    }
-}

SSATool/ListViewES.cs

@@ -1,368 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Drawing;
-using System.Data;
-using System.Windows.Forms;
-//using System.ComponentModel.Design;
-//using System.Windows.Forms.Design;
-//using System.Drawing.Design;
-
-namespace SSATool {
-	/// <summary>
-	/// Summary description for ListViewES.
-	/// </summary>
-	public class ListViewES : System.Windows.Forms.ListView {
-        
-		private System.Windows.Forms.TextBox textBox1;
-        private ComboBox comboBox1;
-
-        
-
-		private System.ComponentModel.Container components = null;
-        #region Component Designer generated code
-        /// <summary> 
-        /// Required method for Designer support - do not modify 
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent() {
-            this.textBox1 = new System.Windows.Forms.TextBox();
-            this.comboBox1 = new System.Windows.Forms.ComboBox();
-            this.SuspendLayout();
-            // 
-            // textBox1
-            // 
-            this.textBox1.BorderStyle = System.Windows.Forms.BorderStyle.None;
-            this.textBox1.Enabled = false;
-            this.textBox1.Location = new System.Drawing.Point(17, 17);
-            this.textBox1.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
-            this.textBox1.Name = "textBox1";
-            this.textBox1.Size = new System.Drawing.Size(20, 13);
-            this.textBox1.TabIndex = 1;
-            this.textBox1.Visible = false;
-            this.textBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
-            // 
-            // comboBox1
-            // 
-            this.comboBox1.Cursor = System.Windows.Forms.Cursors.Default;
-            this.comboBox1.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
-            this.comboBox1.Enabled = false;
-            this.comboBox1.ImeMode = System.Windows.Forms.ImeMode.Disable;
-            this.comboBox1.IntegralHeight = false;
-            this.comboBox1.Location = new System.Drawing.Point(32, 32);
-            this.comboBox1.Margin = new System.Windows.Forms.Padding(1);
-            this.comboBox1.Name = "comboBox1";
-            this.comboBox1.Size = new System.Drawing.Size(121, 21);
-            this.comboBox1.TabIndex = 0;
-            this.comboBox1.Visible = false;
-            this.comboBox1.Leave += new System.EventHandler(this.ListViewES_Leave);
-            this.comboBox1.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox1_KeyPress);
-            // 
-            // ListViewES
-            // 
-            this.Controls.Add(this.textBox1);
-            this.Controls.Add(this.comboBox1);
-            this.LabelEdit = true;
-            this.Size = new System.Drawing.Size(992, 616);
-            this.View = System.Windows.Forms.View.Details;
-            this.MouseUp += new System.Windows.Forms.MouseEventHandler(this.ListViewES_MouseUp);
-            
-            this.Leave += new System.EventHandler(this.ListViewES_Leave);
-            this.ResumeLayout(false);
-            this.PerformLayout();
-
-        }
-
-        #endregion
-
-		public event LabelSubEditEventHandler SubItemClicked;
-		public event LabelSubEditEventHandler SubItemBeginEditing;
-		public event LabelSubEditEndEventHandler SubItemEndEditing;
-        public event ScrollEventHandler OnScroll;
-
-		public ListViewES()	{
-			InitializeComponent();
-            //this.SetStyle(ControlStyles.DoubleBuffer | ControlStyles.OptimizedDoubleBuffer | ControlStyles.AllPaintingInWmPaint, true);
-
-            this.DoubleBuffered = true;
-		}
-
-
-        protected override void Dispose(bool disposing) {
-            if (disposing) {
-                if (components != null) {
-                    components.Dispose();
-                }
-            }
-            base.Dispose(disposing);
-        }
-
-        public new void SetStyle(System.Windows.Forms.ControlStyles flag, bool value) {
-            base.SetStyle(flag, value);
-        }
-
-		private ListViewItem item;
-		private int subItemIndex;
-        private Control c;
-
-        public int ItemsOnScreen {
-            get {
-                Rectangle tib = this.TopItem.Bounds;
-                int offH = this.Height - tib.Top;
-                int height = tib.Height;
-                int num = Convert.ToInt32(Math.Floor((float)offH / height),Util.nfi);
-                return num;
-            }
-        }
-
-
-        public void StartEditing(ListViewItem item, int subitem) {
-            if (c != null) EndEditing(true);
-            this.item = item;
-            this.subItemIndex = subitem;
-            c = (Control) this.textBox1;
-            StartEditingHelper();
-        }
-
-        public void StartEditing(ListViewItem item, int subitem, string[] ComboChoices) {
-            if (c != null) EndEditing(true);
-            this.item = item;
-            this.subItemIndex = subitem;
-            c = (Control)this.comboBox1;
-            comboBox1.Items.Clear();
-            comboBox1.Items.AddRange(ComboChoices);
-            StartEditingHelper();
-        }
-
-        private void StartEditingHelper() {
-            this.SuspendLayout();
-            c.Enabled = true;
-            PositionControl();
-            c.Text = item.SubItems[subItemIndex].Text;
-            c.Show();
-            c.Focus();
-            this.ResumeLayout(true);
-        }
-
-        private void PositionControl() {
-            if (c != null) {
-                c.Bounds = this.GetSubItemBounds(item, subItemIndex);
-                //if (GridLines == true) c.Height -= 1;
-
-                if (this.CheckBoxes==true && subItemIndex==0) {
-                    c.Left += 20;
-                    c.Width -= 22;
-                }
-                else {
-                    c.Left += 4;
-                    c.Width -= 6;
-                }
-            }
-        }
-
-		private void EndEditing(bool saveValue) {
-			if ((item != null) && (subItemIndex != -1)) {
-				this.SuspendLayout();
-				if (saveValue) item.SubItems[subItemIndex].Text = c.Text;
-                if (SubItemEndEditing != null) 
-                    this.SubItemEndEditing(this,
-                         new LabelSubEditEndEventArgs(item, subItemIndex, 
-                             item.SubItems[subItemIndex].Text, !saveValue));
-				this.item = null;
-				this.subItemIndex = -1;
-
-				c.Text = String.Empty;
-				c.Hide();
-				c.Enabled = false;
-				this.ResumeLayout(true);
-				saveValue = true;
-                c = null;
-			}
-		}
-
-		private void textBox1_KeyPress(object sender, KeyPressEventArgs e) {
-			if (e.KeyChar == (char)(int)Keys.Enter) {
-				EndEditing(true);
-				e.Handled = true;
-			}
-			else if (e.KeyChar == (char)(int)Keys.Escape) {
-				EndEditing(false);
-				e.Handled = true;
-			}
-		}
-
-		private void ListViewES_MouseUp(object sender, MouseEventArgs e) {
-            if (c != null) EndEditing(true);
-			if (this.View==System.Windows.Forms.View.Details) {
-				int index;
-				ListViewItem lvi;
-
-				index = this.GetSubItemAt(e.X,e.Y,out lvi);
-
-				if ((index != -1) && ((this.CheckBoxes == false) || (e.X > 15))) {
-                    LabelSubEditEventArgs lsa = new LabelSubEditEventArgs(lvi, index);
-                    if (SubItemBeginEditing != null) this.SubItemBeginEditing(this, lsa);
-                    if (SubItemClicked != null) this.SubItemClicked(this, lsa);
-                    else if (this.LabelEdit == true) this.StartEditing(lvi, index);
-				}
-			}
-		}
-
-		public int GetSubItemAt(int x, int y, out ListViewItem item) {
-			if (this.Items.Count != 0) {
-                Rectangle tib = this.TopItem.Bounds;
-                int left = tib.Left;
-                if (left < 0) {
-                    item = null;
-                    return -1;
-                }
-                int offH = this.Height - tib.Top;
-				int top = this.TopItem.Index;
-                int height = tib.Height;
-				int bottom = top + Convert.ToInt32(Math.Floor((float)offH / (float)height),Util.nfi);
-				int row = top - 1 + Convert.ToInt32((((float)bottom - top) * ((float)y / offH)),Util.nfi);
-
-				if ((row < this.Items.Count) && (row >= 0)) {
-
-					for(int column=0;column<this.Columns.Count;column+=1) {
-						left += this.Columns[column].Width;
-						if (x <= left) { item = this.Items[row]; return column;}
-					}
-				}
-			}
-			item = null;
-			return -1;
-		}
-
-		public Rectangle GetSubItemBounds(ListViewItem Item, int SubItem) {
-			if (SubItem >= this.Columns.Count)
-				throw new IndexOutOfRangeException("SubItem " + SubItem + " out of range");
-			else if (Item == null)
-                return Rectangle.Empty; // throw new ArgumentNullException("Item");
-
-			int top, left, width, height;
-			//Item.EnsureVisible();
-            Rectangle bounds = Item.GetBounds(ItemBoundsPortion.Entire);
-			top = bounds.Top;
-			width = this.Columns[SubItem].Width;
-            height = bounds.Height;
-
-            left = bounds.Left;
-			for(int index=0;index<SubItem;index+=1)
-				left += this.Columns[index].Width;
-
-			return new Rectangle(new Point(left,top),new Size(width,height));
-		}
-        
-        /// <summary>
-        /// Used to recreate the list items when columns are modified
-        /// </summary>
-		public void RecopyListItems() {
-			this.BeginUpdate();
-			string[] news;
-            ListViewItem lvi;
-			for(int outerindex=0; outerindex!=this.Items.Count; outerindex+=1) {
-                lvi = this.Items[outerindex];
-				news = new string[this.Columns.Count];
-
-				// Can't copy more parameters than in the old one, 
-				//  and can't copy more than the new one can store
-				for(int index=0;index!=lvi.SubItems.Count&&index!=news.Length;index+=1) {
-					news[index] = lvi.SubItems[index].Text;
-				}
-				this.Items[outerindex] = new ListViewItem(news);
-			}
-			this.EndUpdate();
-		}
-
-		private void ListViewES_Leave(object sender, EventArgs e) {
-			EndEditing(true);
-		}
-        //[Category("Action")]
-        //public event ScrollEventHandler Scrolled = null;
-
-		[Serializable]
-			public delegate void LabelSubEditEventHandler(
-			object sender,
-			LabelSubEditEventArgs e
-			);
-
-		[Serializable]
-			public delegate void LabelSubEditEndEventHandler(
-			object sender,
-			LabelSubEditEndEventArgs e
-			);
-
-		public class LabelSubEditEventArgs : EventArgs {
-			private int _subIndex;
-			private ListViewItem _item;
-
-			public LabelSubEditEventArgs(ListViewItem lvi, int subItem) {
-				_subIndex = subItem;
-				_item = lvi;
-			}
-
-			public ListViewItem Item {
-				get { return _item; }
-			}
-
-			public int SubIndex {
-				get { return _subIndex; }
-			}
-		}
-
-		public class LabelSubEditEndEventArgs : LabelSubEditEventArgs {
-			string _text;
-			bool _cancel;
-
-			public LabelSubEditEndEventArgs(ListViewItem lvi, int subItem, string text, bool cancel) :
-			base(lvi,subItem) {
-				_text = text;
-				_cancel = cancel;
-			}
-
-			public bool Cancel {
-				get { return _cancel; }
-			}
-
-			public string Text {
-				get { return _text; }
-			}
-		} 
-
-        private const int WM_HSCROLL = 0x114;
-        private const int WM_VSCROLL = 0x115;
-        
-        protected override void WndProc(ref System.Windows.Forms.Message msg) {
-            
-            if ((msg.Msg == WM_HSCROLL) || (msg.Msg == WM_VSCROLL)) {
-                if (c!=null) PositionControl();
-                if (OnScroll != null) OnScroll(this,new ScrollEventArgs(ScrollEventType.EndScroll,0,0,(msg.Msg == WM_HSCROLL)?ScrollOrientation.HorizontalScroll:ScrollOrientation.VerticalScroll));
-                base.WndProc(ref msg);
-            }
-            
-            else base.WndProc(ref msg);
-        }
-    }
-}

SSATool/ManualTransform.cs

@@ -1,180 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Text;
-using System.Windows.Forms;
-
-namespace SSATool {
-	public class ManualTransform {
-
-		public static MTVars ListViewToMTV(ListView lv) {
-			double expbase, opt;
-			MTVars mtv = new MTVars();
-			MTVars.MTVariable mtvar;
-            ListViewItem lvi;
-			string text;
-
-			for(int lvindex=0;lvindex!=lv.Items.Count;lvindex+=1){
-                lvi = lv.Items[lvindex];
-				mtvar = new MTVars.MTVariable(lvi.Text);
-				for(int index=1;index<lvi.SubItems.Count;index+=2) {
-					text = lvi.SubItems[index].Text;
-					if (double.TryParse(text,out opt)) mtvar.AddOption(opt);
-					else mtvar.AddOption(text);
-				}
-				for(int index=2;index<lvi.SubItems.Count;index+=2) {
-					text = lvi.SubItems[index].Text.ToLower(Util.cfi);
-					Util.ScaleRatioS srs = new Util.ScaleRatioS();
-					expbase = 1;
-
-                    if (double.TryParse(text, out opt)) {
-						srs.srt = Util.ScaleRatioType.Polynomial;
-						expbase = opt;
-					}
-					if ((text.StartsWith("log")) && (double.TryParse(text.Substring(3,text.Length-3), out opt))) {
-						srs.srt = Util.ScaleRatioType.Logarithmic;
-						expbase = opt;
-					}
-                    else if ((text.StartsWith("exp")) && (double.TryParse(text.Substring(3, text.Length-3), out opt))) {
-						srs.srt = Util.ScaleRatioType.Exponential;
-						expbase = opt;
-					}
-
-					srs.expbase = expbase;
-					mtvar.AddAccel(srs);
-				}
-				mtv.AddVariable(mtvar);
-			}
-			return mtv;
-		}
-
-		public static string DoTransform(List<TimeSpan> TransformTimes, MTVars Vars, string Code, double FrameRate) {
-			double fp = 1.0/FrameRate;
-			double ratio;
-			TimeSpan frame = TimeSpan.FromSeconds(fp);
-			TimeSpan curtime;
-			StringBuilder sb = new StringBuilder(6144);
-            MTVars.MTVariable mtv;
-			string rep, repwith, output;
-			int index, windex, comp;
-
-			/* The times are already sorted because the listbox is sorted.
-				 * We'll loop from the first time to the last time
-				 * and figure out which section we're in then.
-				 * I'm doing this because rounding problems could otherwise
-				 * cause us to miss a frame between sections or give us an
-				 * invalid offset (for example, each frame was .02 seconds off in time)
-				 */
-
-			index = windex = 0;
-            curtime = TransformTimes[0];
-            TransformTimes[TransformTimes.Count-1].Add(frame);
-			while(curtime.CompareTo(TransformTimes[TransformTimes.Count-1]) == -1) {
-				// Find out what zone we're in (0-based)
-				while((comp = curtime.CompareTo(TransformTimes[windex])) == -1)
-					windex+=1;
-
-				sb.Append(
-                    Code.Replace("%starttime%",
-                    Util.TimeSpanSSA(
-                        (index==0&&curtime.CompareTo(TimeSpan.Zero)==-1)?TimeSpan.Zero:curtime,false,1))
-					.Replace("%endtime%",Util.TimeSpanSSA(curtime=curtime.Add(frame),false,1))
-					); // curtime is incremented in the line above this, notice the single equals
-
-
-                for(int mtindex=0;mtindex!=Vars.Count;mtindex+=1){
-                    mtv = Vars.GetVariable(mtindex);
-					ratio = Convert.ToDouble(curtime.Subtract(TransformTimes[0]).Ticks,Util.nfi)
-                        / Convert.ToDouble(((TransformTimes[windex+1]).Subtract(frame.Add(TransformTimes[windex]))).Ticks,Util.nfi);
-
-					rep = "%" + mtv.Name + "%";
-					repwith = mtv.Value(windex,ratio).ToString();
-
-
-					sb.Replace(rep,repwith);
-				}
-                sb.AppendLine();
-
-				index+=1;
-			}
-			output = sb.ToString().TrimEnd();
-			if (Code.Contains("$")) return Evaluate.ScriptParse(output);
-			return output;
-		}
-		public class MTVars {
-			private List<MTVariable> varList;
-
-			public MTVars() {
-				varList = new List<MTVariable>(4);
-			}
-
-			public int Count {
-				get { return varList.Count; }
-			}
-
-			public void AddVariable(MTVariable mtvar) {
-				varList.Add(mtvar);
-			}
-
-			public MTVariable GetVariable(int index) {
-				return varList[index];
-			}
-	
-			public class MTVariable {
-				private ArrayList optList;
-				private List<Util.ScaleRatioS> accelList;
-				private string _name;
-
-				public object Value(int index) {
-					return optList[index];
-				}
-
-				public object Value(int index, double ratio) {
-					if ((optList[index] is string) || (optList[index+1] is string))
-						return optList[index];
-					else return (double)optList[index] + Util.ScaleRatio(ratio,accelList[index])
-						 *((double)optList[index+1]-(double)optList[index]);
-				}
-
-				public MTVariable(string name) {
-					optList = new ArrayList();
-					accelList = new List<Util.ScaleRatioS>();
-					_name = name;
-				}
-
-				public void AddOption(object opt) {
-					optList.Add(opt);
-				}
-
-				public void AddAccel(Util.ScaleRatioS srs) {
-					accelList.Add(srs);
-				}
-
-				public string Name {
-					get { return _name; }
-				}
-			}
-
-		}
-	}
-}

SSATool/Notebox.cs

@@ -1,184 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.IO;
-using System.Windows.Forms;
-using System.Xml;
-
-namespace SSATool {
-    public static class Notebox {
-        public struct NoteBox {
-            public string name;
-            public string author;
-            public string description;
-            public int resx, resy;
-            public List<NoteBoxLine> nblines;
-            public List<Style> stylelist;
-        }
-        public struct NoteBoxLine {
-            public int maxLines;
-            public List<DialogueLine> lines;
-        }
-        public static List<Notebox.NoteBox> noteBoxColl;
-        public static List<Style> nbStyleColl;
-
-        public static void readNoteBoxes() {
-            if (File.Exists("notebox.xml")) {
-                noteBoxColl = new List<NoteBox>();
-                NoteBox nb;
-                NoteBoxLine thisnbl;
-                List<NoteBoxLine> nblList;
-                List<DialogueLine> thisNoteList;
-                List<Style> slist;
-                int stylever, lsetindex;
-                Form1.FormMain.cmbNBStyle.Items.Clear();
-
-                XmlDocument xDocM = new XmlDocument();
-                try {
-                    xDocM.Load("notebox.xml");
-
-                    XmlNode xDoc = xDocM.SelectSingleNode("NSSA");
-                    XmlNodeList notes = xDoc.SelectNodes("Note");
-
-                    foreach (XmlNode nnode in notes) {
-                        nb = new NoteBox();
-                        slist = new List<Style>(3);
-                        nblList = new List<NoteBoxLine>(2);
-
-                        nb.name = (nnode.Attributes["name"] != null) ? nnode.Attributes["name"].Value : "Untitled";
-                        nb.author = (nnode.Attributes["author"] != null) ? nnode.Attributes["author"].Value : "Unknown";
-                        nb.description = (nnode.Attributes["desc"] != null) ? nnode.Attributes["desc"].Value : "";
-                        nb.resx = (nnode.Attributes["resx"] != null) ? int.Parse(nnode.Attributes["resx"].Value) : 640;
-                        nb.resy = (nnode.Attributes["resy"] != null) ? int.Parse(nnode.Attributes["resy"].Value) : 480;
-
-                        XmlNode styles = nnode.SelectSingleNode("Styles");
-                        stylever = (styles.Attributes["version"] != null) ? int.Parse(styles.Attributes["version"].Value) : 0;
-
-                        if (styles != null) {
-                            XmlNodeList stylelist = styles.SelectNodes("Style");
-                            foreach (XmlNode style in stylelist) {
-                                slist.Add(Style.ParseStyle(style.InnerText, stylever));
-                            }
-                        }
-                        nb.stylelist = slist;
-
-                        XmlNodeList lsets = nnode.SelectNodes("LSet");
-                        for (lsetindex = 0; lsetindex != lsets.Count; lsetindex+=1) {
-                            XmlNode lsnode = lsets[lsetindex];
-
-                            thisNoteList = new List<DialogueLine>(16);
-                            XmlNodeList lines = lsnode.SelectNodes("line");
-                            foreach (XmlNode lnode in lines) {
-                                if (lnode.Attributes["style"]==null)
-                                    thisNoteList.Add(new DialogueLine(lnode.InnerText));
-                                else
-                                    thisNoteList.Add(new DialogueLine(new Style(lnode.Attributes["style"].Value),lnode.InnerText));
-                            }
-                            thisnbl = new NoteBoxLine();
-                            thisnbl.lines = thisNoteList;
-                            thisnbl.maxLines = (lsnode.Attributes["lines"] != null) ? int.Parse(lsnode.Attributes["lines"].Value) : 1;
-                            nblList.Add(thisnbl);
-                        }
-                        nb.nblines = nblList;
-                        noteBoxColl.Add(nb);
-                        Form1.FormMain.cmbNBStyle.Items.Add(nb.name + " by " + nb.author);
-                        Form1.FormMain.cmbNBStyle.SelectedIndex = 0;
-                    }
-                } catch {
-                    MessageBox.Show("Error parsing noteboxes.");
-                }
-            }
-        }
-
-        public static void DoNotebox(string Line1, string Line2, int NoteboxIndex) {
-            double scalefactorx=0, scalefactory=0;
-            int lines = String.IsNullOrEmpty(Line2) ? 1 : 2;
-            NoteBox nb = noteBoxColl[NoteboxIndex];
-            NoteBoxLine nbl = nb.nblines.Find(delegate(NoteBoxLine n) { return n.maxLines.Equals(lines); });
-            StringBuilder sb = new StringBuilder(1024);
-            TimeSpan startTime, endTime;
-            Line line;
-            DialogueLine dl;
-            nbStyleColl = new List<Style>(4);
-
-            if (Form1.ResX > 0 && nb.resx > 0) scalefactorx = ((double)Form1.ResX / nb.resx);
-            if (Form1.ResY > 0 && nb.resy > 0) scalefactory = ((double)Form1.ResY / nb.resy);
-            if (scalefactorx == 0 && scalefactory != 0) scalefactorx = scalefactory;
-            else if (scalefactory == 0 && scalefactorx != 0) scalefactory = scalefactorx;
-            else if ((scalefactorx+scalefactory)==0) scalefactorx = scalefactory = 1.0;
-
-            startTime = TimeSpan.Parse(Form1.FormMain.maskedTextNBStart.Text);
-            endTime = TimeSpan.Parse(Form1.FormMain.maskedTextNBEnd.Text);
-
-            Resscale rs = new Resscale(scalefactorx,scalefactory);
-
-
-            for (int index = 0; index != nbl.lines.Count; index+=1) {
-                line = new Line();
-                line.lineType = LineType.dialogue;
-                dl = (DialogueLine)(nbl.lines[index].Clone());
-                dl.start = startTime;
-                dl.end = endTime;
-                line.line = dl;
-                dl.text = dl.text.Replace("%line1%",Line1).Replace("%line2%",Line2);
-                dl = rs.ScaleDialogue(dl);
-
-                dl.style = nb.stylelist.Find(delegate(Style s) { return s.name.Equals(dl.style.name); });
-                dl.style = (Style)(dl.style.Clone());
-                if (nbStyleColl.Contains(dl.style) == false) nbStyleColl.Add(rs.ScaleStyle(dl.style));
-                sb.AppendLine(dl.ToString());
-            }
-            Form1.FormMain.textNBOut.Text = sb.ToString().TrimEnd();
-            
-            sb = new StringBuilder(1024);
-            for (int index = 0; index != nb.stylelist.Count; index+=1)
-                sb.AppendLine(nb.stylelist[index].ToString());
-            Form1.FormMain.textNBStyles.Text = sb.ToString().TrimEnd();
-        }
-
-        public static void CopyStyles() {
-            int styleLine = -1;
-            Line newLine;
-
-            for (int index = 0; index != Form1.lineColl.Count; index+=1) {
-                if (Form1.lineColl[index].lineType == LineType.style) {
-                    styleLine = index;
-                    break;
-                }
-            }
-            if (styleLine != -1) {
-                for (int index = 0; index != nbStyleColl.Count; index+=1) {
-                    if (Form1.styleColl.Contains(nbStyleColl[index]) == false) {
-                        newLine = new Line();
-                        newLine.lineType = LineType.style;
-                        newLine.line = nbStyleColl[index];
-                        Form1.lineColl.Insert(styleLine, newLine);
-                        Form1.styleColl.Add(nbStyleColl[index]);
-                    }
-                }
-                Form1.FormMain.ExtractStyles();
-            }
-
-        }
-    }
-}

SSATool/Resscale.cs

@@ -1,181 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace SSATool {
-    public class Resscale {
-        public static Regex rscale = new Regex(@"(\\[a-zA-Z]+\(?)([0-9,\-]+)", RegexOptions.IgnoreCase | RegexOptions.Singleline);
-        public static Regex rscaledrawing = new Regex(@"{.*\\p(?<scale>\d+)(.*?((\s*(c|([mnlbsp](\s+(?<num>\d+\.?\d*))+)))+))+", RegexOptions.IgnoreCase | RegexOptions.Singleline);
-        
-        public double scalefactorx, scalefactory;
-
-        StringBuilder sb;
-        GroupCollection gc;
-        Match m;
-        MatchCollection mc;
-        string[] split;
-        string linetok;
-        int lastindex, tokindex;
-        int pscale;
-        bool x; // x or y coordinate, used for drawing
-
-        public Resscale(double ScaleFactorX, double ScaleFactorY) {
-            scalefactorx = ScaleFactorX;
-            scalefactory = ScaleFactorY;
-        }
-
-        public Style ScaleStyle(Style s) {
-            //No need to scale 1:1
-            if (scalefactorx==1.0 && scalefactory==1.0) return s;
-
-            s.fontSize *= (float)scalefactory;
-            s.shadowDepth *= scalefactory;
-            s.outlineWidth *= scalefactory;
-            s.margint = Convert.ToInt32(Math.Round(s.margint * scalefactory, 0), Util.nfi);
-            s.marginb = Convert.ToInt32(Math.Round(s.marginb * scalefactory, 0), Util.nfi);
-            s.marginl = Convert.ToInt32(Math.Round(s.marginl * scalefactorx, 0), Util.nfi);
-            s.marginr = Convert.ToInt32(Math.Round(s.marginr * scalefactorx, 0), Util.nfi);
-            return s;
-        }
-
-        public DialogueLine ScaleDialogue(DialogueLine dl) {
-            //No need to scale 1:1
-            if (scalefactorx==1.0 && scalefactory==1.0) return dl;
-
-            sb = new StringBuilder(1024);
-            linetok = dl.text;
-
-            lastindex = 0;
-            mc = rscale.Matches(linetok);
-            for (int mindex = 0; mindex != mc.Count; mindex+=1) {
-                m = mc[mindex];
-                if (m.Index > lastindex)
-                    sb.Append(linetok.Substring(lastindex, m.Index - lastindex));
-
-                gc = m.Groups; //gc[1] is the command with parenthesis, gc[2] is all the params
-                sb.Append(gc[1]);
-
-                switch (gc[1].Value) {
-                    case "\\pos(":
-                        split = gc[2].Value.Split(",".ToCharArray());
-                        sb.Append(String.Format("{0},{1}",
-                            Math.Round((double.Parse(split[0], Util.nfi) * scalefactorx), 0),
-                            Math.Round((double.Parse(split[1], Util.nfi) * scalefactory), 0)));
-                        break;
-
-                    case "\\org(":
-                        split = gc[2].Value.Split(",".ToCharArray());
-                        sb.Append(String.Format("{0},{1}",
-                            Math.Round((double.Parse(split[0], Util.nfi) * scalefactorx), 0),
-                            Math.Round((double.Parse(split[1], Util.nfi) * scalefactory), 0)));
-                        break;
-
-                    case "\\clip(":
-                        split = gc[2].Value.Split(",".ToCharArray());
-
-                        // if it doesn't have 4 tokens, it's either malformed or a drawing type clip
-                        //  and if it's a drawing type clip, the drawing itself will be caught later
-                        if (split.Length == 4) {
-                            try {
-                                String.Format("{0},{1},{2},{3}",
-                                    Math.Round((double.Parse(split[0], Util.cfi) * scalefactorx), 0),
-                                    Math.Round((double.Parse(split[1], Util.cfi) * scalefactory), 0),
-                                    Math.Round((double.Parse(split[2], Util.cfi) * scalefactorx), 0),
-                                    Math.Round((double.Parse(split[3], Util.cfi) * scalefactory), 0));
-                            } catch { }
-                        }
-                        break;
-
-                    case "\\move(":
-                        split = gc[2].Value.Split(",".ToCharArray());
-
-                        tokindex = 0;
-                        for (tokindex = 0; tokindex != split.Length; tokindex+=1) {
-                            if (tokindex != 1) sb.Append(",");
-                            if (tokindex < 5)
-                                //Tokens will alternate x and y, so tokindex&1==0 should mean x, otherwise y
-                                sb.Append(Math.Round((double.Parse(split[tokindex], Util.cfi) * (((tokindex&1) == 0) ? scalefactorx : scalefactory)), 0));
-                            else //5 and 6 are times, don't scale them
-                                sb.Append(split[tokindex]);
-                        }
-                        break;
-
-                    case "\\bord":
-                        sb.Append(Math.Round((double.Parse(gc[2].Value, Util.cfi) * scalefactory), 0));
-                        break;
-
-                    case "\\shad":
-                        sb.Append(Math.Round((double.Parse(gc[2].Value, Util.cfi) * scalefactory), 0));
-                        break;
-
-                    case "\\fs":
-                        sb.Append(Math.Round((double.Parse(gc[2].Value, Util.cfi) * scalefactory), 0));
-                        break;
-
-                    case "\\fsp":
-                        sb.Append(Math.Round((double.Parse(gc[2].Value, Util.cfi) * scalefactorx), 0));
-                        break;
-
-                    case "\\pbo":
-                        sb.Append(Math.Round((double.Parse(gc[2].Value, Util.cfi) * scalefactory), 0));
-                        break;
-
-                    default:
-                        sb.Append(gc[2]); // don't know what it is, don't touch the params
-                        break;
-                }
-
-                lastindex = m.Index + m.Length;
-            }
-
-            if (linetok.Length > lastindex)
-                sb.Append(linetok.Substring(lastindex, linetok.Length - lastindex));
-
-            if (rscaledrawing.IsMatch(linetok)) { // linetok isn't current yet but it's enough to just find a match
-                linetok = sb.ToString();
-                x = true; // x first
-                sb = new StringBuilder(1024);
-                lastindex = 0;
-                mc = rscaledrawing.Matches(linetok);
-                for (int mindex = 0; mindex != mc.Count; mindex+=1) {
-                    m = mc[mindex];
-                    pscale = int.Parse(m.Groups["scale"].Value);
-                    foreach (Capture c in m.Groups["num"].Captures) {
-                        if (c.Index > lastindex)
-                            sb.Append(linetok.Substring(lastindex, c.Index - lastindex));
-                        sb.Append((pscale > 0) ? Math.Round(double.Parse(c.Value) * (x ? scalefactorx : scalefactory), 0).ToString(Util.cfi) : c.Value);
-                        x = !x; // Alternate X and Y
-                        lastindex = c.Index + c.Length;
-                    }
-                }
-
-                if (linetok.Length > lastindex)
-                    sb.Append(linetok.Substring(lastindex, linetok.Length - lastindex));
-            }
-
-            dl.text = sb.ToString();
-            return dl;
-        }
-    }
-}

SSATool/SSATool.csproj

@@ -1,169 +0,0 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <ProjectType>Local</ProjectType>
-    <ProductVersion>8.0.50727</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{0C46ECAB-3C2E-43E6-A039-99ADC77F50E7}</ProjectGuid>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ApplicationIcon>ssa24ov.ico</ApplicationIcon>
-    <AssemblyKeyContainerName>
-    </AssemblyKeyContainerName>
-    <AssemblyName>SSATool</AssemblyName>
-    <AssemblyOriginatorKeyFile>ssatool.snk</AssemblyOriginatorKeyFile>
-    <DefaultClientScript>JScript</DefaultClientScript>
-    <DefaultHTMLPageLayout>Grid</DefaultHTMLPageLayout>
-    <DefaultTargetSchema>IE50</DefaultTargetSchema>
-    <DelaySign>false</DelaySign>
-    <OutputType>WinExe</OutputType>
-    <RootNamespace>SSATool</RootNamespace>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <UpgradeBackupLocation>
-    </UpgradeBackupLocation>
-    <SignManifests>false</SignManifests>
-    <SignAssembly>true</SignAssembly>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <OutputPath>bin\Debug\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>true</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>full</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <OutputPath>bin\Release\</OutputPath>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <BaseAddress>285212672</BaseAddress>
-    <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <ConfigurationOverrideFile>
-    </ConfigurationOverrideFile>
-    <DefineConstants>TRACE</DefineConstants>
-    <DocumentationFile>
-    </DocumentationFile>
-    <DebugSymbols>false</DebugSymbols>
-    <FileAlignment>4096</FileAlignment>
-    <NoStdLib>false</NoStdLib>
-    <NoWarn>
-    </NoWarn>
-    <Optimize>true</Optimize>
-    <RegisterForComInterop>false</RegisterForComInterop>
-    <RemoveIntegerChecks>false</RemoveIntegerChecks>
-    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
-    <WarningLevel>4</WarningLevel>
-    <DebugType>none</DebugType>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System">
-      <Name>System</Name>
-    </Reference>
-    <Reference Include="System.Data">
-      <Name>System.Data</Name>
-    </Reference>
-    <Reference Include="System.Drawing">
-      <Name>System.Drawing</Name>
-    </Reference>
-    <Reference Include="System.Windows.Forms">
-      <Name>System.Windows.Forms</Name>
-    </Reference>
-    <Reference Include="System.Xml">
-      <Name>System.XML</Name>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Acceleration.cs" />
-    <Compile Include="AssemblyInfo.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Condition.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="ConditionDialog.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="DetectEncoding.cs" />
-    <Compile Include="Filter.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Form1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="formEffectsEditor.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="InputBox.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Layer.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Line.cs" />
-    <Compile Include="ListViewES.cs">
-      <SubType>Component</SubType>
-    </Compile>
-    <Compile Include="ManualTransform.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Notebox.cs" />
-    <Compile Include="Resscale.cs" />
-    <Compile Include="SaveFileDialogWithEncoding.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Evaluate.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <Compile Include="Style.cs" />
-    <Compile Include="TimeCodes.cs" />
-    <Compile Include="Undo.cs" />
-    <Compile Include="util.cs">
-      <SubType>Code</SubType>
-    </Compile>
-    <EmbeddedResource Include="ConditionDialog.resx">
-      <DependentUpon>ConditionDialog.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Form1.ja.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.cs</DependentUpon>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <EmbeddedResource Include="formEffectsEditor.resx">
-      <DependentUpon>formEffectsEditor.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="InputBox.resx">
-      <DependentUpon>InputBox.cs</DependentUpon>
-    </EmbeddedResource>
-    <Content Include="ssa24ov.ico" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="ssatool.snk" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <PropertyGroup>
-    <PreBuildEvent>
-    </PreBuildEvent>
-    <PostBuildEvent>
-    </PostBuildEvent>
-  </PropertyGroup>
-</Project>

SSATool/SSATool.csproj.user

@@ -1,70 +0,0 @@
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <LastOpenVersion>7.10.3077</LastOpenVersion>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ReferencePath>
-    </ReferencePath>
-    <CopyProjectDestinationFolder>
-    </CopyProjectDestinationFolder>
-    <CopyProjectUncPath>
-    </CopyProjectUncPath>
-    <CopyProjectOption>0</CopyProjectOption>
-    <ProjectView>ProjectFiles</ProjectView>
-    <ProjectTrust>0</ProjectTrust>
-    <PublishUrlHistory>publish\</PublishUrlHistory>
-    <InstallUrlHistory>
-    </InstallUrlHistory>
-    <SupportUrlHistory>
-    </SupportUrlHistory>
-    <UpdateUrlHistory>
-    </UpdateUrlHistory>
-    <BootstrapperUrlHistory>
-    </BootstrapperUrlHistory>
-    <ApplicationRevision>0</ApplicationRevision>
-    <FallbackCulture>en-US</FallbackCulture>
-    <VerifyUploadedFiles>false</VerifyUploadedFiles>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <EnableASPDebugging>false</EnableASPDebugging>
-    <EnableASPXDebugging>false</EnableASPXDebugging>
-    <EnableUnmanagedDebugging>false</EnableUnmanagedDebugging>
-    <EnableSQLServerDebugging>false</EnableSQLServerDebugging>
-    <RemoteDebugEnabled>false</RemoteDebugEnabled>
-    <RemoteDebugMachine>
-    </RemoteDebugMachine>
-    <StartAction>Project</StartAction>
-    <StartArguments>
-    </StartArguments>
-    <StartPage>
-    </StartPage>
-    <StartProgram>
-    </StartProgram>
-    <StartURL>
-    </StartURL>
-    <StartWorkingDirectory>
-    </StartWorkingDirectory>
-    <StartWithIE>true</StartWithIE>
-  </PropertyGroup>
-</Project>

SSATool/SSATool.sln

@@ -1,19 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 9.00
-# Visual C# Express 2005
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SSATool", "SSATool.csproj", "{0C46ECAB-3C2E-43E6-A039-99ADC77F50E7}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{0C46ECAB-3C2E-43E6-A039-99ADC77F50E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0C46ECAB-3C2E-43E6-A039-99ADC77F50E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0C46ECAB-3C2E-43E6-A039-99ADC77F50E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0C46ECAB-3C2E-43E6-A039-99ADC77F50E7}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal

SSATool/SaveFileDialogWithEncoding.cs

@@ -1,346 +0,0 @@
-using System;
-using System.Collections;
-using System.Windows.Forms;
-using System.Data;
-using System.Text;
-using System.Runtime.InteropServices;
-using System.Drawing;
-
-
-
-public enum EncodingType {
-	//UTF8=0,
-	//UTF8WithPreamble,
-	//Unicode,
-	//Ansi
-	ANSI,
-	BigEndianUnicode,
-	Unicode,
-	UTF8,
-	Shift_JIS
-};
-
-public class SaveFileDialogWithEncoding {
-	private delegate int OFNHookProcDelegate(int hdlg, int msg, int wParam, int lParam);
-
-	private int m_LabelHandle=0;
-	private int m_ComboHandle=0;
-
-	private string m_Filter="";
-	private string m_DefaultExt="";
-
-	private string m_FileName="";
-
-	private EncodingType m_EncodingType;
-	private Screen m_ActiveScreen;
-
-	[StructLayout(LayoutKind.Sequential, CharSet=CharSet.Auto)]
-		private struct OPENFILENAME {
-		public int lStructSize; 
-		public IntPtr hwndOwner; 
-		public int hInstance; 
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrFilter;
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrCustomFilter; 
-		public int nMaxCustFilter; 
-		public int nFilterIndex; 
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrFile; 
-		public int nMaxFile; 
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrFileTitle; 
-		public int nMaxFileTitle; 
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrInitialDir; 
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrTitle; 
-		public int Flags; 
-		public short nFileOffset; 
-		public short nFileExtension; 
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpstrDefExt; 
-		public int lCustData; 
-		public OFNHookProcDelegate lpfnHook;
-		[MarshalAs(UnmanagedType.LPTStr)] public string lpTemplateName;
-		//only if on nt 5.0 or higher
-		public int pvReserved;
-		public int dwReserved;
-		public int FlagsEx;
-	}
-
-	[DllImport("Comdlg32.dll", CharSet=CharSet.Auto, SetLastError=true)]
-	private static extern bool GetSaveFileName(ref OPENFILENAME lpofn);
-
-	[DllImport("Comdlg32.dll")]
-	private static extern int CommDlgExtendedError();
-
-	[DllImport("user32.dll")]
-	private static extern bool SetWindowPos(int hWnd, int hWndInsertAfter, int X, int Y, int cx, int cy, uint uFlags);
-
-	private struct RECT {
-		public int Left;
-		public int Top;
-		public int Right;
-		public int Bottom;
-	}
-
-	private struct POINT {
-		public int X;
-		public int Y;
-	}
-
-	private struct NMHDR {
-		public int HwndFrom;
-		public int IdFrom;
-		public int Code;
-	}
-
-	[DllImport("user32.dll")]
-	private static extern bool GetWindowRect(int hWnd, ref RECT lpRect);
-
-	[DllImport("user32.dll")]
-	private static extern int GetParent(int hWnd);
-
-	[DllImport("user32.dll", CharSet=CharSet.Auto)]
-	private static extern bool SetWindowText(int hWnd, string lpString);
-
-	[DllImport("user32.dll")]
-	private static extern int SendMessage(int hWnd, int Msg, int wParam, int lParam);
-
-	[DllImport("user32.dll", CharSet=CharSet.Auto)]
-	private static extern int SendMessage(int hWnd, int Msg, int wParam, string lParam);
-
-	[DllImport("user32.dll")]
-	private static extern bool DestroyWindow(int hwnd);
-
-	private const int OFN_ENABLEHOOK=0x00000020;
-	private const int OFN_EXPLORER=0x00080000;
-	private const int OFN_FILEMUSTEXIST=0x00001000;
-	private const int OFN_HIDEREADONLY=0x00000004;
-	private const int OFN_CREATEPROMPT=0x00002000;
-	private const int OFN_NOTESTFILECREATE=0x00010000;
-	private const int OFN_OVERWRITEPROMPT=0x00000002;
-	private const int OFN_PATHMUSTEXIST=0x00000800;
-
-	private const int SWP_NOSIZE=0x0001;
-	private const int SWP_NOMOVE=0x0002;
-	private const int SWP_NOZORDER=0x0004;
-
-	private const int WM_INITDIALOG=0x110;
-	private const int WM_DESTROY=0x2;
-	private const int WM_SETFONT=0x0030;
-	private const int WM_GETFONT=0x0031;
-
-	private const int CBS_DROPDOWNLIST=0x0003;
-	private const int CBS_HASSTRINGS=0x0200;
-	private const int CB_ADDSTRING=0x0143;
-	private const int CB_SETCURSEL=0x014E;
-	private const int CB_GETCURSEL=0x0147;
-
-	private const uint WS_VISIBLE=0x10000000;
-	private const uint WS_CHILD=0x40000000;
-	private const uint WS_TABSTOP=0x00010000;
-
-	private const int CDN_FILEOK=-606;
-	private const int WM_NOTIFY=0x004E;
-
-	[DllImport("user32.dll", CharSet=CharSet.Auto)]
-	private static extern int GetDlgItem(int hDlg, int nIDDlgItem);
-
-	[DllImport("user32.dll", CharSet=CharSet.Auto)]
-	private static extern int CreateWindowEx(int dwExStyle, string lpClassName, string lpWindowName, uint dwStyle, int x, int y, int nWidth, int nHeight, int hWndParent, int hMenu, int hInstance, int lpParam);
-
-	[DllImport("user32.dll")]
-	private static extern bool ScreenToClient(int hWnd, ref POINT lpPoint);
-
-	private int HookProc(int hdlg, int msg, int wParam, int lParam) {
-		switch (msg) {
-			case WM_INITDIALOG:
-
-				//we need to centre the dialog
-				Rectangle sr=m_ActiveScreen.Bounds;
-				RECT cr=new RECT();
-				int parent=GetParent(hdlg);
-				GetWindowRect(parent, ref cr);
-
-				int x=(sr.Right + sr.Left - (cr.Right-cr.Left))/2;
-				int y=(sr.Bottom + sr.Top - (cr.Bottom-cr.Top))/2;
-
-				SetWindowPos(parent, 0, x, y, cr.Right-cr.Left, cr.Bottom - cr.Top + 32, SWP_NOZORDER);
-				
-
-				//we need to find the label to position our new label under
-
-				int fileTypeWindow=GetDlgItem(parent, 0x441);
-
-				RECT aboveRect=new RECT();
-				GetWindowRect(fileTypeWindow, ref aboveRect);
-
-				//now convert the label's screen co-ordinates to client co-ordinates
-				POINT point=new POINT();
-				point.X=aboveRect.Left;
-				point.Y=aboveRect.Bottom;
-
-				ScreenToClient(parent, ref point);
-
-				//create the label
-				int labelHandle=CreateWindowEx(0, "STATIC", "mylabel", WS_VISIBLE | WS_CHILD | WS_TABSTOP, point.X, point.Y + 12, 200, 100, parent, 0, 0, 0);
-				SetWindowText(labelHandle, "&Encoding:");
-
-				int fontHandle=SendMessage(fileTypeWindow, WM_GETFONT, 0, 0);
-				SendMessage(labelHandle, WM_SETFONT, fontHandle, 0);
-
-				//we now need to find the combo-box to position the new combo-box under
-
-				int fileComboWindow=GetDlgItem(parent, 0x470);
-				aboveRect=new RECT();
-				GetWindowRect(fileComboWindow, ref aboveRect);
-
-				point=new POINT();
-				point.X=aboveRect.Left;
-				point.Y=aboveRect.Bottom;
-				ScreenToClient(parent, ref point);
-
-				POINT rightPoint=new POINT();
-				rightPoint.X=aboveRect.Right;
-				rightPoint.Y=aboveRect.Top;
-
-				ScreenToClient(parent, ref rightPoint);
-
-				//we create the new combobox
-
-				int comboHandle=CreateWindowEx(0, "ComboBox", "mycombobox", WS_VISIBLE | WS_CHILD | CBS_HASSTRINGS | CBS_DROPDOWNLIST | WS_TABSTOP, point.X, point.Y + 8, rightPoint.X-point.X, 100, parent, 0, 0, 0);
-				SendMessage(comboHandle, WM_SETFONT, fontHandle, 0);
-
-				//and add the encodings we want to offer
-				SendMessage(comboHandle, CB_ADDSTRING, 0, "ANSI");
-				SendMessage(comboHandle, CB_ADDSTRING, 0, "BigEndianUnicode");
-				SendMessage(comboHandle, CB_ADDSTRING, 0, "Unicode");
-				SendMessage(comboHandle, CB_ADDSTRING, 0, "UTF-8");
-				SendMessage(comboHandle, CB_ADDSTRING, 0, "SJIS");
-				
-				SendMessage(comboHandle, CB_SETCURSEL, (int)m_EncodingType, 0);
-
-				//remember the handles of the controls we have created so we can destroy them after
-				m_LabelHandle=labelHandle;
-				m_ComboHandle=comboHandle;
-
-				break;
-			case WM_DESTROY:
-				//destroy the handles we have created
-				if (m_ComboHandle!=0) {
-					DestroyWindow(m_ComboHandle);
-				}
-
-				if (m_LabelHandle!=0) {
-					DestroyWindow(m_LabelHandle);
-				}
-				break;
-			case WM_NOTIFY:
-
-				//we need to intercept the CDN_FILEOK message
-				//which is sent when the user selects a filename
-
-				NMHDR nmhdr=(NMHDR)Marshal.PtrToStructure(new IntPtr(lParam), typeof(NMHDR));
-
-				if (nmhdr.Code==CDN_FILEOK) {
-					//a file has been selected
-					//we need to get the encoding
-
-					m_EncodingType=(EncodingType)SendMessage(m_ComboHandle, CB_GETCURSEL, 0, 0);
-				}
-				break;
-
-		}
-		return 0;
-	}
-
-	public string DefaultExt {
-		get { return m_DefaultExt; }
-		set { m_DefaultExt=value; }
-	}
-
-	public string Filter {
-		get { return m_Filter; }
-		set { m_Filter=value; }
-	}
-
-	public string FileName {
-		get { return m_FileName; }
-		set { m_FileName=value;	}
-	}
-
-	public EncodingType EncodingType {
-		get { return m_EncodingType; }
-		set { m_EncodingType=value;	}
-	}
-
-	public DialogResult ShowDialog(IntPtr ownerhwnd, Screen ownerscreen) {
-		return ShowDialog(ownerhwnd,ownerscreen,"Unicode");
-	}
-
-	public DialogResult ShowDialog(IntPtr ownerhwnd, Screen ownerscreen, string encoding) {
-
-		//m_EncodingType = stringToEncodingType(encoding);
-
-		//set up the struct and populate it
-
-		OPENFILENAME ofn=new OPENFILENAME();
-
-		ofn.lStructSize= Marshal.SizeOf( ofn );
-		ofn.lpstrFilter= m_Filter.Replace('|', '\0') + '\0';
-
-		ofn.lpstrFile = m_FileName + new string(' ', 512);
-		ofn.nMaxFile= ofn.lpstrFile.Length;
-		ofn.lpstrFileTitle= System.IO.Path.GetFileName(m_FileName) + new string(' ', 512);
-		ofn.nMaxFileTitle = ofn.lpstrFileTitle.Length;
-		ofn.lpstrTitle= "Save file as";
-		ofn.lpstrDefExt=m_DefaultExt;
-
-		//position the dialog above the active window
-		ofn.hwndOwner=ownerhwnd;
-		
-		//we need to find out the active screen so the dialog box is
-		//centred on the correct display
-
-		m_ActiveScreen=ownerscreen;
-
-		//set up some sensible flags
-		ofn.Flags=OFN_EXPLORER |  OFN_PATHMUSTEXIST | OFN_NOTESTFILECREATE | OFN_ENABLEHOOK | OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT;
-		
-		//this is where the hook is set. Note that we can use a C# delegate in place of a C function pointer
-		ofn.lpfnHook=new OFNHookProcDelegate(HookProc);
-
-		//if we're running on Windows 98/ME then the struct is smaller
-		if (System.Environment.OSVersion.Platform!=PlatformID.Win32NT) {
-			ofn.lStructSize-=12;
-		}
-
-		//show the dialog
-
-		if (!GetSaveFileName(ref ofn)) {
-			int ret=CommDlgExtendedError();
-
-			if (ret!=0) {
-				throw new ApplicationException("Couldn't show file open dialog - " + ret.ToString());
-			}
-
-			return DialogResult.Cancel;
-		}
-
-		m_FileName=ofn.lpstrFile;
-
-		return DialogResult.OK;
-	}
-
-	public static System.Text.Encoding stringToEncodingType(string input) {
-		unsafe {
-			switch (input) {
-				case "ASCII" :              return System.Text.Encoding.ASCII;
-				case "ANSI" :               return System.Text.Encoding.GetEncoding(1252);
-				case "BigEndianUnicode" :   return System.Text.Encoding.BigEndianUnicode;
-				case "SJIS" : 
-                case "Shift_JIS" :          return System.Text.Encoding.GetEncoding("shift_jis");
-				case "UTF8" :
-				case "UTF-8" :              return System.Text.Encoding.UTF8;
-                case "Unicode" :
-				default :                   return System.Text.Encoding.Unicode;
-			}
-		}
-	}
-}
-

SSATool/Style.cs

@@ -1,214 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Drawing;
-using System.Windows.Forms;
-
-namespace SSATool {
-	/// <summary>
-	/// (A)SSA style (copied/adapted from VSFilter)
-	/// </summary>
-	public class Style : ICloneable {
-		public double       outlineWidth;
-        public double       shadowDepth;
-        public double       fontScaleX, fontScaleY; // percent
-        public double       fontSpacing;            // +/- pixels
-        public double       fontAngleZ, fontAngleX, fontAngleY;
-        public float        fontSize;
-        public string       name, fontName;
-        public Color[]      colors;                 //pri,sec,outline/bg,shadow
-        public int          marginl, marginr, margint, marginb;
-        public int          charset;
-        public int          scrAlignment;           // 1 - 9: as on the numpad, 0: default
-        public int          borderStyle;            // 0: outline, 1: opaque box
-        public bool         fBlur, fBold, fItalic, fUnderline, fStrikeOut;
-        public bool         enabled;
-        public byte         relativeTo;
-
-		public Style() {
-			// Set default values
-			name = "Default";
-			fontName = "Arial";
-			fontSize = 20;
-			colors = new System.Drawing.Color[4];
-			colors[0] = System.Drawing.Color.White;
-			colors[1] = System.Drawing.Color.FromArgb(0,0xFF,0xFF,0);
-			colors[2] = System.Drawing.Color.Black;
-			colors[3] = System.Drawing.Color.Black;
-
-            marginl = marginr = margint = marginb = 30;
-			scrAlignment = 2;
-			borderStyle = 0;
-			outlineWidth = 2;
-			shadowDepth = 3;
-			fontScaleX = fontScaleY = 100.0;
-			fontSpacing = 0;
-			fBlur = fBold = fItalic = fUnderline = false;
-			fontAngleZ = fontAngleX = fontAngleY = 0;
-            enabled = true;
-		}
-
-        public Style(string Name) : this() {
-            this.name=Name;
-        }
-
-        public Object Clone() {
-            return this.MemberwiseClone();
-        }
-
-        public Font GetFont() {
-            float size = (float)fontSize;
-            Font prelim = new Font(fontName, size);
-            FontFamily ff = prelim.FontFamily;
-            FontStyle fs = FontStyle.Regular;
-            if (fBold) fs |= FontStyle.Bold;
-            if (fItalic) fs |= FontStyle.Italic;
-            if (fUnderline) fs |= FontStyle.Underline;
-            if (fStrikeOut) fs |= FontStyle.Strikeout;
-            
-            bool vsfilter=true;
-            bool scaledpi=false;
-            if (vsfilter)
-                size *= ff.GetEmHeight(fs) / (ff.GetCellAscent(fs) + ff.GetCellDescent(fs));
-            if (scaledpi)
-                size*=(72.0f/Form1.listSSAg.DpiY);
-            
-            return new System.Drawing.Font(fontName, size, fs);
-        }
-
-        public Rectangle GetMarginRect() {
-            if (Form1.sver <= 5) marginb = margint;
-            return new Rectangle(marginl,marginr,Form1.ResX-(marginl+marginr),Form1.ResY-(margint+marginb));
-        }
-
-
-		public override bool Equals(object obj) {
-            if (obj is Style) {
-                Style s = (Style)obj;
-                return ((String.Equals(this.fontName, s.fontName, StringComparison.OrdinalIgnoreCase)) &&
-                                        (this.fontSize.Equals(s.fontSize)) &&
-                                        (this.fItalic.Equals(s.fItalic)) &&
-                                        (this.fUnderline.Equals(s.fUnderline)) &&
-                                        (this.fStrikeOut.Equals(s.fStrikeOut)) &&
-                                        (this.colors[0].Equals(s.colors[0])) &&
-                                        (this.colors[1].Equals(s.colors[1])) &&
-                                        (this.colors[2].Equals(s.colors[2])) &&
-                                        (this.colors[3].Equals(s.colors[3])) &&
-                                        (this.scrAlignment == s.scrAlignment) &&
-                                        (this.borderStyle == s.borderStyle) &&
-                                        (this.outlineWidth == s.outlineWidth) &&
-                                        (this.shadowDepth == s.shadowDepth) &&
-                                        (this.fontScaleX == s.fontScaleX) &&
-                                        (this.fontScaleY == s.fontScaleY) &&
-                                        (this.fontSpacing == s.fontSpacing) &&
-                                        (this.fBold == s.fBold) &&
-                                        (this.fBlur == s.fBlur) &&
-                                        (this.fontAngleZ == s.fontAngleZ) &&
-                                        (this.fontAngleX == s.fontAngleX) &&
-                                        (this.fontAngleY == s.fontAngleY));
-            }
-            else if (obj is string) return (String.Equals(this.name, (string)obj, StringComparison.OrdinalIgnoreCase));
-            else return false;
-		}
-
-		public override int GetHashCode() {
-			return base.GetHashCode ();
-		}
-
-        public override string ToString() {
-            uint andMask = (Form1.sver==4)?0xFFFFFF:0xFFFFFFFF; // cut out alpha if v4 with this and
-
-            string retStr = String.Format("Style: {0},{1},{2},&H{3:X6}&,&H{4:X6}&,&H{5:X6}&,&H{6:X6}&,{7},{8},",
-                              this.name, this.fontName, this.fontSize, this.colors[0].ToArgb()&andMask,
-                              this.colors[1].ToArgb()&andMask, this.colors[2].ToArgb()&andMask,
-                              this.colors[3].ToArgb()&andMask, (this.fBold ? "-1" : "0"), (this.fItalic ? "-1" : "0"));
-
-            if (Form1.sver >= 5) {
-                 retStr = String.Format("{0}{1},{2},{3},{4},{5},{6},",
-                             retStr,
-                             (this.fUnderline ? "-1" : "0"),
-                             (this.fStrikeOut ? "-1" : "0"),
-                             this.fontScaleX, this.fontScaleY,
-                             this.fontSpacing, this.fontAngleZ);
-            }
-
-            retStr += String.Format("{0},{1},{2},{3},{4:G4},{5:G4},{6:G4},",
-                        this.borderStyle, this.outlineWidth, this.shadowDepth,
-                        this.scrAlignment, this.marginl, this.marginr, this.margint);
-
-            if (Form1.sver >= 6) retStr += Convert.ToString(this.marginb,Util.cfi) + ",";
-            else if (Form1.sver == 4) retStr += Convert.ToString(this.colors[0].A,Util.cfi) + ",";
-            retStr += Convert.ToString(this.charset,Util.cfi);
-            if (Form1.sver >= 6) retStr += "," + this.relativeTo.ToString(Util.cfi);
-
-            return retStr;
-        }
-
-        public static Style ParseStyle(string inStr) {
-            return ParseStyle(inStr, Form1.sver);
-        }
-
-        public static Style ParseStyle(string inStr, int scriptVer) {
-            int startpos = inStr.IndexOf(':')+1;
-            string[] xInfo = inStr.Substring(startpos,inStr.Length-startpos).TrimStart().Split(",".ToCharArray());
-            Style style = new Style();
-            int index;
-            uint alpha = (scriptVer != 4 ? 0 : (Util.ReadColor(xInfo[16]) << 24));
-            style.name = xInfo[0];
-            style.fontName = xInfo[1];
-            style.fontSize = float.Parse(xInfo[2]);
-            style.colors[0] = Util.uintToColor(Util.ReadColor(xInfo[3])+alpha);
-            style.colors[1] = Util.uintToColor(Util.ReadColor(xInfo[4])+alpha);
-            style.colors[2] = Util.uintToColor(Util.ReadColor(xInfo[5])+alpha);
-            style.colors[3] = Util.uintToColor(Util.ReadColor(xInfo[6])+alpha);
-            style.fBold = !String.Equals(xInfo[7], "0", StringComparison.Ordinal);
-            style.fItalic = !String.Equals(xInfo[index=8], "0", StringComparison.Ordinal);
-            if (scriptVer >= 5) {
-                style.fUnderline = !String.Equals(xInfo[++index], "0", StringComparison.Ordinal);
-                style.fStrikeOut = !String.Equals(xInfo[++index], "0", StringComparison.Ordinal);
-                style.fontScaleX = double.Parse(xInfo[++index]);
-                style.fontScaleY = double.Parse(xInfo[++index]);
-                style.fontSpacing = double.Parse(xInfo[++index]);
-                style.fontAngleZ = double.Parse(xInfo[++index]);
-            }
-            style.borderStyle = int.Parse(xInfo[++index]);
-            style.outlineWidth = double.Parse(xInfo[++index]);
-            style.shadowDepth = double.Parse(xInfo[++index]);
-            style.scrAlignment = int.Parse(xInfo[++index]);
-            style.marginl = int.Parse(xInfo[++index]);
-            style.marginr = int.Parse(xInfo[++index]);
-            style.margint = int.Parse(xInfo[++index]);
-            if (scriptVer >= 6) style.marginb = int.Parse(xInfo[++index]);
-            if (scriptVer == 4) index++; //alphaLevel is in v4 only and is taken care of at the top (uint alpha), so just advance the index
-            style.charset = int.Parse(xInfo[++index]);
-            if (scriptVer >= 6) style.relativeTo = byte.Parse(xInfo[++index]);
-
-
-            //Following is code from VSFilter, but since we're not interpreting this, merely spitting it back out the way it came in, we don't currently need it
-            //if (sver <= 4) style.scrAlignment = ((style.scrAlignment & 4) == 1) ? ((style.scrAlignment & 3) + 6) // top
-            //                   : ((style.scrAlignment & 8) == 1) ? ((style.scrAlignment & 3) + 3) // mid
-            //                   : (style.scrAlignment & 3); // bottom
-
-
-            return style;
-        }
-	}
-}

SSATool/TimeCodes.cs

@@ -1,101 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Text;
-using System.IO;
-
-namespace SSATool {
-    public class TimeCodes {
-        private float[] times;
-        private double frameRate;
-
-        public TimeCodes(string filename, double frameRate) {
-            this.frameRate = frameRate;
-            double AssumeFPS = 29.97;
-            string thisline;
-            int frames = 0, index;
-            bool v1;
-            StreamReader fs = new StreamReader(filename);
-
-            thisline = fs.ReadLine(); // Save the first line now
-            if (string.Compare(thisline, "# timecode format v1", true, Util.cfi) == 0) v1 = true;
-            else if (string.Compare(thisline, "# timecode format v2", true, Util.cfi) == 0) v1 = false;
-            else throw new InvalidDataException("File was not detected as an MKV TimeCode v1 or v2 file.");
-
-            //count frames
-            while (!fs.EndOfStream) {
-                if ((fs.Peek() != '#') && ((thisline = fs.ReadLine()).Length > 3)) {
-                    if (v1 == false) frames+=1;
-                    else frames = Math.Max(frames, int.Parse(thisline.Split(",".ToCharArray())[1]));
-                }
-                else if ((fs.Peek() == 'A' || fs.Peek() == 'a') && (string.Compare(thisline.Split(" ".ToCharArray())[0], "assumefps", true, Util.cfi) == 0))
-                    AssumeFPS = double.Parse(thisline.Split(" ".ToCharArray())[1]);
-            }
-            fs.Close();
-
-            //restart, actually saving info
-            fs = new StreamReader(filename);
-            while ((fs.Peek() == '#') || (fs.Peek() == 'a') || (fs.Peek() == 'A'))
-                fs.ReadLine();
-
-            times = new float[frames];
-            for (index = 0;index < frames;index+=1) {
-                if (v1) {
-                    string[] splitv1 = fs.ReadLine().Split(",".ToCharArray());
-                    for (;index <= int.Parse(splitv1[1]);index+=1) // frames is the number of frames with v1, so index SHOULD go up for every frame
-                        times[index] = ((index != 0) ? times[index - 1] : 0) + (float)(1.0 / ((splitv1.Length == 3) ? float.Parse(splitv1[2]) : AssumeFPS));
-                }
-                else
-                    times[index] = float.Parse(fs.ReadLine());
-            }
-            fs.Close();
-
-        }
-
-        /// <summary>
-        /// Finds the frame number of a given VFR time, so that frame number can be used to convert to a CFR time 
-        /// </summary>
-        /// <param name="time">The time in MILLISECONDS</param>
-        /// <returns></returns>
-        public int FindFrame(float time) {
-            int k, low = 0, high = times.Length-1;
-            
-            while (low!=high) {
-                k=(int)Math.Ceiling((high+low)/2.0f);
-                if (times[k].CompareTo(time) == -1)
-                    low=k;
-                else if (k!=0 && times[k-1].CompareTo(time) == -1)
-                    return k;
-                else high=k;
-            }
-            return 0;
-        }
-
-        public TimeSpan GetTimeInverse(TimeSpan time) {
-            int frame = System.Convert.ToInt32(time.TotalSeconds * frameRate, Util.cfi);
-            return TimeSpan.FromMilliseconds((frame<times.Length)?times[frame]:0);
-        }
-
-        public TimeSpan GetTime(TimeSpan time) {
-            return TimeSpan.FromSeconds(FindFrame((float)time.TotalMilliseconds) / frameRate);
-        }
-    }
-}

SSATool/Undo.cs

@@ -1,44 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Collections.Generic;
-using System.Text;
-
-namespace SSATool {
-    //This could be simplified
-    public struct Undo {
-        public List<int> DeleteLines;
-        public List<UndoLine> AddLines;
-    }
-    public struct UndoLine {
-        public int index;
-        public Line line;
-    }
-    public struct LineUndo {
-        public int index;
-        public Line line;
-    }
-    public struct LineCUndo {
-        public int index;
-        public Line line;
-    }
-
-}

SSATool/effects.aas

@@ -1,103 +0,0 @@
-
-Name=Raw code (first \k only)
-Code=$Code$
-FstK=True
-ONam=Code
-ODef=
-
-Name=Position
-Code=\pos($x$,$y$)
-FstK=True
-ONam=x
-ODef=
-ONam=y
-ODef=
-
-Name=Origin
-Code=\org($x$,$y$)
-FstK=True
-ONam=x
-ODef=
-ONam=y
-ODef=
-
-Name=Transformation
-Code=\t($Start Time$,$End Time$,$Acceleration$,$Code$)
-ONam=Start Time
-ODef=%karastart%
-ONam=End Time
-ODef=%karaend%
-ONam=Acceleration
-ODef=1
-ONam=Code
-ODef=
-
-Name=Move
-Code=\move($Start X$,$Start Y$,$End X$,$End Y$,$Start Time$,$End Time$)
-FstK=True
-ONam=Start X
-ODef=
-ONam=Start Y
-ODef=
-ONam=End X
-ODef=
-ONam=End Y
-ODef=
-ONam=Start Time
-ODef=
-ONam=End Time
-ODef=
-
-Name=Revert
-Code=\r
-
-Name=Expanding Border
-Code=\bord$Initial Border Size$\3a&$Initial Border Alpha$\t(%karastart%,%karaend%,\bord$Expanded Border Size$\3a&$Expanded Border Alpha$&)\t(%karaend%,%karaend%,\bord$Initial Border Size$\3a&$Initial Border Alpha$&)
-ONam=Initial Border Size
-ODef=1
-ONam=Expanded Border Size
-ODef=12
-ONam=Initial Border Alpha
-ODef=H00
-ONam=Expanded Border Alpha
-ODef=H60
-
-Name=Font Size
-Code=\fs$Size$
-ONam=Size
-ODef=20
-
-Name=Font Scaling (X)
-Code=\fscx$Scaling$
-ONam=Scaling
-ODef=100
-
-Name=Font Scaling (X)
-Code=\fscy$Scaling$
-ONam=Scaling
-ODef=100
-
-Name=Font Spacing (X)
-Code=\fspx$Spacing$
-ONam=Spacing
-ODef=0
-
-Name=Font Spacing (Y)
-Code=\fspy$Spacing$
-ONam=Spacing
-ODef=0
-
-Name=Font Rotation (X)
-Code=\frx$Rotation$
-ONam=Rotation
-ODef=0
-
-Name=Font Rotation (Y)
-Code=\fry$Rotation$
-ONam=Rotation
-ODef=0
-
-Name=Font Rotation (Z)
-Code=\frz$Rotation$
-ONam=Rotation
-ODef=0

SSATool/effects.exml

@@ -1,9 +0,0 @@
-<?xml version="1.0"?>
-<ESSA>
-	<Effect Name="Transformation" Code="\t($Start Time$,$End Time$,$Acceleration$,$Code$)">
-		<Option Name="Start Time">%karastart%</Option>
-		<Option Name="End Time">%karaend%</Option>
-		<Option Name="Acceleration">1</Option>
-		<Option Name="Code"></Option>
-	</Effect>
-</ESSA>

SSATool/formEffectsEditor.cs

@@ -1,434 +0,0 @@
-/*
-SSATool - A collection of utilities for Advanced Substation Alpha
-Copyright (C) 2007 Dan Donovan
-
-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; ONLY under version 2
-
-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., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-*/
-
-
-
-using System;
-using System.Drawing;
-using System.Collections;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Windows.Forms;
-
-namespace SSATool
-{
-	/// <summary>
-	/// Summary description for formEffectsEditor.
-	/// </summary>
-	public class formEffectsEditor : System.Windows.Forms.Form
-	{
-		#region form stuff
-
-		private System.Windows.Forms.MainMenu mainMenu1;
-		private System.Windows.Forms.MenuItem menuItem1;
-		private System.Windows.Forms.MenuItem menuItem4;
-		private System.Windows.Forms.Button cmdNewEffect;
-		private System.Windows.Forms.Button cmdDelEffect;
-		private System.Windows.Forms.GroupBox groupBox1;
-		private System.Windows.Forms.Label label1;
-		private System.Windows.Forms.Label label2;
-		private System.Windows.Forms.TextBox txtCode;
-		private System.Windows.Forms.Label label3;
-		private System.Windows.Forms.Label label4;
-		private System.Windows.Forms.TextBox txtDefaultVal;
-		private System.Windows.Forms.TextBox txtOptName;
-		private System.ComponentModel.Container components = null;
-		private System.Windows.Forms.ListBox lstEffects;
-		private System.Windows.Forms.Button cmdChangeOpt;
-		private System.Windows.Forms.Button cmdRemoveOpt;
-		private System.Windows.Forms.Button cmdNewOpt;
-		private System.Windows.Forms.ListBox lstParams;
-		private System.Windows.Forms.MenuItem menuLoadEffectsFile;
-		private System.Windows.Forms.MenuItem menuSaveEffectsFile;
-		private System.Windows.Forms.MenuItem menuClose;
-		private System.Windows.Forms.Button cmdChangeCode;
-		#endregion
-
-        private System.Collections.Generic.List<Filter> tColl;
-
-        public formEffectsEditor(System.Collections.Generic.List<Filter> templateFilterColl) {
-			InitializeComponent();
-			tColl = templateFilterColl;
-		}
-		public formEffectsEditor() {
-			InitializeComponent();
-            tColl = new System.Collections.Generic.List<Filter>();
-		}
-
-		protected override void Dispose(bool disposing) {
-			if(disposing)	{
-				if(components != null)
-					components.Dispose();
-			}
-			base.Dispose( disposing );
-		}
-
-		#region Windows Form Designer generated code
-		/// <summary>
-		/// Required method for Designer support - do not modify
-		/// the contents of this method with the code editor.
-		/// </summary>
-		private void InitializeComponent()
-		{
-			this.lstEffects = new System.Windows.Forms.ListBox();
-			this.mainMenu1 = new System.Windows.Forms.MainMenu();
-			this.menuItem1 = new System.Windows.Forms.MenuItem();
-			this.menuLoadEffectsFile = new System.Windows.Forms.MenuItem();
-			this.menuSaveEffectsFile = new System.Windows.Forms.MenuItem();
-			this.menuItem4 = new System.Windows.Forms.MenuItem();
-			this.menuClose = new System.Windows.Forms.MenuItem();
-			this.cmdNewEffect = new System.Windows.Forms.Button();
-			this.cmdDelEffect = new System.Windows.Forms.Button();
-			this.groupBox1 = new System.Windows.Forms.GroupBox();
-			this.cmdChangeCode = new System.Windows.Forms.Button();
-			this.txtOptName = new System.Windows.Forms.TextBox();
-			this.txtDefaultVal = new System.Windows.Forms.TextBox();
-			this.label4 = new System.Windows.Forms.Label();
-			this.label3 = new System.Windows.Forms.Label();
-			this.txtCode = new System.Windows.Forms.TextBox();
-			this.label2 = new System.Windows.Forms.Label();
-			this.cmdChangeOpt = new System.Windows.Forms.Button();
-			this.cmdRemoveOpt = new System.Windows.Forms.Button();
-			this.cmdNewOpt = new System.Windows.Forms.Button();
-			this.label1 = new System.Windows.Forms.Label();
-			this.lstParams = new System.Windows.Forms.ListBox();
-			this.groupBox1.SuspendLayout();
-			this.SuspendLayout();
-			// 
-			// lstEffects
-			// 
-			this.lstEffects.Location = new System.Drawing.Point(0, 8);
-			this.lstEffects.Name = "lstEffects";
-			this.lstEffects.Size = new System.Drawing.Size(160, 251);
-			this.lstEffects.TabIndex = 0;
-			this.lstEffects.SelectedIndexChanged += new System.EventHandler(this.lstEffects_SelectedIndexChanged);
-			// 
-			// mainMenu1
-			// 
-			this.mainMenu1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
-																					  this.menuItem1});
-			// 
-			// menuItem1
-			// 
-			this.menuItem1.Index = 0;
-			this.menuItem1.MenuItems.AddRange(new System.Windows.Forms.MenuItem[] {
-																					  this.menuLoadEffectsFile,
-																					  this.menuSaveEffectsFile,
-																					  this.menuItem4,
-																					  this.menuClose});
-			this.menuItem1.Text = "File";
-			// 
-			// menuLoadEffectsFile
-			// 
-			this.menuLoadEffectsFile.Index = 0;
-			this.menuLoadEffectsFile.Text = "Load Effects File";
-			// 
-			// menuSaveEffectsFile
-			// 
-			this.menuSaveEffectsFile.Index = 1;
-			this.menuSaveEffectsFile.Text = "Save Effects File";
-			this.menuSaveEffectsFile.Click += new System.EventHandler(this.menuSaveEffectsFile_Click);
-			// 
-			// menuItem4
-			// 
-			this.menuItem4.Index = 2;
-			this.menuItem4.Text = "-";
-			// 
-			// menuClose
-			// 
-			this.menuClose.Index = 3;
-			this.menuClose.Text = "Exit";
-			this.menuClose.Click += new System.EventHandler(this.menuClose_Click);
-			// 
-			// cmdNewEffect
-			// 
-			this.cmdNewEffect.Location = new System.Drawing.Point(0, 264);
-			this.cmdNewEffect.Name = "cmdNewEffect";
-			this.cmdNewEffect.Size = new System.Drawing.Size(80, 24);
-			this.cmdNewEffect.TabIndex = 1;
-			this.cmdNewEffect.Text = "New";
-			this.cmdNewEffect.Click += new System.EventHandler(this.cmdNewEffect_Click);
-			// 
-			// cmdDelEffect
-			// 
-			this.cmdDelEffect.Location = new System.Drawing.Point(80, 264);
-			this.cmdDelEffect.Name = "cmdDelEffect";
-			this.cmdDelEffect.Size = new System.Drawing.Size(80, 24);
-			this.cmdDelEffect.TabIndex = 2;
-			this.cmdDelEffect.Text = "Remove";
-			this.cmdDelEffect.Click += new System.EventHandler(this.cmdDelEffect_Click);
-			// 
-			// groupBox1
-			// 
-			this.groupBox1.Controls.Add(this.cmdChangeCode);
-			this.groupBox1.Controls.Add(this.txtOptName);
-			this.groupBox1.Controls.Add(this.txtDefaultVal);
-			this.groupBox1.Controls.Add(this.label4);
-			this.groupBox1.Controls.Add(this.label3);
-			this.groupBox1.Controls.Add(this.txtCode);
-			this.groupBox1.Controls.Add(this.label2);
-			this.groupBox1.Controls.Add(this.cmdChangeOpt);
-			this.groupBox1.Controls.Add(this.cmdRemoveOpt);
-			this.groupBox1.Controls.Add(this.cmdNewOpt);
-			this.groupBox1.Controls.Add(this.label1);
-			this.groupBox1.Controls.Add(this.lstParams);
-			this.groupBox1.Location = new System.Drawing.Point(168, 8);
-			this.groupBox1.Name = "groupBox1";
-			this.groupBox1.Size = new System.Drawing.Size(416, 280);
-			this.groupBox1.TabIndex = 3;
-			this.groupBox1.TabStop = false;
-			this.groupBox1.Text = "Selected Effect";
-			// 
-			// cmdChangeCode
-			// 
-			this.cmdChangeCode.Location = new System.Drawing.Point(328, 256);
-			this.cmdChangeCode.Name = "cmdChangeCode";
-			this.cmdChangeCode.Size = new System.Drawing.Size(80, 18);
-			this.cmdChangeCode.TabIndex = 11;
-			this.cmdChangeCode.Text = "Change";
-			this.cmdChangeCode.Click += new System.EventHandler(this.cmdChangeCode_Click);
-			// 
-			// txtOptName
-			// 
-			this.txtOptName.Location = new System.Drawing.Point(104, 144);
-			this.txtOptName.Name = "txtOptName";
-			this.txtOptName.Size = new System.Drawing.Size(304, 20);
-			this.txtOptName.TabIndex = 10;
-			this.txtOptName.Text = "";
-			// 
-			// txtDefaultVal
-			// 
-			this.txtDefaultVal.Location = new System.Drawing.Point(104, 168);
-			this.txtDefaultVal.Name = "txtDefaultVal";
-			this.txtDefaultVal.Size = new System.Drawing.Size(304, 20);
-			this.txtDefaultVal.TabIndex = 9;
-			this.txtDefaultVal.Text = "";
-			// 
-			// label4
-			// 
-			this.label4.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label4.Location = new System.Drawing.Point(8, 168);
-			this.label4.Name = "label4";
-			this.label4.Size = new System.Drawing.Size(96, 24);
-			this.label4.TabIndex = 8;
-			this.label4.Text = "Default Value:";
-			this.label4.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-			// 
-			// label3
-			// 
-			this.label3.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label3.Location = new System.Drawing.Point(8, 144);
-			this.label3.Name = "label3";
-			this.label3.Size = new System.Drawing.Size(96, 24);
-			this.label3.TabIndex = 7;
-			this.label3.Text = "Option Name:";
-			this.label3.TextAlign = System.Drawing.ContentAlignment.MiddleRight;
-			// 
-			// txtCode
-			// 
-			this.txtCode.Location = new System.Drawing.Point(8, 256);
-			this.txtCode.Name = "txtCode";
-			this.txtCode.Size = new System.Drawing.Size(312, 20);
-			this.txtCode.TabIndex = 6;
-			this.txtCode.Text = "";
-			this.txtCode.TextChanged += new System.EventHandler(this.txtCode_TextChanged);
-			// 
-			// label2
-			// 
-			this.label2.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label2.Location = new System.Drawing.Point(8, 192);
-			this.label2.Name = "label2";
-			this.label2.Size = new System.Drawing.Size(400, 64);
-			this.label2.TabIndex = 5;
-			this.label2.Text = "Code: Put together the SSA code using the variables above (surrounded by dollar s" +
-				"igns, IE length would be $length$) here. You may use variables as well.";
-			this.label2.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-			// 
-			// cmdChangeOpt
-			// 
-			this.cmdChangeOpt.Location = new System.Drawing.Point(296, 104);
-			this.cmdChangeOpt.Name = "cmdChangeOpt";
-			this.cmdChangeOpt.Size = new System.Drawing.Size(112, 24);
-			this.cmdChangeOpt.TabIndex = 4;
-			this.cmdChangeOpt.Text = "Change";
-			this.cmdChangeOpt.Click += new System.EventHandler(this.cmdChangeOpt_Click);
-			// 
-			// cmdRemoveOpt
-			// 
-			this.cmdRemoveOpt.Location = new System.Drawing.Point(296, 64);
-			this.cmdRemoveOpt.Name = "cmdRemoveOpt";
-			this.cmdRemoveOpt.Size = new System.Drawing.Size(112, 24);
-			this.cmdRemoveOpt.TabIndex = 3;
-			this.cmdRemoveOpt.Text = "Remove";
-			this.cmdRemoveOpt.Click += new System.EventHandler(this.cmdRemoveOpt_Click);
-			// 
-			// cmdNewOpt
-			// 
-			this.cmdNewOpt.Location = new System.Drawing.Point(296, 40);
-			this.cmdNewOpt.Name = "cmdNewOpt";
-			this.cmdNewOpt.Size = new System.Drawing.Size(112, 24);
-			this.cmdNewOpt.TabIndex = 2;
-			this.cmdNewOpt.Text = "New";
-			this.cmdNewOpt.Click += new System.EventHandler(this.cmdNewOpt_Click);
-			// 
-			// label1
-			// 
-			this.label1.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));
-			this.label1.Location = new System.Drawing.Point(8, 16);
-			this.label1.Name = "label1";
-			this.label1.Size = new System.Drawing.Size(280, 16);
-			this.label1.TabIndex = 1;
-			this.label1.Text = "Parameters";
-			this.label1.TextAlign = System.Drawing.ContentAlignment.BottomCenter;
-			// 
-			// lstParams
-			// 
-			this.lstParams.Location = new System.Drawing.Point(8, 40);
-			this.lstParams.Name = "lstParams";
-			this.lstParams.Size = new System.Drawing.Size(280, 95);
-			this.lstParams.TabIndex = 0;
-			this.lstParams.SelectedIndexChanged += new System.EventHandler(this.lstParams_SelectedIndexChanged);
-			// 
-			// formEffectsEditor
-			// 
-			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);
-			this.ClientSize = new System.Drawing.Size(584, 291);
-			this.Controls.Add(this.groupBox1);
-			this.Controls.Add(this.cmdDelEffect);
-			this.Controls.Add(this.cmdNewEffect);
-			this.Controls.Add(this.lstEffects);
-			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;
-			this.ImeMode = System.Windows.Forms.ImeMode.On;
-			this.MaximizeBox = false;
-			this.Menu = this.mainMenu1;
-			this.Name = "formEffectsEditor";
-			this.Text = "SSATool Effects Editor";
-			this.Load += new System.EventHandler(this.formEffectsEditor_Load);
-			this.groupBox1.ResumeLayout(false);
-			this.ResumeLayout(false);
-
-		}
-		#endregion
-
-		private void formEffectsEditor_Load(object sender, System.EventArgs e) {
-			foreach(Filter tf in tColl)
-				lstEffects.Items.Add(tf.ToString());
-		}
-
-
-		private void cmdNewEffect_Click(object sender, System.EventArgs e) {
-			InputBoxResult newvalue = InputBox.Show("Enter the name of the new effect:","Input",String.Empty);
-			if (newvalue.OK == true) {
-				int index, cmp;
-				for(index=0;index<tColl.Count;index++) {
-					cmp = newvalue.Text.CompareTo(tColl[index].ToString());
-					if (cmp == 0) {
-						MessageBox.Show("An effect of that name already exists.");
-						return;
-					}
-					if (cmp == -1) break;
-				}
-				Filter nt = new Filter(newvalue.Text);
-				tColl.Insert(index, nt);
-			}
-		}
-
-		private void cmdDelEffect_Click(object sender, System.EventArgs e) {
-			if (lstEffects.SelectedItems.Count != 0) {
-				tColl.RemoveAt(lstEffects.SelectedIndex);
-				lstEffects.Items.RemoveAt(lstEffects.SelectedIndex);
-
-			}
-		}
-
-		private void cmdNewOpt_Click(object sender, System.EventArgs e) {
-			if (lstEffects.SelectedItems.Count != 0) {
-				(tColl[lstEffects.SelectedIndex]).AddOption("New Option",String.Empty);
-				lstParams.Items.Add("New Option");
-
-			}
-			else MessageBox.Show("Select an effect first.");
-		}
-
-		private void cmdRemoveOpt_Click(object sender, System.EventArgs e) {
-			if ((lstEffects.SelectedItems.Count != 0) && (lstParams.SelectedItems.Count != 0)) {
-				(tColl[lstEffects.SelectedIndex]).RemoveOptionByIndex(lstParams.SelectedIndex);
-				lstParams.Items.RemoveAt(lstParams.SelectedIndex);
-			}
-			else MessageBox.Show("Select an effect first.");
-		}
-		private void cmdChangeOpt_Click(object sender, System.EventArgs e) {
-			if ((lstEffects.SelectedItems.Count != 0) && (lstParams.SelectedItems.Count != 0)) {
-				(tColl[lstEffects.SelectedIndex]).SetOptionByIndex(lstParams.SelectedIndex,txtOptName.Text,txtDefaultVal.Text);
-				lstParams.Items.Clear();
-				foreach(FilterOption fo in (Filter)tColl[lstEffects.SelectedIndex]) {
-					lstParams.Items.Add(fo.Name);
-				}
-			}
-			else MessageBox.Show("Select an effect and a parameter first.");
-		}
-		private void cmdChangeCode_Click(object sender, System.EventArgs e) {
-			if (lstEffects.SelectedItems.Count != 0)
-				(tColl[lstEffects.SelectedIndex]).Code = txtCode.Text;
-
-			else MessageBox.Show("Select an effect first.");
-		}
-
-
-		private void txtCode_TextChanged(object sender, System.EventArgs e) {
-			if (lstEffects.SelectedItems.Count != 0) 
-				(tColl[lstEffects.SelectedIndex]).Code = txtCode.Text;
-		}
-
-
-		private void lstEffects_SelectedIndexChanged(object sender, System.EventArgs e) {
-			lstParams.Items.Clear();
-			if (lstEffects.SelectedItems.Count != 0) {
-				foreach(FilterOption fo in (tColl[lstEffects.SelectedIndex])) {
-					lstParams.Items.Add(fo.Name);
-					txtCode.Text = (tColl[lstEffects.SelectedIndex]).Code;
-				}
-			}
-		}
-
-		private void lstParams_SelectedIndexChanged(object sender, System.EventArgs e) {
-			if ((lstEffects.SelectedItems.Count != 0) && (lstParams.SelectedItems.Count != 0)) {
-				txtOptName.Text = lstParams.Items[lstParams.SelectedIndex].ToString();
-				txtDefaultVal.Text = (tColl[lstEffects.SelectedIndex]).GetOptionValueByName(lstParams.Items[lstParams.SelectedIndex].ToString());
-			}
-			else
-				txtOptName.Text = txtDefaultVal.Text = String.Empty;
-		}
-
-
-		private void menuClose_Click(object sender, System.EventArgs e) {
-			this.Close();
-		}
-
-		private void menuSaveEffectsFile_Click(object sender, System.EventArgs e) {
-			SaveFileDialogWithEncoding ofd=new SaveFileDialogWithEncoding();
-			ofd.DefaultExt="exml";
-			ofd.EncodingType=EncodingType.ANSI;
-			ofd.Filter="XML effect files (*.exml)|*.exml|All files (*.*)|*.*";
-			if (ofd.ShowDialog((IntPtr)this.Handle,Screen.FromControl(this))==DialogResult.OK) {
-				Form1.SaveEffectsFile(ofd.FileName,tColl);
-			}
-		}
-
-	}
-}